.gdb.metadata

@@ -1,3 +1,3 @@
-1056e2743a825ecce46ec9eec37f0b357831012b SOURCES/gdb-10.2.tar.xz
+ee66294d87a109f88a459d0da5d0bb2da5135f45 SOURCES/gdb-8.2.tar.xz
 1ad1d2c6f0141b37bbe32b8add91b5691ecc6412 SOURCES/gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz
-89b3dd85676090dd4a923425f7668446d729f5f3 SOURCES/v2.0.4.tar.gz
+a08830edc095f4ea8ae516a154942105379c5f67 SOURCES/v2.0.tar.gz

.gitignore

@@ -1,3 +1,3 @@
-SOURCES/gdb-10.2.tar.xz
+SOURCES/gdb-8.2.tar.xz
 SOURCES/gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz
-SOURCES/v2.0.4.tar.gz
+SOURCES/v2.0.tar.gz

SOURCES/_gdb.spec.patch.include

@@ -114,3 +114,90 @@
 %patch114 -p1
 %patch115 -p1
 %patch116 -p1
+%patch117 -p1
+%patch118 -p1
+%patch119 -p1
+%patch120 -p1
+%patch121 -p1
+%patch122 -p1
+%patch123 -p1
+%patch124 -p1
+%patch125 -p1
+%patch126 -p1
+%patch127 -p1
+%patch128 -p1
+%patch129 -p1
+%patch130 -p1
+%patch131 -p1
+%patch132 -p1
+%patch133 -p1
+%patch134 -p1
+%patch135 -p1
+%patch136 -p1
+%patch137 -p1
+%patch138 -p1
+%patch139 -p1
+%patch140 -p1
+%patch141 -p1
+%patch142 -p1
+%patch143 -p1
+%patch144 -p1
+%patch145 -p1
+%patch146 -p1
+%patch147 -p1
+%patch148 -p1
+%patch149 -p1
+%patch150 -p1
+%patch151 -p1
+%patch152 -p1
+%patch153 -p1
+%patch154 -p1
+%patch155 -p1
+%patch156 -p1
+%patch157 -p1
+%patch158 -p1
+%patch159 -p1
+%patch160 -p1
+%patch161 -p1
+%patch162 -p1
+%patch163 -p1
+%patch164 -p1
+%patch165 -p1
+%patch166 -p1
+%patch167 -p1
+%patch168 -p1
+%patch169 -p1
+%patch170 -p1
+%patch171 -p1
+%patch172 -p1
+%patch173 -p1
+%patch174 -p1
+%patch175 -p1
+%patch176 -p1
+%patch177 -p1
+%patch178 -p1
+%patch179 -p1
+%patch180 -p1
+%patch181 -p1
+%patch182 -p1
+%patch183 -p1
+%patch184 -p1
+%patch185 -p1
+%patch186 -p1
+%patch187 -p1
+%patch188 -p1
+%patch189 -p1
+%patch190 -p1
+%patch191 -p1
+%patch192 -p1
+%patch193 -p1
+%patch194 -p1
+%patch195 -p1
+%patch196 -p1
+%patch197 -p1
+%patch198 -p1
+%patch199 -p1
+%patch200 -p1
+%patch201 -p1
+%patch202 -p1
+%patch203 -p1

SOURCES/gdb-6.3-attach-see-vdso-test.patch

@@ -24,7 +24,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
@@ -40,19 +40,19 @@ diff --git a/gdb/testsuite/gdb.base/attach-see-vdso.exp b/gdb/testsuite/gdb.base
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/attach-see-vdso.exp
-@@ -0,0 +1,77 @@
+@@ -0,0 +1,72 @@
 +# Copyright 2007
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -64,11 +64,6 @@ new file mode 100644
 +    return 0
 +}
 +
-+if {[use_gdb_stub]} {
-+    untested "skipping test because of use_gdb_stub"
-+    return -1
-+}
-+
 +set testfile "attach-see-vdso"
 +set srcfile  ${testfile}.c
 +set binfile  [standard_output_file ${testfile}]
@@ -109,12 +104,12 @@ new file mode 100644
 +gdb_test "bt" "#0 *0x\[0-9a-f\]* in \[^?\].*" "backtrace decodes VDSO"
 +
 +# Exit and detach the process.
-+
++   
 +gdb_exit
 +
 +# Make sure we don't leave a process around to confuse
 +# the next test run (and prevent the compile by keeping
 +# the text file busy), in case the "set should_exit" didn't
 +# work.
-+
++   
 +remote_exec build "kill -9 ${testpid}"

SOURCES/gdb-6.3-bz140532-ppc-unwinding-test.patch

@@ -24,7 +24,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
@@ -107,7 +107,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
@@ -210,7 +210,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
@@ -237,15 +237,15 @@ new file mode 100644
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +# Test unwinding fixes of the PPC platform, specifically on the coping with BCL
 +# jump of the PIE code.

SOURCES/gdb-6.3-bz202689-exec-from-pthread-test.patch

@@ -73,15 +73,15 @@ new file mode 100644
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 +
 +# Please email any bugs, comments, and/or additions to this file to:
 +# bug-gdb@prep.ai.mit.edu

SOURCES/gdb-6.3-gstack-20050411.patch

@@ -16,7 +16,7 @@ Subject: gdb-6.3-gstack-20050411.patch
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
-@@ -1726,7 +1726,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
+@@ -1735,7 +1735,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
  install: all
  	@$(MAKE) $(FLAGS_TO_PASS) install-only
  
@@ -25,7 +25,7 @@ diff --git a/gdb/Makefile.in b/gdb/Makefile.in
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e "$$t"` ; \
  		if test "x$$transformed_name" = x; then \
-@@ -1775,7 +1775,25 @@ install-guile:
+@@ -1784,7 +1784,25 @@ install-guile:
  install-python:
  	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_DATADIR)/python/gdb
  
@@ -52,7 +52,7 @@ diff --git a/gdb/Makefile.in b/gdb/Makefile.in
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e $$t` ; \
  		if test "x$$transformed_name" = x; then \
-@@ -1798,6 +1816,18 @@ uninstall: force $(CONFIG_UNINSTALL)
+@@ -1807,6 +1825,18 @@ uninstall: force $(CONFIG_UNINSTALL)
  	fi
  	@$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
  
@@ -67,7 +67,7 @@ diff --git a/gdb/Makefile.in b/gdb/Makefile.in
 +		fi ; \
 +		rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \
 +		      $(DESTDIR)$(man1dir)/$$transformed_name.1
-+
++ 
  # The C++ name parser can be built standalone for testing.
  test-cp-name-parser.o: cp-name-parser.c
  	$(COMPILE) -DTEST_CPNAMES cp-name-parser.c
@@ -109,7 +109,7 @@ new file mode 100644
 +
 +# Run GDB, strip out unwanted noise.
 +# --readnever is no longer used since .gdb_index is now in use.
-+$GDB --quiet -nx $GDBARGS /proc/$1/exe $1 <<EOF 2>&1 |
++$GDB --quiet -nx $GDBARGS /proc/$1/exe $1 <<EOF 2>&1 | 
 +set width 0
 +set height 0
 +set pagination no
@@ -153,7 +153,7 @@ new file mode 100644
 +  /* Use the most simple notification not to get caught by attach on exiting
 +     the function.  */
 +  write (1, msg, strlen (msg));
-+
++  
 +  for (;;);
 +}
 +
@@ -171,7 +171,7 @@ diff --git a/gdb/testsuite/gdb.base/gstack.exp b/gdb/testsuite/gdb.base/gstack.e
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gstack.exp
-@@ -0,0 +1,84 @@
+@@ -0,0 +1,66 @@
 +# Copyright (C) 2012 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -202,10 +202,6 @@ new file mode 100644
 +    fail $test
 +    return
 +}
-+
-+# The spawn id of the test inferior.
-+set test_spawn_id $res
-+
 +set use_gdb_stub 1
 +set pid [exp_pid -i $res]
 +gdb_expect {
@@ -221,6 +217,7 @@ new file mode 100644
 +	return
 +    }
 +}
++gdb_exit
 +
 +# Testcase uses the most simple notification not to get caught by attach on
 +# exiting the function.  Still we could retry the gstack command if we fail.
@@ -232,27 +229,12 @@ new file mode 100644
 +    perror "Spawning $command failed."
 +    fail $test
 +}
-+
-+set gdb_spawn_id $res
-+
++set pid [exp_pid -i $res]
 +gdb_test_multiple "" $test {
 +    -re "^#0 +(0x\[0-9a-f\]+ in )?\\.?func \\(\\) at \[^\r\n\]*\r\n#1 +0x\[0-9a-f\]+ in \\.?main \\(\\) at \[^\r\n\]*\r\nGSTACK-END\r\n\$" {
 +	pass $test
 +    }
 +}
++gdb_exit
 +
-+gdb_test_multiple "" "gstack exits" {
-+    eof {
-+	set result [wait -i $gdb_spawn_id]
-+	verbose $result
-+
-+	gdb_assert { [lindex $result 2] == 0 } "gstack exits with no error"
-+	gdb_assert { [lindex $result 3] == 0 } "gstack's exit status is 0"
-+
-+	remote_close host
-+	clear_gdb_spawn_id
-+    }
-+}
-+
-+# Kill the test inferior.
-+kill_wait_spawned_process $test_spawn_id
++remote_exec host "kill -9 $pid"

SOURCES/gdb-6.3-inferior-notification-20050721.patch

@@ -46,19 +46,19 @@ diff --git a/gdb/testsuite/gdb.base/attach-32.exp b/gdb/testsuite/gdb.base/attac
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/attach-32.exp
-@@ -0,0 +1,246 @@
+@@ -0,0 +1,245 @@
 +# Copyright 2005 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -72,15 +72,14 @@ new file mode 100644
 +#
 +# Setting the magic bit in the target app should work.  I added a
 +# "kill", and also a test for the R3 register warning.  JB
-+if { ![istarget "x86_64*-*linux*"]
++if { ![istarget "x86_64*-*linux*"] 
 +     && ![istarget "powerpc64*-*linux*"]} {
 +    return 0
 +}
 +
 +# are we on a target board
-+if {[use_gdb_stub]} {
-+    untested "skipping test because of use_gdb_stub"
-+    return -1
++if [is_remote target] then {
++    return 0
 +}
 +
 +set testfile "attach-32"
@@ -122,10 +121,10 @@ new file mode 100644
 +    global subdir
 +    global timeout
 +    global testpid
-+
++    
 +    # Verify that we can "see" the variable "should_exit" in the
 +    # program, and that it is zero.
-+
++   
 +    gdb_test "print should_exit" " = 0" "after attach-32, print should_exit"
 +
 +    # Verify that we can modify the variable "should_exit" in the
@@ -168,12 +167,12 @@ new file mode 100644
 +    # the next test run (and prevent the compile by keeping
 +    # the text file busy), in case the "set should_exit" didn't
 +    # work.
-+
++   
 +    remote_exec build "kill -9 ${testpid}"
 +
 +    # Start the program running and then wait for a bit, to be sure
 +    # that it can be attached to.
-+
++   
 +    set testpid [eval exec $binfile &]
 +    exec sleep 2
 +    if { [istarget "*-*-cygwin*"] } {
@@ -185,7 +184,7 @@ new file mode 100644
 +    # Verify that we can attach to the process, and find its a.out
 +    # when we're cd'd to some directory that doesn't contain the
 +    # a.out.  (We use the source path set by the "dir" command.)
-+
++    
 +    gdb_test "dir ${objdir}/${subdir}" "Source directories searched: .*" \
 +	"set source path"
 +
@@ -218,7 +217,7 @@ new file mode 100644
 +	    gdb_test "y" "" "$test"
 +	}
 +    }
-+
++    
 +    # Another "don't leave a process around"
 +    remote_exec build "kill -9 ${testpid}"
 +}
@@ -227,9 +226,9 @@ new file mode 100644
 +    global gdb_prompt
 +    global binfile2
 +    global testpid
-+
++    
 +    # See if other registers are problems
-+
++    
 +    set test "info other register"
 +    gdb_test_multiple "i r r3" "$test" {
 +	-re "warning: reading register.*$gdb_prompt $" {
@@ -241,12 +240,12 @@ new file mode 100644
 +    }
 +
 +    # Get rid of the process
-+
++    
 +    gdb_test "p should_exit = 1"
 +    gdb_test "c" {\[Inferior .* exited normally\]}
-+
++   
 +    # Be paranoid
-+
++   
 +    remote_exec build "kill -9 ${testpid}"
 +}
 +
@@ -263,7 +262,7 @@ new file mode 100644
 +}
 +
 +set GDBFLAGS_orig $GDBFLAGS
-+set GDBFLAGS "-iex \"set height 0\" --pid=$testpid"
++set GDBFLAGS "--pid=$testpid"
 +gdb_start
 +set GDBFLAGS $GDBFLAGS_orig
 +
@@ -285,7 +284,7 @@ new file mode 100644
 +}
 +
 +set GDBFLAGS_orig $GDBFLAGS
-+set GDBFLAGS "-iex \"set height 0\" --pid=$testpid"
++set GDBFLAGS "--pid=$testpid"
 +gdb_start
 +set GDBFLAGS $GDBFLAGS_orig
 +

SOURCES/gdb-6.3-inheritancetest-20050726.patch

@@ -17,7 +17,7 @@ diff --git a/gdb/testsuite/gdb.cp/b146835.cc b/gdb/testsuite/gdb.cp/b146835.cc
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.cp/b146835.cc
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,32 @@
 +#include "b146835.h"
 +#include <iostream>
 +
@@ -49,6 +49,7 @@ new file mode 100644
 +   F f;
 +   f.foo();
 +}
++
 diff --git a/gdb/testsuite/gdb.cp/b146835.exp b/gdb/testsuite/gdb.cp/b146835.exp
 new file mode 100644
 --- /dev/null
@@ -70,7 +71,7 @@ new file mode 100644
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +# Check that GDB can properly print an inherited member variable
 +# (Bugzilla 146835)

SOURCES/gdb-6.3-mapping-zero-inode-test.patch

@@ -150,15 +150,15 @@ new file mode 100644
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +# Test GDB's handling of gcore for mapping with a name but zero inode.
 +

SOURCES/gdb-6.3-ppc64displaysymbol-20041124.patch

@@ -0,0 +1,32 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Andrew Cagney <cagney@gnu.org>
+Date: Fri, 27 Oct 2017 21:07:50 +0200
+Subject: gdb-6.3-ppc64displaysymbol-20041124.patch
+
+;; Include the pc's section when doing a symbol lookup so that the
+;; correct symbol is found.
+;;=push: Write new testcase.
+
+2004-11-24  Andrew Cagney  <cagney@gnu.org>
+
+	* printcmd.c (build_address_symbolic): Find a section for the
+	address.
+
+diff --git a/gdb/printcmd.c b/gdb/printcmd.c
+--- a/gdb/printcmd.c
++++ b/gdb/printcmd.c
+@@ -587,6 +587,14 @@ build_address_symbolic (struct gdbarch *gdbarch,
+ 	  addr = overlay_mapped_address (addr, section);
+ 	}
+     }
++  /* To ensure that the symbol returned belongs to the correct setion
++     (and that the last [random] symbol from the previous section
++     isn't returned) try to find the section containing PC.  First try
++     the overlay code (which by default returns NULL); and second try
++     the normal section code (which almost always succeeds).  */
++  section = find_pc_overlay (addr);
++  if (section == NULL)
++    section = find_pc_section (addr);
+ 
+   /* First try to find the address in the symbol table, then
+      in the minsyms.  Take the closest one.  */

SOURCES/gdb-6.3-ppc64syscall-20040622.patch

@@ -0,0 +1,118 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Andrew Cagney <cagney@gnu.org>
+Date: Fri, 27 Oct 2017 21:07:50 +0200
+Subject: gdb-6.3-ppc64syscall-20040622.patch
+
+;; Better parse 64-bit PPC system call prologues.
+;;=push: Write new testcase.
+
+2004-06-22  Andrew Cagney  <cagney@gnu.org>
+
+	* rs6000-tdep.c (struct rs6000_framedata): Add field "func_start".
+	(skip_prologue): Delete local variable "orig_pc", use
+	"func_start".  Add local variable "num_skip_linux_syscall_insn",
+	use to skip over first half of a GNU/Linux syscall and update
+	"func_start".
+
+diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
+--- a/gdb/rs6000-tdep.c
++++ b/gdb/rs6000-tdep.c
+@@ -134,6 +134,7 @@ static const char *powerpc_vector_abi_string = "auto";
+ 
+ struct rs6000_framedata
+   {
++    CORE_ADDR func_start;	/* True function start.  */
+     int offset;			/* total size of frame --- the distance
+ 				   by which we decrement sp to allocate
+ 				   the frame */
+@@ -1426,7 +1427,6 @@ static CORE_ADDR
+ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
+ 	       struct rs6000_framedata *fdata)
+ {
+-  CORE_ADDR orig_pc = pc;
+   CORE_ADDR last_prologue_pc = pc;
+   CORE_ADDR li_found_pc = 0;
+   gdb_byte buf[4];
+@@ -1445,12 +1445,14 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
+   int minimal_toc_loaded = 0;
+   int prev_insn_was_prologue_insn = 1;
+   int num_skip_non_prologue_insns = 0;
++  int num_skip_ppc64_gnu_linux_syscall_insn = 0;
+   int r0_contains_arg = 0;
+   const struct bfd_arch_info *arch_info = gdbarch_bfd_arch_info (gdbarch);
+   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+ 
+   memset (fdata, 0, sizeof (struct rs6000_framedata));
++  fdata->func_start = pc;
+   fdata->saved_gpr = -1;
+   fdata->saved_fpr = -1;
+   fdata->saved_vr = -1;
+@@ -1484,6 +1486,55 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
+ 	break;
+       op = extract_unsigned_integer (buf, 4, byte_order);
+ 
++      /* A PPC64 GNU/Linux system call function is split into two
++	 sub-functions: a non-threaded fast-path (__NAME_nocancel)
++	 which does not use a frame; and a threaded slow-path
++	 (Lpseudo_cancel) that does create a frame.  Ref:
++	 nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
++
++	 *INDENT-OFF*
++	 NAME:
++	 	SINGLE_THREAD_P
++	 	bne- .Lpseudo_cancel
++	 __NAME_nocancel:
++	 	li r0,162
++	 	sc
++	 	bnslr+
++	 	b 0x7fe014ef64 <.__syscall_error>
++	 Lpseudo_cancel:
++	 	stdu r1,-128(r1)
++	 	...
++	 *INDENT-ON*
++
++	 Unfortunatly, because the latter case uses a local label (not
++	 in the symbol table) a PC in "Lpseudo_cancel" appears to be
++	 in "__NAME_nocancel".  The following code recognizes this,
++	 adjusting FUNC_START to point to where "Lpseudo_cancel"
++	 should be, and parsing the prologue sequence as if
++	 "Lpseudo_cancel" was the entry point.  */
++
++      if (((op & 0xffff0000) == 0x38000000 /* li r0,N */
++	   && pc == fdata->func_start + 0
++	   && num_skip_ppc64_gnu_linux_syscall_insn == 0)
++	  || (op == 0x44000002 /* sc */
++	      && pc == fdata->func_start + 4
++	      && num_skip_ppc64_gnu_linux_syscall_insn == 1)
++	  || (op == 0x4ca30020 /* bnslr+ */
++	      && pc == fdata->func_start + 8
++	      && num_skip_ppc64_gnu_linux_syscall_insn == 2))
++	{
++	  num_skip_ppc64_gnu_linux_syscall_insn++;
++	  continue;
++	}
++      else if ((op & 0xfc000003) == 0x48000000 /* b __syscall_error */
++	       && pc == fdata->func_start + 12
++	       && num_skip_ppc64_gnu_linux_syscall_insn == 3)
++	{
++	  num_skip_ppc64_gnu_linux_syscall_insn = -1;
++	  fdata->func_start = pc;
++	  continue;
++	}
++
+       if ((op & 0xfc1fffff) == 0x7c0802a6)
+ 	{			/* mflr Rx */
+ 	  /* Since shared library / PIC code, which needs to get its
+@@ -1673,9 +1724,9 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
+ 	     we have no line table information or the line info tells
+ 	     us that the subroutine call is not part of the line
+ 	     associated with the prologue.  */
+-	  if ((pc - orig_pc) > 8)
++	  if ((pc - fdata->func_start) > 8)
+ 	    {
+-	      struct symtab_and_line prologue_sal = find_pc_line (orig_pc, 0);
++	      struct symtab_and_line prologue_sal = find_pc_line (fdata->func_start, 0);
+ 	      struct symtab_and_line this_sal = find_pc_line (pc, 0);
+ 
+ 	      if ((prologue_sal.line == 0)

SOURCES/gdb-6.3-readnever-20050907.patch

@@ -0,0 +1,35 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Andrew Cagney <cagney@gnu.org>
+Date: Fri, 27 Oct 2017 21:07:50 +0200
+Subject: gdb-6.3-readnever-20050907.patch
+
+;; Add readnever option
+;;=push
+
+2004-11-18  Andrew Cagney  <cagney@gnu.org>
+
+        * dwarf2read.c: Include "top.c".
+        (dwarf2_has_info): Check for readnever_symbol_files.
+        * symfile.c (readnever_symbol_files): Define.
+        * top.h (readnever_symbol_files): Declare.
+        * main.c (captured_main): Add --readnever option.
+        (print_gdb_help): Ditto.
+
+2004-11-18  Andrew Cagney  <cagney@gnu.org>
+
+        * gdb.texinfo (File Options): Document --readnever.
+
+Pushed upstream: https://sourceware.org/ml/gdb-cvs/2017-12/msg00007.html
+
+diff --git a/gdb/gcore.in b/gdb/gcore.in
+--- a/gdb/gcore.in
++++ b/gdb/gcore.in
+@@ -97,7 +97,7 @@ for pid in "$@"
+ do
+ 	# `</dev/null' to avoid touching interactive terminal if it is
+ 	# available but not accessible as GDB would get stopped on SIGTTIN.
+-	"$binary_path/@GDB_TRANSFORM_NAME@" </dev/null --nx --batch \
++	"$binary_path/@GDB_TRANSFORM_NAME@" </dev/null --nx --batch --readnever \
+ 	    -ex "set pagination off" -ex "set height 0" -ex "set width 0" \
+ 	    "${dump_all_cmds[@]}" \
+ 	    -ex "attach $pid" -ex "gcore $name.$pid" -ex detach -ex quit

SOURCES/gdb-6.3-rh-testversion-20041202.patch

@@ -24,15 +24,3 @@ diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest
      }
  
      # start the "xgdb" process
-diff --git a/gdb/top.c b/gdb/top.c
---- a/gdb/top.c
-+++ b/gdb/top.c
-@@ -2163,7 +2163,7 @@ init_gdb_version_vars (void)
-   struct internalvar *major_version_var = create_internalvar ("_gdb_major");
-   struct internalvar *minor_version_var = create_internalvar ("_gdb_minor");
-   int vmajor = 0, vminor = 0, vrevision = 0;
--  sscanf (version, "%d.%d.%d", &vmajor, &vminor, &vrevision);
-+  sscanf (version, "Red Hat Enterprise Linux %d.%d.%d", &vmajor, &vminor, &vrevision);
-   set_internalvar_integer (major_version_var, vmajor);
-   set_internalvar_integer (minor_version_var, vminor + (vrevision > 0));
- }

SOURCES/gdb-6.3-test-dtorfix-20050121.patch

@@ -131,7 +131,7 @@ new file mode 100644
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +# Check that GDB can break at multiple forms of constructors.
 +
@@ -160,7 +160,7 @@ new file mode 100644
 +# Break on the various forms of the A::A constructor.
 +# " (2 locations)" is displayed depending on G++ version.
 +gdb_test "break A\:\:A" "Breakpoint 2 at .*" "breaking on A::A"
-+
++        
 +# Verify that we break for the A constructor two times
 +# Once for new A and once for new B
 +gdb_continue_to_breakpoint "First line A"

SOURCES/gdb-6.3-test-movedir-20050125.patch

@@ -16,7 +16,7 @@ diff --git a/gdb/testsuite/gdb.base/move-dir.c b/gdb/testsuite/gdb.base/move-dir
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/move-dir.c
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,10 @@
 +#include <stdio.h>
 +#include <stdlib.h>
 +#include "move-dir.h"
@@ -26,6 +26,7 @@ new file mode 100644
 +   printf ("%s\n", hw);;
 +   other();
 +}
++
 diff --git a/gdb/testsuite/gdb.base/move-dir.exp b/gdb/testsuite/gdb.base/move-dir.exp
 new file mode 100644
 --- /dev/null
@@ -38,15 +39,15 @@ new file mode 100644
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +set testfile "move-dir"
 +set srcfile ${testfile}.c
@@ -92,10 +93,11 @@ diff --git a/gdb/testsuite/gdb.base/move-dir.h b/gdb/testsuite/gdb.base/move-dir
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/move-dir.h
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,7 @@
 +#include <stdlib.h>
 +
 +void other() {
 +  const char* ostring = "other";
 +  printf ("%s\n", ostring);;
 +}
++

SOURCES/gdb-6.3-test-self-20050110.patch

@@ -0,0 +1,42 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Elena Zannoni <ezannoni@redhat.com>
+Date: Fri, 27 Oct 2017 21:07:50 +0200
+Subject: gdb-6.3-test-self-20050110.patch
+
+;; Get selftest working with sep-debug-info
+;;=fedoratest
+
+2004-02-23  Elena Zannoni  <ezannoni@redhat.com>
+
+        * gdb.gdb/selftest.exp: Make sure that the debug directory is
+        set up properly.
+        * gdb.gdb/complaints.exp: Ditto.
+        * gdb.gdb/xfullpath.exp: Ditto.
+        * gdb.gdb/observer.exp: Ditto.
+
+diff --git a/gdb/testsuite/lib/selftest-support.exp b/gdb/testsuite/lib/selftest-support.exp
+--- a/gdb/testsuite/lib/selftest-support.exp
++++ b/gdb/testsuite/lib/selftest-support.exp
+@@ -151,18 +151,18 @@ proc do_self_tests {function body} {
+     }
+ 
+     # Remove any old copy lying around.
+-    remote_file host delete $xgdb
++    #remote_file host delete $xgdb
+ 
+     gdb_start
+-    set file [remote_download host $GDB_FULLPATH $xgdb]
++    #set file [remote_download host $GDB_FULLPATH $xgdb]
+ 
+-    set result [selftest_setup $file $function]
++    set result [selftest_setup $GDB_FULLPATH $function]
+     if {$result == 0} then {
+ 	set result [uplevel $body]
+     }
+ 
+     gdb_exit
+-    catch "remote_file host delete $file"
++    #catch "remote_file host delete $file"
+ 
+     if {$result < 0} then {
+ 	warning "Couldn't test self"

SOURCES/gdb-6.3-threaded-watchpoints2-20050225.patch

@@ -54,7 +54,7 @@ diff --git a/gdb/testsuite/gdb.threads/watchthreads-threaded.c b/gdb/testsuite/g
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.threads/watchthreads-threaded.c
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,66 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
@@ -72,8 +72,8 @@ new file mode 100644
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+
++   Boston, MA 02111-1307, USA.  
++ 
 +   This file is copied from schedlock.c.  */
 +
 +#include <stdio.h>
@@ -120,6 +120,7 @@ new file mode 100644
 +
 +    pthread_exit(NULL);
 +}
++
 diff --git a/gdb/testsuite/gdb.threads/watchthreads-threaded.exp b/gdb/testsuite/gdb.threads/watchthreads-threaded.exp
 new file mode 100644
 --- /dev/null
@@ -141,7 +142,7 @@ new file mode 100644
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +# Check that GDB can support multiple watchpoints across threads.
 +
@@ -212,9 +213,9 @@ new file mode 100644
 +       { set args_2 1; set test_flag 1 }
 +    -re "Hardware watchpoint 4: args\\\[3\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads-threaded.c:$init_line.*$gdb_prompt $"
 +       { set args_3 1; set test_flag 1 }
-+    -re "Hardware watchpoint 3: args\\\[2\\\].*Old value = $args_2.*New value = [expr $args_2+1].*thread_function \\\(arg=0x2\\\) at .*watchthreads-threaded.c:$inc_line.*$gdb_prompt $"
++    -re "Hardware watchpoint 3: args\\\[2\\\].*Old value = $args_2.*New value = [expr $args_2+1].*in thread_function \\\(arg=0x2\\\) at .*watchthreads-threaded.c:$inc_line.*$gdb_prompt $"
 +       { set args_2 [expr $args_2+1]; set test_flag 1 }
-+    -re "Hardware watchpoint 4: args\\\[3\\\].*Old value = $args_3.*New value = [expr $args_3+1].*thread_function \\\(arg=0x3\\\) at .*watchthreads-threaded.c:$inc_line.*$gdb_prompt $"
++    -re "Hardware watchpoint 4: args\\\[3\\\].*Old value = $args_3.*New value = [expr $args_3+1].*in thread_function \\\(arg=0x3\\\) at .*watchthreads-threaded.c:$inc_line.*$gdb_prompt $"
 +       { set args_3 [expr $args_3+1]; set test_flag 1 }
 +  }
 +  # If we fail above, don't bother continuing loop
@@ -231,7 +232,7 @@ new file mode 100644
 +# Verify that we hit first watchpoint in child thread.
 +set message "watchpoint on args\[2\] hit in thread"
 +if { $args_2 > 1 } {
-+  pass $message
++  pass $message 
 +} else {
 +  fail $message
 +}
@@ -239,15 +240,15 @@ new file mode 100644
 +# Verify that we hit second watchpoint in child thread.
 +set message "watchpoint on args\[3\] hit in thread"
 +if { $args_3 > 1 } {
-+  pass $message
++  pass $message 
 +} else {
-+  fail $message
++  fail $message 
 +}
 +
 +# Verify that all watchpoint hits are accounted for.
 +set message "combination of threaded watchpoints = 30 + initial values"
 +if { [expr $args_2+$args_3] == [expr [expr 30+$init_args_2]+$init_args_3] } {
-+  pass $message
++  pass $message 
 +} else {
-+  fail $message
++  fail $message 
 +}

SOURCES/gdb-6.5-BEA-testsuite.patch

@@ -30,14 +30,14 @@ new file mode 100644
 + * gdb.  Inside gdb, you should be able to do something like this:
 + *
 + * (gdb) t a a bt
-+ *
++ * 
 + * Thread 7 (process 4352):
 + * #0  0x001ba7dc in __nanosleep_nocancel () from /lib/tls/libc.so.6
 + * #1  0x001ba5ff in sleep () from /lib/tls/libc.so.6
 + * #2  0x080488a2 in makeSyscall (ignored=0x0) at threadcrash.c:118
 + * #3  0x006aadec in start_thread () from /lib/tls/libpthread.so.0
 + * #4  0x001ed19a in clone () from /lib/tls/libc.so.6
-+ *
++ * 
 + * Thread 6 (process 4353):
 + * #0  0x001ba7dc in __nanosleep_nocancel () from /lib/tls/libc.so.6
 + * #1  0x001ba5ff in sleep () from /lib/tls/libc.so.6
@@ -48,7 +48,7 @@ new file mode 100644
 + * #5  0x08048a51 in makeSyscallFromSighandler (ignored=0x0) at threadcrash.c:204
 + * #6  0x006aadec in start_thread () from /lib/tls/libpthread.so.0
 + * #7  0x001ed19a in clone () from /lib/tls/libc.so.6
-+ *
++ * 
 + * Thread 5 (process 4354):
 + * #0  0x001ba7dc in __nanosleep_nocancel () from /lib/tls/libc.so.6
 + * #1  0x001ba5ff in sleep () from /lib/tls/libc.so.6
@@ -59,12 +59,12 @@ new file mode 100644
 + * #5  0x080489e2 in makeSyscallFromAltSighandler (ignored=0x0) at threadcrash.c:190
 + * #6  0x006aadec in start_thread () from /lib/tls/libpthread.so.0
 + * #7  0x001ed19a in clone () from /lib/tls/libc.so.6
-+ *
++ * 
 + * Thread 4 (process 4355):
 + * #0  spin (ignored=0x0) at threadcrash.c:242
 + * #1  0x006aadec in start_thread () from /lib/tls/libpthread.so.0
 + * #2  0x001ed19a in clone () from /lib/tls/libc.so.6
-+ *
++ * 
 + * Thread 3 (process 4356):
 + * #0  spinningSighandler (signo=12, info=0xb4de46f0, context=0xb4de4770) at threadcrash.c:180
 + * #1  <signal handler called>
@@ -72,7 +72,7 @@ new file mode 100644
 + * #3  0x08048b2f in spinFromSighandler (ignored=0x0) at threadcrash.c:232
 + * #4  0x006aadec in start_thread () from /lib/tls/libpthread.so.0
 + * #5  0x001ed19a in clone () from /lib/tls/libc.so.6
-+ *
++ * 
 + * Thread 2 (process 4357):
 + * #0  spinningAltSighandler (signo=14, info=0x959ee50, context=0x959eed0) at threadcrash.c:156
 + * #1  <signal handler called>
@@ -80,7 +80,7 @@ new file mode 100644
 + * #3  0x08048ac0 in spinFromAltSighandler (ignored=0x0) at threadcrash.c:218
 + * #4  0x006aadec in start_thread () from /lib/tls/libpthread.so.0
 + * #5  0x001ed19a in clone () from /lib/tls/libc.so.6
-+ *
++ * 
 + * Thread 1 (process 4351):
 + * #0  0x08048cf3 in main (argc=1, argv=0xbfff9d74) at threadcrash.c:273
 + * (gdb)
@@ -107,11 +107,11 @@ new file mode 100644
 +   int result;
 +   stack_t altstack;
 +   stack_t oldaltstack;
-+
++   
 +   memset(&action, 0, sizeof(action));
 +   memset(&altstack, 0, sizeof(altstack));
 +   memset(&oldaltstack, 0, sizeof(oldaltstack));
-+
++   
 +   if (onAltstack) {
 +      altstack.ss_sp = malloc(SIGSTKSZ);
 +      assert(altstack.ss_sp != NULL);
@@ -121,9 +121,9 @@ new file mode 100644
 +      assert(result == 0);
 +      assert(oldaltstack.ss_flags == SS_DISABLE);
 +   }
-+
++   
 +   sigemptyset(&sigset);
-+
++   
 +   action.sa_handler = NULL;
 +   action.sa_sigaction = handler;
 +   action.sa_mask = sigset;
@@ -131,7 +131,7 @@ new file mode 100644
 +   if (onAltstack) {
 +      action.sa_flags |= SA_ONSTACK;
 +   }
-+
++   
 +   result = sigaction(signo, &action, NULL);
 +   assert(result == 0);
 +}
@@ -157,10 +157,10 @@ new file mode 100644
 +static int onAltstack(void) {
 +   stack_t stack;
 +   int result;
-+
++   
 +   result = sigaltstack(NULL, &stack);
 +   assert(result == 0);
-+
++   
 +   return stack.ss_flags & SS_ONSTACK;
 +}
 +
@@ -168,11 +168,11 @@ new file mode 100644
 +   (void)signo;
 +   (void)info;
 +   (void)context;
-+
++   
 +   if (!onAltstack()) {
 +      printf("%s() not running on altstack!\n", __FUNCTION__);
 +   }
-+
++   
 +   sleep(42);
 +}
 +
@@ -180,11 +180,11 @@ new file mode 100644
 +   (void)signo;
 +   (void)info;
 +   (void)context;
-+
++   
 +   if (!onAltstack()) {
 +      printf("%s() not running on altstack!\n", __FUNCTION__);
 +   }
-+
++   
 +   while (1);
 +}
 +
@@ -192,11 +192,11 @@ new file mode 100644
 +   (void)signo;
 +   (void)info;
 +   (void)context;
-+
++   
 +   if (onAltstack()) {
 +      printf("%s() running on altstack!\n", __FUNCTION__);
 +   }
-+
++   
 +   sleep(42);
 +}
 +
@@ -204,73 +204,73 @@ new file mode 100644
 +   (void)signo;
 +   (void)info;
 +   (void)context;
-+
++   
 +   if (onAltstack()) {
 +      printf("%s() running on altstack!\n", __FUNCTION__);
 +   }
-+
++   
 +   while (1);
 +}
 +
 +static void *makeSyscallFromAltSighandler(void *ignored) {
 +   (void)ignored;
-+
++   
 +   int result;
-+
++   
 +   installAlthandler(SIGSYSCALL_ALT, syscallingAltSighandler);
-+
++   
 +   result = pthread_kill(pthread_self(), SIGSYSCALL_ALT);
 +   assert(result == 0);
-+
++   
 +   fprintf(stderr, "%s: returning\n", __FUNCTION__);
 +   return NULL;
 +}
 +
 +static void *makeSyscallFromSighandler(void *ignored) {
 +   (void)ignored;
-+
++   
 +   int result;
-+
++   
 +   installNormalHandler(SIGSYSCALL, syscallingSighandler);
-+
++   
 +   result = pthread_kill(pthread_self(), SIGSYSCALL);
 +   assert(result == 0);
-+
++   
 +   fprintf(stderr, "%s: returning\n", __FUNCTION__);
 +   return NULL;
 +}
 +
 +static void *spinFromAltSighandler(void *ignored) {
 +   (void)ignored;
-+
++   
 +   int result;
-+
++   
 +   installAlthandler(SIGSPIN_ALT, spinningAltSighandler);
-+
++   
 +   result = pthread_kill(pthread_self(), SIGSPIN_ALT);
 +   assert(result == 0);
-+
++   
 +   fprintf(stderr, "%s: returning\n", __FUNCTION__);
 +   return NULL;
 +}
 +
 +static void *spinFromSighandler(void *ignored) {
 +   (void)ignored;
-+
++   
 +   int result;
-+
++   
 +   installNormalHandler(SIGSPIN, spinningSighandler);
-+
++   
 +   result = pthread_kill(pthread_self(), SIGSPIN);
 +   assert(result == 0);
-+
++   
 +   fprintf(stderr, "%s: returning\n", __FUNCTION__);
 +   return NULL;
 +}
 +
 +static void *spin(void *ignored) {
 +   (void)ignored;
-+
++   
 +   while (1);
 +
 +   fprintf(stderr, "%s: returning\n", __FUNCTION__);
@@ -281,7 +281,7 @@ new file mode 100644
 +   int result;
 +   pthread_t thread;
 +   volatile int bad;
-+
++   
 +   result = pthread_create(&thread, NULL, makeSyscall, NULL);
 +   assert(result == 0);
 +   result = pthread_create(&thread, NULL, makeSyscallFromSighandler, NULL);
@@ -294,10 +294,10 @@ new file mode 100644
 +   assert(result == 0);
 +   result = pthread_create(&thread, NULL, spinFromAltSighandler, NULL);
 +   assert(result == 0);
-+
++   
 +   // Give threads some time to get going
 +   sleep(3);
-+
++   
 +   // Crash
 +   bad = *(int*)7;
 +
@@ -309,7 +309,7 @@ new file mode 100644
 +      Keep it late to ensure persistency in the registers.  */
 +   bad = (int) argc;
 +   bad = (unsigned long) argv;
-+
++   
 +   return 0;
 +}
 diff --git a/gdb/testsuite/gdb.threads/threadcrash.exp b/gdb/testsuite/gdb.threads/threadcrash.exp
@@ -480,27 +480,27 @@ new file mode 100644
 +# Verify that $LOG contains all information we want
 +function verifyLog() {
 +    local FAILURES=0
-+
++    
 +    mustNotHave '??' || ((FAILURES++))
 +    mustHaveCorrectAmount 11 threadcrash.c: || ((FAILURES++))
-+
++    
 +    mustHaveSevenThreads || ((FAILURES++))
 +    mustHaveSequence sleep "makeSyscall (ignored=" || ((FAILURES++))
-+
++    
 +    mustHaveSequence sleep "syscallingSighandler (signo=" "signal handler called" 0x || ((FAILURES++))
 +    mustHaveSequence pthread_kill "makeSyscallFromSighandler (ignored=" || ((FAILURES++))
-+
++    
 +    mustHaveSequence sleep "syscallingAltSighandler (signo=" "signal handler called" 0x || ((FAILURES++))
 +    mustHaveSequence pthread_kill "makeSyscallFromAltSighandler (ignored=" || ((FAILURES++))
-+
++    
 +    mustHaveSequence Thread "spin (ignored=" || ((FAILURES++))
-+
++    
 +    mustHaveSequence "spinningSighandler (signo=" "signal handler called" 0x || ((FAILURES++))
 +    mustHaveSequence pthread_kill "spinFromSighandler (ignored=" || ((FAILURES++))
-+
++    
 +    mustHaveSequence "spinningAltSighandler (signo=" "signal handler called" 0x || ((FAILURES++))
 +    mustHaveSequence pthread_kill "spinFromAltSighandler (ignored=" || ((FAILURES++))
-+
++    
 +    mustHaveSequence Thread "main (argc=1, argv=" || ((FAILURES++))
 +
 +    return $FAILURES
@@ -577,7 +577,7 @@ new file mode 100644
 +	fail
 +    fi
 +    pass
-+
++    
 +    # Verify that we got a core file from gcore
 +    set_test gdb gcore did not create a core file
 +    if [ ! -r core* ] ; then
@@ -762,27 +762,27 @@ new file mode 100644
 +# Verify that $LOG contains all information we want
 +function verifyLog() {
 +    local FAILURES=0
-+
++    
 +    mustNotHave '??' || ((FAILURES++))
 +    mustHaveCorrectAmount 12 threadcrash.c: || ((FAILURES++))
-+
++    
 +    mustHaveSevenThreads || ((FAILURES++))
 +    mustHaveSequence sleep "makeSyscall (ignored=" || ((FAILURES++))
-+
++    
 +    mustHaveSequence sleep "syscallingSighandler (signo=" "signal handler called" 0x || ((FAILURES++))
 +    mustHaveSequence pthread_kill "makeSyscallFromSighandler (ignored=" || ((FAILURES++))
-+
++    
 +    mustHaveSequence sleep "syscallingAltSighandler (signo=" "signal handler called" 0x || ((FAILURES++))
 +    mustHaveSequence pthread_kill "makeSyscallFromAltSighandler (ignored=" || ((FAILURES++))
-+
++    
 +    mustHaveSequence Thread "spin (ignored=" || ((FAILURES++))
-+
++    
 +    mustHaveSequence "spinningSighandler (signo=" "signal handler called" 0x || ((FAILURES++))
 +    mustHaveSequence pthread_kill "spinFromSighandler (ignored=" || ((FAILURES++))
-+
++    
 +    mustHaveSequence "spinningAltSighandler (signo=" "signal handler called" 0x || ((FAILURES++))
 +    mustHaveSequence pthread_kill "spinFromAltSighandler (ignored=" || ((FAILURES++))
-+
++    
 +    mustHaveSequence Thread "main (argc=1, argv=" || ((FAILURES++))
 +
 +    return $FAILURES
@@ -844,7 +844,7 @@ new file mode 100644
 +        ((FAILURES++))
 +        echo >> /dev/stderr WARNING: gdb exited with error code $EXITCODE when creating gcore file
 +    fi
-+
++    
 +    # Verify that we got a core file from gcore
 +    if [ ! -r core* ] ; then
 +        echo >> /dev/stderr ERROR: gdb gcore did not create a core file

SOURCES/gdb-6.5-bz109921-DW_AT_decl_file-test.patch

@@ -42,7 +42,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
@@ -66,12 +66,12 @@ new file mode 100644
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -86,7 +86,7 @@ new file mode 100644
 +    && ![istarget *-*-openbsd*]
 +    && ![istarget arm-*-eabi*]
 +    && ![istarget powerpc-*-eabi*]} {
-+    return 0
++    return 0  
 +}
 +
 +set testfile "dw2-included"
@@ -125,7 +125,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,

SOURCES/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch

@@ -44,9 +44,9 @@ 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
-@@ -1210,6 +1210,10 @@ print_command_1 (const char *args, int voidprint)
+@@ -1190,6 +1190,10 @@ print_command_1 (const char *exp, int voidprint)
  
-   if (exp != nullptr && *exp)
+   if (exp && *exp)
      {
 +      /* '*((int *(*) (void)) __errno_location) ()' is incompatible with
 +	 function descriptors.  */

SOURCES/gdb-6.5-bz203661-emit-relocs.patch

@@ -0,0 +1,24 @@
+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-6.5-bz203661-emit-relocs.patch
+
+;; Fix debuginfo addresses resolving for --emit-relocs Linux kernels (BZ 203661).
+;;=push+jan: There was some mail thread about it, this patch may be a hack.
+
+diff --git a/gdb/symfile.c b/gdb/symfile.c
+--- a/gdb/symfile.c
++++ b/gdb/symfile.c
+@@ -3584,6 +3584,12 @@ default_symfile_relocate (struct objfile *objfile, asection *sectp,
+      DWO file.  */
+   bfd *abfd = sectp->owner;
+ 
++  /* Executable files have all the relocations already resolved.
++     Handle files linked with --emit-relocs.
++     http://sources.redhat.com/ml/gdb/2006-08/msg00137.html  */
++  if ((abfd->flags & EXEC_P) != 0)
++    return NULL;
++
+   /* We're only interested in sections with relocation
+      information.  */
+   if ((sectp->flags & SEC_RELOC) == 0)

SOURCES/gdb-6.5-bz216711-clone-is-outermost.patch

@@ -0,0 +1,304 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date: Fri, 27 Oct 2017 21:07:50 +0200
+Subject: gdb-6.5-bz216711-clone-is-outermost.patch
+
+;; Fix bogus 0x0 unwind of the thread's topmost function clone(3) (BZ 216711).
+;;=fedora
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=216711
+
+FIXME: This workaround should be dropped and
+glibc/sysdeps/unix/sysv/linux/x86_64/clone.S should get CFI for the child
+instead.
+
+2006-12-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb/amd64-linux-tdep.c (linux_clone_code): New variable.
+	(LINUX_CLONE_LEN): New definition.
+	(amd64_linux_clone_running, amd64_linux_outermost_frame): New function.
+	(amd64_linux_init_abi): Initialize `outermost_frame_p'.
+	* gdb/i386-tdep.c (i386_gdbarch_init): Likewise.
+	* gdb/i386-tdep.h (gdbarch_tdep): Add `outermost_frame_p' member.
+	* gdb/amd64-tdep.c (amd64_frame_this_id): Call `outermost_frame_p'.
+
+2006-12-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.threads/bt-clone-stop.exp, gdb.threads/bt-clone-stop.c:
+	New file.
+
+2007-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7.
+
+diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
+--- a/gdb/amd64-linux-tdep.c
++++ b/gdb/amd64-linux-tdep.c
+@@ -291,6 +291,80 @@ amd64_linux_register_reggroup_p (struct gdbarch *gdbarch, int regnum,
+ 
+ /* Set the program counter for process PTID to PC.  */
+ 
++/* Detect the outermost frame; during unwind of
++   	#5  0x000000305cec68c3 in clone () from /lib64/tls/libc.so.6
++   avoid the additional bogus frame
++   	#6  0x0000000000000000 in ??
++   We compare if the `linux_clone_code' block is _before_ unwound PC.  */
++
++static const unsigned char linux_clone_code[] =
++{
++/* libc/sysdeps/unix/sysv/linux/x86_64/clone.S */
++/* #ifdef RESET_PID */
++/* ... */
++/* 	mov	$SYS_ify(getpid), %eax */
++/* 0xb8, 0x27, 0x00, 0x00, 0x00 */
++/* OR */
++/* 	mov	$SYS_ify(getpid), %rax */
++/* 0x48, 0xc7, 0xc0, 0x27, 0x00, 0x00, 0x00 */
++/* so just: */
++  0x27, 0x00, 0x00, 0x00,
++/* 	syscall */
++  0x0f, 0x05,
++/* 	movl	%eax, %fs:PID */
++  0x64, 0x89, 0x04, 0x25, 0x94, 0x00, 0x00, 0x00,
++/* 	movl	%eax, %fs:TID */
++  0x64, 0x89, 0x04, 0x25, 0x90, 0x00, 0x00, 0x00,
++/* #endif */
++/* 	|* Set up arguments for the function call.  *| */
++/* 	popq	%rax		|* Function to call.  *| */
++  0x58,
++/* 	popq	%rdi		|* Argument.  *| */
++  0x5f,
++/* 	call	*%rax$   */
++  0xff, 0xd0
++};
++
++#define LINUX_CLONE_LEN (sizeof linux_clone_code)
++
++static int
++amd64_linux_clone_running (struct frame_info *this_frame)
++{
++  CORE_ADDR pc = get_frame_pc (this_frame);
++  unsigned char buf[LINUX_CLONE_LEN];
++
++  if (!safe_frame_unwind_memory (this_frame, pc - LINUX_CLONE_LEN, buf,
++				 LINUX_CLONE_LEN))
++    return 0;
++
++  if (memcmp (buf, linux_clone_code, LINUX_CLONE_LEN) != 0)
++    return 0;
++
++  return 1;
++}
++
++static int
++amd64_linux_outermost_frame (struct frame_info *this_frame)
++{
++  CORE_ADDR pc = get_frame_pc (this_frame);
++  const char *name;
++
++  find_pc_partial_function (pc, &name, NULL, NULL);
++
++  /* If we have NAME, we can optimize the search.
++     `clone' NAME still needs to have the code checked as its name may be
++     present in the user code.
++     `__clone' NAME should not be present in the user code but in the initial
++     parts of the `__clone' implementation the unwind still makes sense.
++     More detailed unwinding decision would be too much sensitive to possible
++     subtle changes in specific glibc revisions.  */
++  if (name == NULL || strcmp (name, "clone") == 0
++      || strcmp ("__clone", name) == 0)
++    return (amd64_linux_clone_running (this_frame) != 0);
++
++  return 0;
++}
++
+ static void
+ amd64_linux_write_pc (struct regcache *regcache, CORE_ADDR pc)
+ {
+@@ -1808,6 +1882,8 @@ amd64_linux_init_abi_common(struct gdbarch_info info, struct gdbarch *gdbarch)
+ 
+   tdep->xsave_xcr0_offset = I386_LINUX_XSAVE_XCR0_OFFSET;
+ 
++  tdep->outermost_frame_p = amd64_linux_outermost_frame;
++
+   /* Add the %orig_rax register used for syscall restarting.  */
+   set_gdbarch_write_pc (gdbarch, amd64_linux_write_pc);
+ 
+diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
+--- a/gdb/amd64-tdep.c
++++ b/gdb/amd64-tdep.c
+@@ -2595,6 +2595,7 @@ amd64_frame_unwind_stop_reason (struct frame_info *this_frame,
+ {
+   struct amd64_frame_cache *cache =
+     amd64_frame_cache (this_frame, this_cache);
++  struct gdbarch_tdep *tdep = gdbarch_tdep (get_frame_arch (this_frame));
+ 
+   if (!cache->base_p)
+     return UNWIND_UNAVAILABLE;
+@@ -2603,6 +2604,10 @@ amd64_frame_unwind_stop_reason (struct frame_info *this_frame,
+   if (cache->base == 0)
+     return UNWIND_OUTERMOST;
+ 
++  /* Detect OS dependent outermost frames; such as `clone'.  */
++  if (tdep->outermost_frame_p && tdep->outermost_frame_p (this_frame))
++    return UNWIND_OUTERMOST;
++
+   return UNWIND_NO_REASON;
+ }
+ 
+@@ -2737,6 +2742,7 @@ amd64_sigtramp_frame_this_id (struct frame_info *this_frame,
+ {
+   struct amd64_frame_cache *cache =
+     amd64_sigtramp_frame_cache (this_frame, this_cache);
++  struct gdbarch_tdep *tdep = gdbarch_tdep (get_frame_arch (this_frame));
+ 
+   if (!cache->base_p)
+     (*this_id) = frame_id_build_unavailable_stack (get_frame_pc (this_frame));
+@@ -2745,6 +2751,11 @@ amd64_sigtramp_frame_this_id (struct frame_info *this_frame,
+       /* This marks the outermost frame.  */
+       return;
+     }
++  else if (tdep->outermost_frame_p && tdep->outermost_frame_p (this_frame))
++    {
++      /* Detect OS dependent outermost frames; such as `clone'.  */
++      return;
++    }
+   else
+     (*this_id) = frame_id_build (cache->base + 16, get_frame_pc (this_frame));
+ }
+diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
+--- a/gdb/i386-tdep.c
++++ b/gdb/i386-tdep.c
+@@ -8406,6 +8406,9 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
+ 
+   tdep->xsave_xcr0_offset = -1;
+ 
++  /* Unwinding stops on i386 automatically.  */
++  tdep->outermost_frame_p = NULL;
++
+   tdep->record_regmap = i386_record_regmap;
+ 
+   set_gdbarch_type_align (gdbarch, i386_type_align);
+diff --git a/gdb/i386-tdep.h b/gdb/i386-tdep.h
+--- a/gdb/i386-tdep.h
++++ b/gdb/i386-tdep.h
+@@ -251,6 +251,9 @@ struct gdbarch_tdep
+ 
+   /* Regsets. */
+   const struct regset *fpregset;
++
++  /* Detect OS dependent outermost frames; such as `clone'.  */
++  int (*outermost_frame_p) (struct frame_info *this_frame);
+ };
+ 
+ /* Floating-point registers.  */
+diff --git a/gdb/testsuite/gdb.threads/bt-clone-stop.c b/gdb/testsuite/gdb.threads/bt-clone-stop.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/bt-clone-stop.c
+@@ -0,0 +1,39 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2006 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++ 
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++   MA 02110-1301, USA.  */
++
++
++#include <pthread.h>
++#include <unistd.h>
++#include <assert.h>
++
++
++void *threader (void *arg)
++{
++	assert (0);
++	return NULL;
++}
++
++int main (void)
++{
++	pthread_t t1;
++
++	pthread_create (&t1, NULL, threader, (void *) NULL);
++	for (;;)
++		pause();
++}
+diff --git a/gdb/testsuite/gdb.threads/bt-clone-stop.exp b/gdb/testsuite/gdb.threads/bt-clone-stop.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/bt-clone-stop.exp
+@@ -0,0 +1,61 @@
++# Copyright 2006 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++# 
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++# 
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
++
++# Backtraced `clone' must not have `PC == 0' as its previous frame.
++
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set testfile bt-clone-stop
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++if  { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++
++# Get things started.
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++# threader: threader.c:8: threader: Assertion `0' failed.
++# Program received signal SIGABRT, Aborted.
++
++gdb_test "run" \
++     {Thread 2 "bt-clone-stop" received signal SIGABRT.*} \
++     "run"
++
++# Former gdb unwind (the first function is `clone'):
++# #5  0x0000003421ecd62d in ?? () from /lib64/libc.so.6
++# #6  0x0000000000000000 in ?? ()
++# (gdb)
++# Tested `amd64_linux_outermost_frame' functionality should omit the line `#6'.
++# 
++# Two `-re' cases below must be in this order (1st is a subset of the 2nd one).
++# Unhandled case below should not happen and it is fortunately handled by
++# `amd64_linux_outermost_frame' as FAIL (and result `0x0 entry output invalid').
++gdb_test_multiple "bt" "0x0 entry output invalid" {
++    -re "in threader \\(.*\n#\[0-9\]* *0x0* in .*$gdb_prompt $" {
++    	fail "0x0 entry found"
++    }
++    -re "in threader \\(.*$gdb_prompt $" {
++    	pass "0x0 entry not found"
++    }
++}

SOURCES/gdb-6.5-bz218379-ppc-solib-trampoline-test.patch

@@ -0,0 +1,102 @@
+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-6.5-bz218379-ppc-solib-trampoline-test.patch
+
+;; Test sideeffects of skipping ppc .so libs trampolines (BZ 218379).
+;;=fedoratest
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
+
+diff --git a/gdb/testsuite/gdb.base/step-over-trampoline.c b/gdb/testsuite/gdb.base/step-over-trampoline.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/step-over-trampoline.c
+@@ -0,0 +1,28 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2006 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++ 
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++   Please email any bugs, comments, and/or additions to this file to:
++   bug-gdb@prep.ai.mit.edu  */
++
++#include <stdio.h>
++
++int main (void)
++{
++	puts ("hello world");
++	return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/step-over-trampoline.exp b/gdb/testsuite/gdb.base/step-over-trampoline.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/step-over-trampoline.exp
+@@ -0,0 +1,54 @@
++# Copyright 2006 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++# 
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++# 
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
++
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set testfile step-over-trampoline
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++
++# Get things started.
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++# For C programs, "start" should stop in main().
++
++gdb_test "start" \
++         "main \\(\\) at .*$srcfile.*" \
++         "start"
++
++# main () at hello2.c:5
++# 5		puts("hello world\n");
++# (gdb) next
++# 0x100007e0 in call___do_global_ctors_aux ()
++
++gdb_test_multiple "next" "invalid `next' output" {
++	-re "\nhello world.*return 0;.*" {
++		pass "stepped over"
++	}
++	-re " in call___do_global_ctors_aux \\(\\).*" {
++		fail "stepped into trampoline"
++	}
++}

SOURCES/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch

@@ -11,8 +11,8 @@ 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
-@@ -3169,6 +3169,13 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
- 	     msymbol->linkage_name ()); */
+@@ -3165,6 +3165,13 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
+ 	     SYMBOL_LINKAGE_NAME (msymbol)); */
  	  ;
  	/* fall through */
 +	/* `msymbol' trampoline may be located before its .text symbol
@@ -20,8 +20,8 @@ diff --git a/gdb/symtab.c b/gdb/symtab.c
 +	   Avoid `find_pc_sect_line'<->`find_pc_line' infinite loop.
 +	   Red Hat Bug 218379.  */
 +	else if (BMSYMBOL_VALUE_ADDRESS (mfunsym) == pc)
-+	  warning ("In stub for %s (0x%s); interlocked, please submit the binary to http://bugzilla.redhat.com", msymbol.minsym->linkage_name (), paddress (target_gdbarch (), pc));
++	  warning ("In stub for %s (0x%s); interlocked, please submit the binary to http://bugzilla.redhat.com", MSYMBOL_LINKAGE_NAME (msymbol.minsym), paddress (target_gdbarch (), pc));
 +	/* fall through */
  	else
- 	  {
- 	    /* Detect an obvious case of infinite recursion.  If this
+ 	  return find_pc_line (BMSYMBOL_VALUE_ADDRESS (mfunsym), 0);
+       }

SOURCES/gdb-6.5-bz243845-stale-testing-zombie-test.patch

@@ -10,27 +10,26 @@ diff --git a/gdb/testsuite/gdb.base/tracefork-zombie.exp b/gdb/testsuite/gdb.bas
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/tracefork-zombie.exp
-@@ -0,0 +1,76 @@
+@@ -0,0 +1,75 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 +
 +# are we on a target board
-+if {[use_gdb_stub]} {
-+    untested "skipping test because of use_gdb_stub"
-+    return -1
++if [is_remote target] then {
++    return 0
 +}
 +
 +# Start the program running and then wait for a bit, to be sure

SOURCES/gdb-6.5-gcore-buffer-limit-test.patch

@@ -24,7 +24,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -40,7 +40,7 @@ new file mode 100644
 +int main()
 +{
 +  void *mem;
-+
++  
 +  mem = malloc (MEGS * 1024ULL * 1024ULL);
 +
 +  for (;;)
@@ -52,27 +52,22 @@ diff --git a/gdb/testsuite/gdb.base/gcore-excessive-memory.exp b/gdb/testsuite/g
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gcore-excessive-memory.exp
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,94 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+if {[use_gdb_stub]} {
-+    untested "skipping test because of use_gdb_stub"
-+    return -1
-+}
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +set testfile gcore-excessive-memory
 +set srcfile ${testfile}.c

SOURCES/gdb-6.5-ia64-libunwind-leak-test.patch

@@ -24,7 +24,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -44,27 +44,22 @@ diff --git a/gdb/testsuite/gdb.base/unwind-leak.exp b/gdb/testsuite/gdb.base/unw
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/unwind-leak.exp
-@@ -0,0 +1,88 @@
+@@ -0,0 +1,83 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+if {[use_gdb_stub]} {
-+    untested "skipping test because of use_gdb_stub"
-+    return -1
-+}
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +set testfile unwind-leak
 +set srcfile ${testfile}.c
@@ -109,7 +104,7 @@ new file mode 100644
 +verbose -log "cycles = $cycles, permit_kb = $permit_kb"
 +
 +set fail 0
-+set test "breakpoint stop/continue cycles"
++set test "breakpoint stop/continue cycles" 
 +for {set i $cycles} {$i > 0} {set i [expr {$i - 1}]} {
 +    gdb_test_multiple "continue" $test {
 +	-re "Breakpoint 2, main .*alarm .*.*${gdb_prompt} $" {

SOURCES/gdb-6.5-last-address-space-byte-test.patch

@@ -17,15 +17,15 @@ new file mode 100644
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +if $tracelevel then {
 +    strace $tracelevel

SOURCES/gdb-6.5-missed-trap-on-step-test.patch

@@ -27,7 +27,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -55,15 +55,15 @@ new file mode 100644
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +set testfile watchpoint-during-step
 +set srcfile ${testfile}.c

SOURCES/gdb-6.5-readline-long-line-crash-test.patch

@@ -12,22 +12,22 @@ diff --git a/gdb/testsuite/gdb.base/readline-overflow.exp b/gdb/testsuite/gdb.ba
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/readline-overflow.exp
-@@ -0,0 +1,96 @@
+@@ -0,0 +1,126 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +# Please email any bugs, comments, and/or additions to this file to:
 +# bug-gdb@prep.ai.mit.edu
@@ -44,68 +44,98 @@ new file mode 100644
 +  strace $tracelevel
 +}
 +
++# Don't let a .inputrc file or an existing setting of INPUTRC mess up
++# the test results.  Even if /dev/null doesn't exist on the particular
++# platform, the readline library will use the default setting just by
++# failing to open the file.  OTOH, opening /dev/null successfully will
++# also result in the default settings being used since nothing will be
++# read from this file.
 +global env
++if [info exists env(INPUTRC)] {
++    set old_inputrc $env(INPUTRC)
++}
++set env(INPUTRC) "/dev/null"
 +
-+save_vars { env(GDBHISTFILE) env(HISTSIZE) TERM timeout } {
-+    # The arrow key test relies on the standard VT100 bindings, so
-+    # make sure that an appropriate terminal is selected.  The same
-+    # bug doesn't show up if we use ^P / ^N instead.
-+    setenv TERM vt100
++set oldtimeout1 $timeout
++set timeout 600
 +
-+    set timeout 600
++if [info exists env(GDBHISTFILE)] {
++    set old_gdbhistfile $env(GDBHISTFILE)
++}
++if [info exists env(HISTSIZE)] {
++    set old_histsize $env(HISTSIZE)
++}
++set env(GDBHISTFILE) "${srcdir}/${subdir}/gdb_history"
++set env(HISTSIZE) "10"
 +
-+    set env(GDBHISTFILE) "${srcdir}/${subdir}/gdb_history"
-+    set env(HISTSIZE) "10"
-+
-+    gdb_exit
-+    gdb_start
-+    gdb_reinitialize_dir $srcdir/$subdir
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
 +
 +
-+    set width 11
-+    gdb_test "set width $width" \
-+	"" \
-+	"Setting width to $width."
-+    #gdb_test "set height 1" \
-+	#         "" \
-+	#         "Setting height to 1."
-+    send_gdb "run X"
-+    set i 0
-+    # It crashes using `set width 7' on `set total 3560'.
-+    # Sometimes it corrupts screen on `set width 7'.
-+    # Bugreport used `set total 130001':
-+    # 	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=214196
-+    # Check also `timeout' above.
-+    set total 4200
-+    gdb_expect {
++set width 11
++gdb_test "set width $width" \
++         "" \
++         "Setting width to $width."
++#gdb_test "set height 1" \
++#         "" \
++#         "Setting height to 1."
++send_gdb "run X"
++set i 0
++# It crashes using `set width 7' on `set total 3560'.
++# Sometimes it corrupts screen on `set width 7'.
++# Bugreport used `set total 130001':
++# 	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=214196
++# Check also `timeout' above.
++set total 4200
++gdb_expect {
 +	-re X {
-+	    incr i
-+	    if {$i <= $total} {
-+		send_gdb "X"
-+		exp_continue
-+	    }
++		incr i
++		if {$i <= $total} {
++			send_gdb "X"
++			exp_continue
++		}
 +	}
 +	-re "\[ \b\r\n\]" {
-+	    exp_continue
++		exp_continue
 +	}
 +	eof {
-+	    fail "gdb sending total $total characters"
-+	    note "Failed after sending $i characters, reason: EOF"
-+	    gdb_clear_suppressed
++		fail "gdb sending total $total characters"
++		note "Failed after sending $i characters, reason: EOF"
++		gdb_clear_suppressed
 +	}
 +	timeout {
-+	    fail "gdb sending total $total characters"
-+	    note "Failed after sending $i characters (timeout $timeout), reason: TIMEOUT"
-+	    gdb_clear_suppressed
++		fail "gdb sending total $total characters"
++		note "Failed after sending $i characters (timeout $timeout), reason: TIMEOUT"
++		gdb_clear_suppressed
 +	}
 +	default {
-+	    fail "gdb sending total $total characters"
-+	    note "Failed after sending $i characters, reason: 0=\[$expect_out(0,string)\] buffer=\[$expect_out(buffer)\]"
-+	    gdb_clear_suppressed
++		fail "gdb sending total $total characters"
++		note "Failed after sending $i characters, reason: 0=\[$expect_out(0,string)\] buffer=\[$expect_out(buffer)\]"
++		gdb_clear_suppressed
 +	}
-+    }
-+    send_gdb "\r"
-+    gdb_test "" \
-+	"No executable file specified..*" \
-+	"All the characters transferred"
 +}
++send_gdb "\r"
++gdb_test "" \
++         "No executable file specified..*" \
++         "All the characters transferred"
++
++
++# Restore globals modified in this test...
++if [info exists old_inputrc] {
++    set env(INPUTRC) $old_inputrc
++} else {
++    unset env(INPUTRC)
++}
++if [info exists old_gdbhistfile] {
++    set env(GDBHISTFILE) $old_gdbhistfile
++} else {
++    unset env(GDBHISTFILE)
++}
++if [info exists old_histsize] {
++    set env(HISTSIZE) $old_histsize
++} else {
++    unset env(HISTSIZE)
++}
++set timeout $oldtimeout1
++

SOURCES/gdb-6.5-section-num-fixup-test.patch

@@ -24,7 +24,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -51,7 +51,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -68,27 +68,22 @@ diff --git a/gdb/testsuite/gdb.base/datalib.exp b/gdb/testsuite/gdb.base/datalib
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/datalib.exp
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,51 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+if {[use_gdb_stub]} {
-+    untested "skipping test because of use_gdb_stub"
-+    return -1
-+}
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +set testfile datalib
 +set srcfilemain ${testfile}-main.c

SOURCES/gdb-6.5-sharedlibrary-path.patch

@@ -33,7 +33,7 @@ diff --git a/gdb/testsuite/gdb.threads/tls-sepdebug-main.c b/gdb/testsuite/gdb.t
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.threads/tls-sepdebug-main.c
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,25 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2006 Free Software Foundation, Inc.
@@ -47,7 +47,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -55,15 +55,9 @@ new file mode 100644
 +   Please email any bugs, comments, and/or additions to this file to:
 +   bug-gdb@prep.ai.mit.edu  */
 +
-+#include <pthread.h>
-+
-+extern __thread int var;
-+
 +int main()
 +{
-+  /* Ensure we link against pthreads even with --as-needed.  */
-+  pthread_testcancel();
-+  return var;
++  return 0;
 +}
 diff --git a/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c b/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c
 new file mode 100644
@@ -83,7 +77,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -96,29 +90,22 @@ diff --git a/gdb/testsuite/gdb.threads/tls-sepdebug.exp b/gdb/testsuite/gdb.thre
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.threads/tls-sepdebug.exp
-@@ -0,0 +1,94 @@
+@@ -0,0 +1,87 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+# This test uses gdb_exit and gdb_start, which are not supported
-+# on non-extended-remote sessions.
-+if {[use_gdb_stub]} {
-+    untested "skipping test because of stub"
-+    return 0
-+}
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +if $tracelevel then {
 +    strace $tracelevel
@@ -171,22 +158,22 @@ new file mode 100644
 +    gdb_exit
 +    gdb_start
 +    ###gdb_reinitialize_dir $srcdir/$subdir
-+
++    
 +    gdb_test "set env LD_LIBRARY_PATH=$ld_library_path" \
 +             "" \
 +             "set env LD_LIBRARY_PATH is $name"
-+
++    
 +    gdb_load ${binmainfile}
-+
++    
 +    # For C programs, "start" should stop in main().
-+
++    
 +    gdb_test "start" \
 +             "main \\(\\) at .*${srcmainfile}.*" \
 +             "start"
-+
++    
 +    # Check for: Cannot find shared library `/usr/lib/debug/lib/libc-2.4.90.so.debug' in dynamic linker's load module list
 +    # as happens with TLS variables and `separate_debug_objfile_backlink'.
-+
++    
 +    gdb_test "print var" \
 +             "\\\$1 = \[0-9\].*" \
 +             "print TLS variable from a shared library with $name-directory separate debug info file"

SOURCES/gdb-6.6-buildid-locate-core-as-arg.patch

@@ -0,0 +1,197 @@
+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-6.6-buildid-locate-core-as-arg.patch
+
+;;=push+jan
+
+http://sourceware.org/ml/gdb-patches/2010-01/msg00558.html
+
+[ Fixed up since the mail.  ]
+
+On Thu, 21 Jan 2010 18:17:15 +0100, Doug Evans wrote:
+> Not an exhaustive list, but if we go down the path of converting "gdb
+> corefile" to "gdb -c corefile", then we also need to think about "file
+> corefile" being converted to "core corefile" [or "target core
+> corefile", "core" is apparently deprecated in favor of "target core"]
+> and "target exec corefile" -> "target core corefile".  Presumably
+> "file corefile" (and "target exec corefile") would discard the
+> currently selected executable.  But maybe not.  Will that be confusing
+> for users?  I don't know.
+
+While thinking about it overriding some GDB _commands_ was not my intention.
+
+There is a general assumption if I have a shell COMMAND and some FILE I can do
+$ COMMAND FILE
+and COMMAND will appropriately load the FILE.
+
+FSF GDB currently needs to specify also the executable file for core files
+which already inhibits this intuitive expectation.  OTOH with the build-id
+locating patch which could allow such intuitive start  notneeding the
+executable file.  Still it currently did not work due to the required "-c":
+$ COMMAND -c COREFILE
+
+Entering "file", "core-file" or "attach" commands is already explicit enough
+so that it IMO should do what the command name says without any
+autodetections.  The second command line argument
+(captured_main->pid_or_core_arg) is also autodetected (for PID or CORE) but
+neither "attach" accepts a core file nor "core-file" accepts a PID.
+
+The patch makes sense only with the build-id patchset so this is not submit
+for FSF GDB inclusion yet.  I am fine with your patch (+/- Hui Zhu's pending
+bfd_check_format_matches) as the patch below is its natural extension.
+
+Sorry for the delay,
+Jan
+
+2010-01-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* exceptions.h (enum errors <IS_CORE_ERROR>): New.
+	* exec.c: Include exceptions.h.
+	(exec_file_attach <bfd_core>): Call throw_error (IS_CORE_ERROR, ...).
+	* main.c (exec_or_core_file_attach): New.
+	(captured_main <optind < argc>): Set also corearg.
+	(captured_main <strcmp (execarg, symarg) == 0>): New variable func.
+	Call exec_or_core_file_attach if COREARG matches EXECARG.  Call
+	symbol_file_add_main only if CORE_BFD remained NULL.
+
+Http://sourceware.org/ml/gdb-patches/2010-01/msg00517.html
+2010-01-20  Doug Evans  <dje@google.com>
+
+	* exec.c (exec_file_attach): Print a more useful error message if the
+	user did "gdb core".
+
+diff --git a/gdb/common/common-exceptions.h b/gdb/common/common-exceptions.h
+--- a/gdb/common/common-exceptions.h
++++ b/gdb/common/common-exceptions.h
+@@ -104,6 +104,9 @@ enum errors {
+      "_ERROR" is appended to the name.  */
+   MAX_COMPLETIONS_REACHED_ERROR,
+ 
++  /* Attempt to load a core file as executable.  */
++  IS_CORE_ERROR,
++
+   /* Add more errors here.  */
+   NR_ERRORS
+ };
+diff --git a/gdb/exec.c b/gdb/exec.c
+--- a/gdb/exec.c
++++ b/gdb/exec.c
+@@ -36,6 +36,7 @@
+ #include "gdb_bfd.h"
+ #include "gcore.h"
+ #include "source.h"
++#include "exceptions.h"
+ 
+ #include <fcntl.h>
+ #include "readline/readline.h"
+@@ -357,12 +358,27 @@ exec_file_attach (const char *filename, int from_tty)
+ 
+       if (!bfd_check_format_matches (exec_bfd, bfd_object, &matching))
+ 	{
++	  int is_core;
++
++	  /* If the user accidentally did "gdb core", print a useful
++	     error message.  Check it only after bfd_object has been checked as
++	     a valid executable may get recognized for example also as
++	     "trad-core".  */
++	  is_core = bfd_check_format (exec_bfd, bfd_core);
++
+ 	  /* Make sure to close exec_bfd, or else "run" might try to use
+ 	     it.  */
+ 	  exec_close ();
+-	  error (_("\"%s\": not in executable format: %s"),
+-		 scratch_pathname,
+-		 gdb_bfd_errmsg (bfd_get_error (), matching));
++
++	  if (is_core != 0)
++	    throw_error (IS_CORE_ERROR,
++		   _("\"%s\" is a core file.\n"
++		     "Please specify an executable to debug."),
++		   scratch_pathname);
++	  else
++	    error (_("\"%s\": not in executable format: %s"),
++		   scratch_pathname,
++		   gdb_bfd_errmsg (bfd_get_error (), matching));
+ 	}
+ 
+       if (build_section_table (exec_bfd, &sections, &sections_end))
+diff --git a/gdb/main.c b/gdb/main.c
+--- a/gdb/main.c
++++ b/gdb/main.c
+@@ -447,6 +447,37 @@ struct cmdarg
+   char *string;
+ };
+ 
++/* Call exec_file_attach.  If it detected FILENAME is a core file call
++   core_file_command.  Print the original exec_file_attach error only if
++   core_file_command failed to find a matching executable.  */
++
++static void
++exec_or_core_file_attach (const char *filename, int from_tty)
++{
++  volatile struct gdb_exception e;
++
++  gdb_assert (exec_bfd == NULL);
++
++  TRY
++    {
++      exec_file_attach (filename, from_tty);
++    }
++  CATCH (e, RETURN_MASK_ALL)
++    {
++      if (e.error == IS_CORE_ERROR)
++	{
++	  core_file_command ((char *) filename, from_tty);
++
++	  /* Iff the core file found its executable suppress the error message
++	     from exec_file_attach.  */
++	  if (exec_bfd != NULL)
++	    return;
++	}
++      throw_exception (e);
++    }
++  END_CATCH
++}
++
+ static void
+ captured_main_1 (struct captured_main_args *context)
+ {
+@@ -883,6 +914,8 @@ captured_main_1 (struct captured_main_args *context)
+ 	{
+ 	  symarg = argv[optind];
+ 	  execarg = argv[optind];
++	  if (optind + 1 == argc && corearg == NULL)
++	    corearg = argv[optind];
+ 	  optind++;
+ 	}
+ 
+@@ -1033,11 +1066,25 @@ captured_main_1 (struct captured_main_args *context)
+       && symarg != NULL
+       && strcmp (execarg, symarg) == 0)
+     {
++      catch_command_errors_const_ftype *func;
++
++      /* Call exec_or_core_file_attach only if the file was specified as
++	 a command line argument (and not an a command line option).  */
++      if (corearg != NULL && strcmp (corearg, execarg) == 0)
++	{
++	  func = exec_or_core_file_attach;
++	  corearg = NULL;
++	}
++      else
++	func = exec_file_attach;
++
+       /* The exec file and the symbol-file are the same.  If we can't
+          open it, better only print one error message.
+-         catch_command_errors returns non-zero on success!  */
+-      if (catch_command_errors (exec_file_attach, execarg,
+-				!batch_flag))
++         catch_command_errors returns non-zero on success!
++	 Do not load EXECARG as a symbol file if it has been already processed
++	 as a core file.  */
++      if (catch_command_errors (func, execarg, !batch_flag)
++	  && core_bfd == NULL)
+ 	catch_command_errors (symbol_file_add_main_adapter, symarg,
+ 			      !batch_flag);
+     }

SOURCES/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch

@@ -25,6 +25,21 @@ Comments by Sergio Durigan Junior <sergiodj@redhat.com>:
   NULL after it is free'd, otherwise the code below thinks that it is still
   valid and doesn't print the necessary warning ("Try: yum install ...").
 
+diff --git a/gdb/build-id.c b/gdb/build-id.c
+--- a/gdb/build-id.c
++++ b/gdb/build-id.c
+@@ -581,7 +581,10 @@ build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id,
+ 	  do_cleanups (inner);
+ 
+ 	  if (abfd == NULL)
+-	    continue;
++	    {
++	      filename = NULL;
++	      continue;
++	    }
+ 
+ 	  if (build_id_verify (abfd.get(), build_id_len, build_id))
+ 	    break;
 diff --git a/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp b/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp
 new file mode 100644
 --- /dev/null

SOURCES/gdb-6.6-buildid-locate-rpm-librpm-workaround.patch

@@ -9,7 +9,7 @@ Subject: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 diff --git a/gdb/build-id.c b/gdb/build-id.c
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
-@@ -708,6 +708,19 @@ build_id_to_filename (const struct bfd_build_id *build_id, char **link_return)
+@@ -652,6 +652,19 @@ build_id_to_filename (const struct bfd_build_id *build_id, char **link_return)
  #include <dlfcn.h>
  #endif
  

SOURCES/gdb-6.6-buildid-locate-rpm-scl.patch

@@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=953585
 diff --git a/gdb/build-id.c b/gdb/build-id.c
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
-@@ -742,7 +742,11 @@ static int missing_rpm_list_entries;
+@@ -689,7 +689,11 @@ static int missing_rpm_list_entries;
  /* Returns the count of newly added rpms.  */
  
  static int
@@ -24,7 +24,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
  {
    static int rpm_init_done = 0;
    rpmts ts;
-@@ -849,7 +853,11 @@ missing_rpm_enlist (const char *filename)
+@@ -796,7 +800,11 @@ missing_rpm_enlist (const char *filename)
    mi = rpmtsInitIterator_p (ts, RPMTAG_BASENAMES, filename, 0);
    if (mi != NULL)
      {
@@ -36,7 +36,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
  	{
  	  Header h;
  	  char *debuginfo, **slot, *s, *s2;
-@@ -967,6 +975,37 @@ missing_rpm_enlist (const char *filename)
+@@ -914,6 +922,37 @@ missing_rpm_enlist (const char *filename)
  	    xfree (debuginfo);
  	  count++;
  	}
@@ -74,10 +74,10 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
  
        rpmdbFreeIterator_p (mi);
      }
-@@ -976,6 +1015,20 @@ missing_rpm_enlist (const char *filename)
-   return count;
+@@ -924,6 +963,21 @@ missing_rpm_enlist (const char *filename)
  }
  
+ static int
 +#ifdef GDB_INDEX_VERIFY_VENDOR
 +missing_rpm_enlist (const char *filename)
 +{
@@ -90,15 +90,16 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +{
 +  return missing_rpm_enlist_1 (filename, 1);
 +}
-+#endif
 +
- static bool
- missing_rpm_list_compar (const char *ap, const char *bp)
++static int
++#endif
+ missing_rpm_list_compar (const char *const *ap, const char *const *bp)
  {
-diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
---- a/gdb/dwarf2/read.c
-+++ b/gdb/dwarf2/read.c
-@@ -3034,6 +3034,16 @@ read_gdb_index_from_buffer (const char *filename,
+   return strcoll (*ap, *bp);
+diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
+--- a/gdb/dwarf2read.c
++++ b/gdb/dwarf2read.c
+@@ -3469,6 +3469,16 @@ read_gdb_index_from_section (struct objfile *objfile,
       "set use-deprecated-index-sections on".  */
    if (version < 6 && !deprecated_ok)
      {
@@ -115,7 +116,7 @@ diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
        static int warning_printed = 0;
        if (!warning_printed)
  	{
-@@ -3045,6 +3055,10 @@ to use the section anyway."),
+@@ -3480,6 +3490,10 @@ to use the section anyway."),
  	  warning_printed = 1;
  	}
        return 0;

SOURCES/gdb-6.6-buildid-locate-rpm.patch

@@ -14,7 +14,7 @@ diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
  
 +# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 +# serial 1 (pkg-config-0.24)
-+#
++# 
 +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 +#
 +# This program is free software; you can redistribute it and/or modify
@@ -133,11 +133,11 @@ diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
 +See the pkg-config man page for more details.])
 +
 +if test $pkg_failed = yes; then
-+        AC_MSG_RESULT([no])
++   	AC_MSG_RESULT([no])
 +        _PKG_SHORT_ERRORS_SUPPORTED
 +        if test $_pkg_short_errors_supported = yes; then
 +	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-+        else
++        else 
 +	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
 +        fi
 +	# Put the nasty error message in config.log where it belongs
@@ -154,7 +154,7 @@ diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
 +_PKG_TEXT])[]dnl
 +        ])
 +elif test $pkg_failed = untried; then
-+        AC_MSG_RESULT([no])
++     	AC_MSG_RESULT([no])
 +	m4_default([$4], [AC_MSG_FAILURE(
 +[The pkg-config script could not be found or is too old.  Make sure it
 +is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -235,15 +235,16 @@ diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
 diff --git a/gdb/build-id.c b/gdb/build-id.c
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
-@@ -33,6 +33,7 @@
- #include "gdb_bfd.h"
- #include "gdbcmd.h"
- #include "gdbcore.h"
+@@ -35,6 +35,8 @@
+ #include "elf/common.h"
+ #include "elf-bfd.h"
+ #include <sys/stat.h>
++#include "elf/external.h"
 +#include "inferior.h"
- #include "objfiles.h"
- #include "observable.h"
- #include "symfile.h"
-@@ -697,8 +698,374 @@ build_id_to_filename (const struct bfd_build_id *build_id, char **link_return)
+ 
+ #define BUILD_ID_VERBOSE_NONE 0
+ #define BUILD_ID_VERBOSE_FILENAMES 1
+@@ -640,8 +642,366 @@ build_id_to_filename (const struct bfd_build_id *build_id, char **link_return)
    return result;
  }
  
@@ -336,7 +337,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +
 +      /* Already failed the initialization before?  */
 +      if (init_tried)
-+        return 0;
++      	return 0;
 +      init_tried = 1;
 +
 +#ifdef DLOPEN_LIBRPM
@@ -512,10 +513,10 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +  return count;
 +}
 +
-+static bool
-+missing_rpm_list_compar (const char *ap, const char *bp)
++static int
++missing_rpm_list_compar (const char *const *ap, const char *const *bp)
 +{
-+  return strcoll (ap, bp) < 0;
++  return strcoll (*ap, *bp);
 +}
 +
 +/* It returns a NULL-terminated array of strings needing to be FREEd.  It may
@@ -524,50 +525,39 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +static void
 +missing_rpm_list_print (void)
 +{
++  char **array, **array_iter;
 +  struct missing_rpm *list_iter;
++  struct cleanup *cleanups;
 +
 +  if (missing_rpm_list_entries == 0)
 +    return;
 +
-+  std::vector<const char *> array (missing_rpm_list_entries);
-+  size_t idx = 0;
++  array = (char **) xmalloc (sizeof (*array) * missing_rpm_list_entries);
++  cleanups = make_cleanup (xfree, array);
 +
++  array_iter = array;
 +  for (list_iter = missing_rpm_list; list_iter != NULL;
 +       list_iter = list_iter->next)
 +    {
-+      array[idx++] = list_iter->rpm;
++      *array_iter++ = list_iter->rpm;
 +    }
-+  gdb_assert (idx == missing_rpm_list_entries);
++  gdb_assert (array_iter == array + missing_rpm_list_entries);
 +
-+  std::sort (array.begin (), array.end (), missing_rpm_list_compar);
-+
-+  /* We zero out the number of missing RPMs here because of a nasty
-+     bug (see RHBZ 1801974).
-+
-+     When we call 'puts_unfiltered' below, if pagination is on and if
-+     the number of missing RPMs is big enough to trigger pagination,
-+     we will end up in an infinite recursion.  The call chain looks
-+     like this:
-+
-+     missing_rpm_list_print -> puts_unfiltered -> fputs_maybe_filtered
-+     -> prompt_for_continue -> display_gdb_prompt ->
-+     debug_flush_missing -> missing_rpm_list_print ...
-+
-+     For this reason, we make sure MISSING_RPM_LIST_ENTRIES is zero
-+     *before* calling any print function.  */
-+  missing_rpm_list_entries = 0;
++  qsort (array, missing_rpm_list_entries, sizeof (*array),
++	 (int (*) (const void *, const void *)) missing_rpm_list_compar);
 +
 +  printf_unfiltered (_("Missing separate debuginfos, use: %s"),
 +#ifdef DNF_DEBUGINFO_INSTALL
 +		     "dnf "
 +#endif
 +		     "debuginfo-install");
-+  for (const char *el : array)
++  for (array_iter = array; array_iter < array + missing_rpm_list_entries;
++       array_iter++)
 +    {
-+      puts_unfiltered (" ");
-+      puts_unfiltered (el);
++      putchar_unfiltered (' ');
++      puts_unfiltered (*array_iter);
 +    }
-+  puts_unfiltered ("\n");
++  putchar_unfiltered ('\n');
 +
 +  while (missing_rpm_list != NULL)
 +    {
@@ -575,6 +565,9 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +      missing_rpm_list = list_iter->next;
 +      xfree (list_iter);
 +    }
++  missing_rpm_list_entries = 0;
++
++  do_cleanups (cleanups);
 +}
 +
 +static void
@@ -619,7 +612,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
     avoidance.  */
  
  struct missing_filepair
-@@ -752,11 +1119,17 @@ missing_filepair_change (void)
+@@ -695,11 +1055,17 @@ missing_filepair_change (void)
        /* All their memory came just from missing_filepair_OBSTACK.  */
        missing_filepair_hash = NULL;
      }
@@ -637,7 +630,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
    missing_filepair_change ();
  }
  
-@@ -823,14 +1196,38 @@ debug_print_missing (const char *binary, const char *debug)
+@@ -766,14 +1132,39 @@ debug_print_missing (const char *binary, const char *debug)
  
    *slot = missing_filepair;
  
@@ -646,13 +639,14 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +#ifdef HAVE_LIBRPM
 +  if (missing_exec == MISSING_EXEC_NOT_TRIED)
 +    {
-+      const char *execfilename = get_exec_file (0);
++      char *execfilename;
  
 -  fprintf_unfiltered (gdb_stdlog,
 -		      _("Missing separate debuginfo for %s\n"), binary);
 -  if (debug != NULL)
 -    fprintf_unfiltered (gdb_stdlog, _("Try to install the hash file %s\n"),
 -			debug);
++      execfilename = get_exec_file (0);
 +      if (execfilename != NULL)
 +	{
 +	  if (missing_rpm_enlist (execfilename) == 0)
@@ -686,9 +680,9 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 diff --git a/gdb/config.in b/gdb/config.in
 --- a/gdb/config.in
 +++ b/gdb/config.in
-@@ -39,6 +39,9 @@
- /* Handle .ctf type-info sections */
- #undef ENABLE_LIBCTF
+@@ -33,6 +33,9 @@
+ /* Define to BFD's default target vector. */
+ #undef DEFAULT_BFD_VEC
  
 +/* librpm version specific library name to dlopen. */
 +#undef DLOPEN_LIBRPM
@@ -696,9 +690,9 @@ diff --git a/gdb/config.in b/gdb/config.in
  /* Define to 1 if translation of program messages to the user's native
     language is requested. */
  #undef ENABLE_NLS
-@@ -247,6 +250,9 @@
- /* Define if you have the mpfr library. */
- #undef HAVE_LIBMPFR
+@@ -270,6 +273,9 @@
+ /* Define if Python 2.7 is being used. */
+ #undef HAVE_LIBPYTHON2_7
  
 +/* Define if librpm library is being used. */
 +#undef HAVE_LIBRPM
@@ -709,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
-@@ -769,6 +769,11 @@ PKG_CONFIG
+@@ -749,6 +749,11 @@ CODESIGN_CERT
  HAVE_NATIVE_GCORE_TARGET
  TARGET_OBS
  subdirs
@@ -721,42 +715,50 @@ diff --git a/gdb/configure b/gdb/configure
  GDB_DATADIR
  DEBUGDIR
  MAKEINFO_EXTRA_FLAGS
-@@ -873,6 +878,7 @@ with_gdb_datadir
+@@ -853,6 +858,7 @@ with_gdb_datadir
  with_relocated_sources
  with_auto_load_dir
  with_auto_load_safe_path
 +with_rpm
  enable_targets
  enable_64_bit_bfd
- enable_gdbmi
-@@ -949,6 +955,8 @@ PKG_CONFIG_PATH
- PKG_CONFIG_LIBDIR
- DEBUGINFOD_CFLAGS
- DEBUGINFOD_LIBS
+ enable_gdbcli
+@@ -912,6 +918,11 @@ CCC
+ CPP
+ MAKEINFO
+ MAKEINFOFLAGS
++PKG_CONFIG
++PKG_CONFIG_PATH
++PKG_CONFIG_LIBDIR
 +RPM_CFLAGS
 +RPM_LIBS
  YACC
  YFLAGS
  XMKMF'
-@@ -1621,6 +1629,8 @@ Optional Packages:
+@@ -1583,6 +1594,8 @@ Optional Packages:
+                           [--with-auto-load-dir]
+   --without-auto-load-safe-path
                            do not restrict auto-loaded files locations
-   --with-debuginfod       Enable debuginfo lookups with debuginfod
-                           (auto/yes/no)
 +  --with-rpm              query rpm database for missing debuginfos (yes/no,
 +                          def. auto=librpm.so)
    --with-libunwind-ia64   use libunwind frame unwinding for ia64 targets
    --with-curses           use the curses library instead of the termcap
                            library
-@@ -1702,6 +1712,8 @@ Some influential environment variables:
-               C compiler flags for DEBUGINFOD, overriding pkg-config
-   DEBUGINFOD_LIBS
-               linker flags for DEBUGINFOD, overriding pkg-config
+@@ -1640,6 +1653,13 @@ Some influential environment variables:
+   MAKEINFO    Parent configure detects if it is of sufficient version.
+   MAKEINFOFLAGS
+               Parameters for MAKEINFO.
++  PKG_CONFIG  path to pkg-config utility
++  PKG_CONFIG_PATH
++              directories to add to pkg-config's search path
++  PKG_CONFIG_LIBDIR
++              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 Compiler Compiler' implementation to use.
                Defaults to the first program found out of: `bison -y', `byacc',
                `yacc'.
-@@ -6666,6 +6678,494 @@ _ACEOF
+@@ -6575,6 +6595,494 @@ _ACEOF
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_auto_load_safe_path" >&5
  $as_echo "$with_auto_load_safe_path" >&6; }
  
@@ -1148,7 +1150,7 @@ diff --git a/gdb/configure b/gdb/configure
 +
 +
 +if test $pkg_failed = yes; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +
 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -1166,7 +1168,7 @@ diff --git a/gdb/configure b/gdb/configure
 +
 +	HAVE_LIBRPM=false
 +elif test $pkg_failed = untried; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +	HAVE_LIBRPM=false
 +else
@@ -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
-@@ -143,6 +143,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])
  
@@ -1450,22 +1452,34 @@ diff --git a/gdb/configure.ac b/gdb/configure.ac
 +    fi
 +  fi
 +fi
-+
++ 
  AC_CONFIG_SUBDIRS(testsuite)
  
  # Check whether to support alternative target configurations
+diff --git a/gdb/corelow.c b/gdb/corelow.c
+--- a/gdb/corelow.c
++++ b/gdb/corelow.c
+@@ -366,7 +366,7 @@ build_id_locate_exec (int from_tty)
+         symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
+     }
+   else
+-    debug_print_missing (_("the main executable file"), build_id_filename);
++    debug_print_missing (BUILD_ID_MAIN_EXECUTABLE_FILENAME, build_id_filename);
+ 
+   do_cleanups (back_to);
+ 
 diff --git a/gdb/event-top.c b/gdb/event-top.c
 --- a/gdb/event-top.c
 +++ b/gdb/event-top.c
-@@ -42,6 +42,7 @@
- #include "gdbsupport/gdb_select.h"
- #include "gdbsupport/gdb-sigmask.h"
- #include "async-event.h"
+@@ -40,6 +40,7 @@
+ #include "buffer.h"
+ #include "ser-event.h"
+ #include "gdb_select.h"
 +#include "symfile.h"
  
  /* readline include files.  */
  #include "readline/readline.h"
-@@ -364,6 +365,8 @@ display_gdb_prompt (const char *new_prompt)
+@@ -359,6 +360,8 @@ display_gdb_prompt (const char *new_prompt)
    /* Reset the nesting depth used when trace-commands is set.  */
    reset_command_nest_depth ();
  
@@ -1474,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.  */
-@@ -773,7 +776,10 @@ command_line_handler (gdb::unique_xmalloc_ptr<char> &&rl)
+@@ -774,7 +777,10 @@ command_line_handler (char *rl)
        command_handler (cmd);
  
        if (ui->prompt_state != PROMPTED)
@@ -1489,11 +1503,12 @@ diff --git a/gdb/event-top.c b/gdb/event-top.c
 diff --git a/gdb/symfile.h b/gdb/symfile.h
 --- a/gdb/symfile.h
 +++ b/gdb/symfile.h
-@@ -560,6 +560,7 @@ extern void generic_load (const char *args, int from_tty);
+@@ -540,6 +540,8 @@ void map_symbol_filenames (symbol_filename_ftype *fun, void *data,
  /* build-id support.  */
  extern struct bfd_build_id *build_id_addr_get (CORE_ADDR addr);
  extern void debug_print_missing (const char *binary, const char *debug);
 +extern void debug_flush_missing (void);
- #define BUILD_ID_MAIN_EXECUTABLE_FILENAME _("the main executable file")
++#define BUILD_ID_MAIN_EXECUTABLE_FILENAME _("the main executable file")
  
  /* From dwarf2read.c */
+ 

SOURCES/gdb-6.6-buildid-locate-solib-missing-ids.patch

@@ -14,7 +14,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1339862
 diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
 --- a/gdb/solib-svr4.c
 +++ b/gdb/solib-svr4.c
-@@ -1340,14 +1340,27 @@ svr4_read_so_list (svr4_info *info, CORE_ADDR lm, CORE_ADDR prev_lm,
+@@ -1358,14 +1358,27 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
  	}
  
        {
@@ -44,7 +44,7 @@ diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
  	if (build_id != NULL)
  	  {
  	    char *name, *build_id_filename;
-@@ -1362,23 +1375,7 @@ svr4_read_so_list (svr4_info *info, CORE_ADDR lm, CORE_ADDR prev_lm,
+@@ -1380,23 +1393,7 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
  		xfree (name);
  	      }
  	    else

SOURCES/gdb-6.6-buildid-locate.patch

@@ -6,49 +6,22 @@ Subject: gdb-6.6-buildid-locate.patch
 ;; New locating of the matching binaries from the pure core file (build-id).
 ;;=push+jan
 
-diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h
---- a/bfd/libbfd-in.h
-+++ b/bfd/libbfd-in.h
-@@ -121,7 +121,7 @@ static inline char *
- bfd_strdup (const char *str)
- {
-   size_t len = strlen (str) + 1;
--  char *buf = bfd_malloc (len);
-+  char *buf = (char *) bfd_malloc (len);
-   if (buf != NULL)
-     memcpy (buf, str, len);
-   return buf;
-diff --git a/bfd/libbfd.h b/bfd/libbfd.h
---- a/bfd/libbfd.h
-+++ b/bfd/libbfd.h
-@@ -126,7 +126,7 @@ static inline char *
- bfd_strdup (const char *str)
- {
-   size_t len = strlen (str) + 1;
--  char *buf = bfd_malloc (len);
-+  char *buf = (char *) bfd_malloc (len);
-   if (buf != NULL)
-     memcpy (buf, str, len);
-   return buf;
 diff --git a/gdb/build-id.c b/gdb/build-id.c
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
-@@ -24,13 +24,70 @@
- #include "gdbsupport/gdb_vecs.h"
- #include "symfile.h"
+@@ -26,11 +26,67 @@
  #include "objfiles.h"
-+#include <sys/stat.h>
-+#include "elf-bfd.h"
-+#include "elf/common.h"
+ #include "filenames.h"
+ #include "gdbcore.h"
++#include "libbfd.h"
++#include "gdbcore.h"
++#include "gdbcmd.h"
++#include "observable.h"
 +#include "elf/external.h"
 +#include "elf/internal.h"
- #include "filenames.h"
-+#include "gdb_bfd.h"
-+#include "gdbcmd.h"
- #include "gdbcore.h"
-+#include "objfiles.h"
-+#include "observable.h"
-+#include "symfile.h"
++#include "elf/common.h"
++#include "elf-bfd.h"
++#include <sys/stat.h>
 +
 +#define BUILD_ID_VERBOSE_NONE 0
 +#define BUILD_ID_VERBOSE_FILENAMES 1
@@ -82,13 +55,13 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +	  && namesz == sizeof "GNU"
 +	  && memcmp (xnp->name, "GNU", sizeof "GNU") == 0)
 +	{
-+	  size_t sz = descsz;
++	  size_t size = descsz;
 +	  gdb_byte *data = (gdb_byte *) descdata;
 +	  struct bfd_build_id *retval;
 +
-+	  retval = (struct bfd_build_id *) xmalloc (sizeof *retval - 1 + sz);
-+	  retval->size = sz;
-+	  memcpy (retval->data, data, sz);
++	  retval = (struct bfd_build_id *) xmalloc (sizeof *retval - 1 + size);
++	  retval->size = size;
++	  memcpy (retval->data, data, size);
 +
 +	  return retval;
 +	}
@@ -103,9 +76,9 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 -build_id_bfd_get (bfd *abfd)
 +build_id_bfd_shdr_get (bfd *abfd)
  {
-   if (!bfd_check_format (abfd, bfd_object)
-       && !bfd_check_format (abfd, bfd_core))
-@@ -43,6 +100,348 @@ build_id_bfd_get (bfd *abfd)
+   if (!bfd_check_format (abfd, bfd_object))
+     return NULL;
+@@ -42,6 +98,348 @@ build_id_bfd_get (bfd *abfd)
    return NULL;
  }
  
@@ -394,7 +367,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +
 +static void build_id_addr_candidate (bfd *abfd, asection *sect, void *obj)
 +{
-+  if (build_id_addr >= bfd_section_vma (sect))
++  if (build_id_addr >= bfd_section_vma (abfd, sect))
 +    {
 +      struct build_id_addr_sect *candidate;
 +
@@ -429,7 +402,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +       candidate = candidate->next)
 +    {
 +      i_phdr = elf_get_phdr (core_bfd,
-+			     bfd_section_vma (candidate->sect),
++			     bfd_section_vma (core_bfd, candidate->sect),
 +			     &e_phnum, &loadbase);
 +      if (i_phdr != NULL)
 +	break;
@@ -454,7 +427,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
  /* See build-id.h.  */
  
  int
-@@ -51,7 +450,7 @@ build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)
+@@ -50,7 +448,7 @@ build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)
    const struct bfd_build_id *found;
    int retval = 0;
  
@@ -463,7 +436,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
  
    if (found == NULL)
      warning (_("File \"%s\" has no build-id, file skipped"),
-@@ -66,56 +465,159 @@ build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)
+@@ -65,11 +463,50 @@ build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)
    return retval;
  }
  
@@ -501,165 +474,34 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +  return retval;
 +}
 +
- /* Helper for build_id_to_debug_bfd.  LINK is a path to a potential
-    build-id-based separate debug file, potentially a symlink to the real file.
-    If the file exists and matches BUILD_ID, return a BFD reference to it.  */
+ /* See build-id.h.  */
  
- static gdb_bfd_ref_ptr
--build_id_to_debug_bfd_1 (const std::string &link, size_t build_id_len,
--			 const bfd_byte *build_id)
-+build_id_to_debug_bfd_1 (const std::string &orig_link, size_t build_id_len,
-+			 const bfd_byte *build_id, char **link_return)
+ gdb_bfd_ref_ptr
+-build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
++build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id,
++		       char **link_return, int add_debug_suffix)
  {
-+  gdb_bfd_ref_ptr ret_bfd = {};
-+  std::string ret_link;
-+
-   if (separate_debug_file_debug)
-     {
--      printf_unfiltered (_("  Trying %s..."), link.c_str ());
-+      printf_unfiltered (_("  Trying %s..."), orig_link.c_str ());
-       gdb_flush (gdb_stdout);
-     }
++  char *debugdir;
++  std::string link, link_all;
++  struct cleanup *back_to;
++  int ix;
+   gdb_bfd_ref_ptr abfd;
  
--  /* lrealpath() is expensive even for the usually non-existent files.  */
--  gdb::unique_xmalloc_ptr<char> filename;
--  if (access (link.c_str (), F_OK) == 0)
--    filename.reset (lrealpath (link.c_str ()));
--
--  if (filename == NULL)
-+  for (unsigned seqno = 0;; seqno++)
-     {
--      if (separate_debug_file_debug)
--	printf_unfiltered (_(" no, unable to compute real path\n"));
-+      std::string link = orig_link;
- 
--      return {};
--    }
-+      if (seqno > 0)
-+	{
-+	  /* There can be multiple build-id symlinks pointing to real files
-+	     with the same build-id (such as hard links).  Some of the real
-+	     files may not be installed.  */
-+
-+	  string_appendf (link, ".%u", seqno);
-+	}
- 
--  /* We expect to be silent on the non-existing files.  */
--  gdb_bfd_ref_ptr debug_bfd = gdb_bfd_open (filename.get (), gnutarget);
-+      ret_link = link;
- 
--  if (debug_bfd == NULL)
--    {
--      if (separate_debug_file_debug)
--	printf_unfiltered (_(" no, unable to open.\n"));
-+      struct stat statbuf_trash;
-+
-+      /* `access' automatically dereferences LINK.  */
-+      if (lstat (link.c_str (), &statbuf_trash) != 0)
-+	{
-+	  /* Stop increasing SEQNO.  */
-+	  break;
-+	}
-+
-+      /* lrealpath() is expensive even for the usually non-existent files.  */
-+      gdb::unique_xmalloc_ptr<char> filename;
-+
-+      if (access (link.c_str (), F_OK) == 0)
-+	filename.reset (lrealpath (link.c_str ()));
-+
-+      if (filename == NULL)
-+	{
-+	  if (separate_debug_file_debug)
-+	    printf_unfiltered (_(" no, unable to compute real path\n"));
-+
-+	  continue;
-+	}
-+
-+      /* We expect to be silent on the non-existing files.  */
-+      gdb_bfd_ref_ptr debug_bfd = gdb_bfd_open (filename.get (), gnutarget, -1);
- 
--      return {};
-+      if (debug_bfd == NULL)
-+	{
-+	  if (separate_debug_file_debug)
-+	    printf_unfiltered (_(" no, unable to open.\n"));
-+
-+	  continue;
-+	}
-+
-+      if (!build_id_verify (debug_bfd.get(), build_id_len, build_id))
-+	{
-+	  if (separate_debug_file_debug)
-+	    printf_unfiltered (_(" no, build-id does not match.\n"));
-+
-+	  continue;
-+	}
-+
-+      ret_bfd = debug_bfd;
-+      break;
-     }
- 
--  if (!build_id_verify (debug_bfd.get(), build_id_len, build_id))
-+  std::string link_all;
-+
-+  if (ret_bfd != NULL)
-     {
-       if (separate_debug_file_debug)
--	printf_unfiltered (_(" no, build-id does not match.\n"));
--
--      return {};
-+	printf_unfiltered (_(" yes!\n"));
-+    }
-+  else
-+    {
-+      /* If none of the real files is found report as missing file
-+	 always the non-.%u-suffixed file.  */
-+      std::string link0 = orig_link;
-+
-+      /* If the symlink has target request to install the target.
-+	 BASE-debuginfo.rpm contains the symlink but BASE.rpm may be missing.
-+	 https://bugzilla.redhat.com/show_bug.cgi?id=981154  */
-+      std::string link0_resolved (link_resolve (link0.c_str (), 0));
-+
-+      if (link_all.empty ())
-+	link_all = link0_resolved;
-+      else
-+	{
-+	  /* Use whitespace instead of DIRNAME_SEPARATOR to be compatible with
-+	     its possible use as an argument for installation command.  */
-+	  link_all += " " + link0_resolved;
-+	}
-     }
- 
--  if (separate_debug_file_debug)
--    printf_unfiltered (_(" yes!\n"));
-+  if (link_return != NULL)
-+    {
-+      if (ret_bfd != NULL)
-+	{
-+	  *link_return = xstrdup (ret_link.c_str ());
-+	}
-+      else
-+	{
-+	  *link_return = xstrdup (link_all.c_str ());
-+	}
-+    }
- 
--  return debug_bfd;
-+  return ret_bfd;
- }
- 
- /* Common code for finding BFDs of a given build-id.  This function
-@@ -124,7 +626,7 @@ build_id_to_debug_bfd_1 (const std::string &link, size_t build_id_len,
- 
- static gdb_bfd_ref_ptr
- build_id_to_bfd_suffix (size_t build_id_len, const bfd_byte *build_id,
--			const char *suffix)
-+			const char *suffix, char **link_return)
- {
    /* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
-      cause "/.build-id/..." lookups.  */
-@@ -147,16 +649,17 @@ build_id_to_bfd_suffix (size_t build_id_len, const bfd_byte *build_id,
+@@ -82,63 +519,296 @@ build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
+     {
+       const gdb_byte *data = build_id;
+       size_t size = build_id_len;
++      char *filename = NULL;
++      struct cleanup *inner;
++      unsigned seqno;
++      struct stat statbuf_trash;
++      std::string link0;
+ 
+-      std::string link = debugdir.get ();
++      link = debugdir.get ();
+       link += "/.build-id/";
+ 
        if (size > 0)
  	{
  	  size--;
@@ -672,26 +514,107 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
        while (size-- > 0)
  	string_appendf (link, "%02x", (unsigned) *data++);
  
-       link += suffix;
+-      link += ".debug";
+-
+       if (separate_debug_file_debug)
+ 	printf_unfiltered (_("  Trying %s\n"), link.c_str ());
  
-       gdb_bfd_ref_ptr debug_bfd
--	= build_id_to_debug_bfd_1 (link, build_id_len, build_id);
-+	= build_id_to_debug_bfd_1 (link, build_id_len, build_id, link_return);
-       if (debug_bfd != NULL)
- 	return debug_bfd;
+-      /* lrealpath() is expensive even for the usually non-existent files.  */
+-      gdb::unique_xmalloc_ptr<char> filename;
+-      if (access (link.c_str (), F_OK) == 0)
+-	filename.reset (lrealpath (link.c_str ()));
+-
+-      if (filename == NULL)
+-	continue;
++      for (seqno = 0;; seqno++)
++	{
++	  if (seqno)
++	    {
++	      /* There can be multiple build-id symlinks pointing to real files
++		 with the same build-id (such as hard links).  Some of the real
++		 files may not be installed.  */
++
++	      string_appendf (link, ".%u", seqno);
++	    }
++
++	  if (add_debug_suffix)
++	    link += ".debug";
++
++	  if (!seqno)
++	    {
++	      /* If none of the real files is found report as missing file
++		 always the non-.%u-suffixed file.  */
++	      link0 = link;
++	    }
++
++	  /* `access' automatically dereferences LINK.  */
++	  if (lstat (link.c_str (), &statbuf_trash) != 0)
++	    {
++	      /* Stop increasing SEQNO.  */
++	      break;
++	    }
++
++	  filename = lrealpath (link.c_str ());
++	  if (filename == NULL)
++	    continue;
++
++	  /* We expect to be silent on the non-existing files.  */
++	  inner = make_cleanup (xfree, filename);
++	  abfd = gdb_bfd_open (filename, gnutarget, -1);
++	  do_cleanups (inner);
++
++	  if (abfd == NULL)
++	    continue;
++
++	  if (build_id_verify (abfd.get(), build_id_len, build_id))
++	    break;
++
++	  abfd.release ();
++
++	  filename = NULL;
++	}
  
-@@ -170,7 +673,8 @@ build_id_to_bfd_suffix (size_t build_id_len, const bfd_byte *build_id,
-       if (strcmp (gdb_sysroot, TARGET_SYSROOT_PREFIX) != 0)
- 	{
- 	  link = gdb_sysroot + link;
--	  debug_bfd = build_id_to_debug_bfd_1 (link, build_id_len, build_id);
-+	  debug_bfd = build_id_to_debug_bfd_1 (link, build_id_len, build_id,
-+					       link_return);
- 	  if (debug_bfd != NULL)
- 	    return debug_bfd;
- 	}
-@@ -179,38 +683,208 @@ build_id_to_bfd_suffix (size_t build_id_len, const bfd_byte *build_id,
-   return {};
+-      /* We expect to be silent on the non-existing files.  */
+-      abfd = gdb_bfd_open (filename.get (), gnutarget, -1);
++      if (filename != NULL)
++	{
++	  /* LINK_ALL is not used below in this non-NULL FILENAME case.  */
++	  break;
++	}
+ 
+-      if (abfd == NULL)
+-	continue;
++      /* If the symlink has target request to install the target.
++         BASE-debuginfo.rpm contains the symlink but BASE.rpm may be missing.
++         https://bugzilla.redhat.com/show_bug.cgi?id=981154  */
++      std::string link0_resolved (link_resolve (link0.c_str (), 0));
+ 
+-      if (build_id_verify (abfd.get(), build_id_len, build_id))
+-	break;
++      if (link_all.empty ())
++	link_all = link0_resolved;
++      else
++	{
++	  /* Use whitespace instead of DIRNAME_SEPARATOR to be compatible with
++	     its possible use as an argument for installation command.  */
++	  link_all += " " + link0_resolved;
++	}
++    }
+ 
+-      abfd.release ();
++  if (link_return != NULL)
++    {
++      if (abfd != NULL)
++	{
++	  *link_return = xstrdup (link.c_str ());
++	}
++      else
++	{
++	  *link_return = xstrdup (link_all.c_str ());
++	}
+     }
+ 
+   return abfd;
  }
  
 +char *
@@ -699,12 +622,13 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +{
 +  gdb_bfd_ref_ptr abfd;
 +  char *result;
-+
-+  abfd = build_id_to_exec_bfd (build_id->size, build_id->data, link_return);
++  
++  abfd = build_id_to_debug_bfd (build_id->size, build_id->data, link_return, 0);
 +  if (abfd == NULL)
 +    return NULL;
 +
-+  result = xstrdup (bfd_get_filename (abfd.get ()));
++  result = xstrdup (bfd_get_filename (abfd));
++  abfd.release ();
 +  return result;
 +}
 +
@@ -846,29 +770,6 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +
  /* See build-id.h.  */
  
- gdb_bfd_ref_ptr
--build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
-+build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id,
-+		       char **link_return)
- {
--  return build_id_to_bfd_suffix (build_id_len, build_id, ".debug");
-+  return build_id_to_bfd_suffix (build_id_len, build_id, ".debug",
-+				 link_return);
- }
- 
- /* See build-id.h.  */
- 
- gdb_bfd_ref_ptr
--build_id_to_exec_bfd (size_t build_id_len, const bfd_byte *build_id)
-+build_id_to_exec_bfd (size_t build_id_len, const bfd_byte *build_id,
-+		      char **link_return)
- {
--  return build_id_to_bfd_suffix (build_id_len, build_id, "");
-+  return build_id_to_bfd_suffix (build_id_len, build_id, "", link_return);
- }
- 
- /* See build-id.h.  */
- 
  std::string
 -find_separate_debug_file_by_buildid (struct objfile *objfile)
 +find_separate_debug_file_by_buildid (struct objfile *objfile,
@@ -891,7 +792,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
        gdb_bfd_ref_ptr abfd (build_id_to_debug_bfd (build_id->size,
 -						   build_id->data));
 +						    build_id->data,
-+	      (!build_id_filename_return ? NULL : &build_id_filename_cstr)));
++	      (!build_id_filename_return ? NULL : &build_id_filename_cstr), 1));
 +      if (build_id_filename_return)
 +	{
 +	  if (!build_id_filename_cstr)
@@ -906,7 +807,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
        /* Prevent looping on a stripped .debug file.  */
        if (abfd != NULL
  	  && filename_cmp (bfd_get_filename (abfd.get ()),
-@@ -223,3 +897,21 @@ find_separate_debug_file_by_buildid (struct objfile *objfile)
+@@ -151,3 +821,21 @@ find_separate_debug_file_by_buildid (struct objfile *objfile)
  
    return std::string ();
  }
@@ -931,9 +832,9 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 diff --git a/gdb/build-id.h b/gdb/build-id.h
 --- a/gdb/build-id.h
 +++ b/gdb/build-id.h
-@@ -23,9 +23,10 @@
+@@ -22,9 +22,10 @@
+ 
  #include "gdb_bfd.h"
- #include "gdbsupport/rsp-low.h"
  
 -/* Locate NT_GNU_BUILD_ID from ABFD and return its content.  */
 +/* Separate debuginfo files have corrupted PHDR but SHDR is correct there.
@@ -944,26 +845,18 @@ diff --git a/gdb/build-id.h b/gdb/build-id.h
  
  /* Return true if ABFD has NT_GNU_BUILD_ID matching the CHECK value.
     Otherwise, issue a warning and return false.  */
-@@ -38,21 +39,26 @@ extern int build_id_verify (bfd *abfd,
-    can be found, return NULL.  */
+@@ -38,13 +39,18 @@ extern int build_id_verify (bfd *abfd,
+    the caller.  */
  
  extern gdb_bfd_ref_ptr build_id_to_debug_bfd (size_t build_id_len,
 -					      const bfd_byte *build_id);
 +					      const bfd_byte *build_id,
-+					      char **link_return);
++					      char **link_return,
++					      int add_debug_suffix);
 +
 +extern char *build_id_to_filename (const struct bfd_build_id *build_id,
 +				   char **link_return);
  
- /* Find and open a BFD for an executable file given a build-id.  If no BFD
-    can be found, return NULL.  The returned reference to the BFD must be
-    released by the caller.  */
- 
- extern gdb_bfd_ref_ptr build_id_to_exec_bfd (size_t build_id_len,
--					     const bfd_byte *build_id);
-+					     const bfd_byte *build_id,
-+					     char **link_return);
- 
  /* Find the separate debug file for OBJFILE, by using the build-id
     associated with OBJFILE's BFD.  If successful, returns the file name for the
     separate debug file, otherwise, return an empty string.  */
@@ -973,12 +866,11 @@ diff --git a/gdb/build-id.h b/gdb/build-id.h
 +extern std::string find_separate_debug_file_by_buildid (struct objfile *objfile,
 +		       gdb::unique_xmalloc_ptr<char> *build_id_filename_return);
  
- /* Return an hex-string representation of BUILD_ID.  */
- 
+ #endif /* BUILD_ID_H */
 diff --git a/gdb/coffread.c b/gdb/coffread.c
 --- a/gdb/coffread.c
 +++ b/gdb/coffread.c
-@@ -709,7 +709,8 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
+@@ -733,7 +733,8 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
    /* Try to add separate debug file if no symbols table found.   */
    if (!objfile_has_partial_symbols (objfile))
      {
@@ -991,58 +883,91 @@ 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
-@@ -22,6 +22,10 @@
- #include <signal.h>
- #include <fcntl.h>
- #include "frame.h"		/* required by inferior.h */
+@@ -45,6 +45,10 @@
+ #include "gdb_bfd.h"
+ #include "completer.h"
+ #include "filestuff.h"
 +#include "auxv.h"
-+#include "build-id.h"
 +#include "elf/common.h"
 +#include "gdbcmd.h"
- #include "inferior.h"
- #include "infrun.h"
- #include "symtab.h"
-@@ -362,6 +366,8 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg)
-     switch_to_thread (thr);			/* Yes, make it current.  */
++#include "build-id.h"
+ 
+ #ifndef O_LARGEFILE
+ #define O_LARGEFILE 0
+@@ -321,6 +325,54 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg)
+     inferior_ptid = ptid;			/* Yes, make it current.  */
  }
  
-+static bool build_id_core_loads = true;
++static int build_id_core_loads = 1;
++
++static void
++build_id_locate_exec (int from_tty)
++{
++  CORE_ADDR at_entry;
++  struct bfd_build_id *build_id;
++  char *execfilename, *debug_filename;
++  char *build_id_filename;
++  struct cleanup *back_to;
++
++  if (exec_bfd != NULL || symfile_objfile != NULL)
++    return;
++
++  if (target_auxv_search (current_top_target (), AT_ENTRY, &at_entry) <= 0)
++    return;
++
++  build_id = build_id_addr_get (at_entry);
++  if (build_id == NULL)
++    return;
++  back_to = make_cleanup (xfree, build_id);
++
++  /* SYMFILE_OBJFILE should refer to the main executable (not only to its
++     separate debug info file).  gcc44+ keeps .eh_frame only in the main
++     executable without its duplicate .debug_frame in the separate debug info
++     file - such .eh_frame would not be found if SYMFILE_OBJFILE would refer
++     directly to the separate debug info file.  */
++
++  execfilename = build_id_to_filename (build_id, &build_id_filename);
++  make_cleanup (xfree, build_id_filename);
++
++  if (execfilename != NULL)
++    {
++      make_cleanup (xfree, execfilename);
++      exec_file_attach (execfilename, from_tty);
++      symbol_file_add_main (execfilename,
++			    symfile_add_flag (!from_tty ? 0 : SYMFILE_VERBOSE));
++      if (symfile_objfile != NULL)
++        symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
++    }
++  else
++    debug_print_missing (_("the main executable file"), build_id_filename);
++
++  do_cleanups (back_to);
++
++  /* No automatic SOLIB_ADD as the libraries would get read twice.  */
++}
 +
  /* Issue a message saying we have no core to debug, if FROM_TTY.  */
  
  static void
-@@ -398,19 +404,25 @@ core_file_command (const char *filename, int from_tty)
- static void
- locate_exec_from_corefile_build_id (bfd *abfd, int from_tty)
- {
--  const bfd_build_id *build_id = build_id_bfd_get (abfd);
-+  const bfd_build_id *build_id = build_id_bfd_shdr_get (abfd);
-   if (build_id == nullptr)
-     return;
- 
-+  char *build_id_filename;
-   gdb_bfd_ref_ptr execbfd
--    = build_id_to_exec_bfd (build_id->size, build_id->data);
-+    = build_id_to_exec_bfd (build_id->size, build_id->data,
-+			    &build_id_filename);
- 
-   if (execbfd != nullptr)
-     {
-       exec_file_attach (bfd_get_filename (execbfd.get ()), from_tty);
-       symbol_file_add_main (bfd_get_filename (execbfd.get ()),
- 			    symfile_add_flag (from_tty ? SYMFILE_VERBOSE : 0));
-+      if (symfile_objfile != NULL)
-+	symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
+@@ -464,6 +516,14 @@ core_target_open (const char *arg, int from_tty)
+ 	switch_to_thread (thread);
      }
-+  else
-+    debug_print_missing (BUILD_ID_MAIN_EXECUTABLE_FILENAME, build_id_filename);
- }
  
- /* See gdbcore.h.  */
-@@ -1189,4 +1201,11 @@ _initialize_corelow ()
-            maintenance_print_core_file_backed_mappings,
- 	   _("Print core file's file-backed mappings."),
- 	   &maintenanceprintlist);
++  /* Find the build_id identifiers.  If it gets executed after
++     POST_CREATE_INFERIOR we would clash with asking to discard the already
++     loaded VDSO symbols.  If it gets executed before bfd_map_over_sections
++     INFERIOR_PTID is still not set and libthread_db initialization crashes on
++     PID == 0 in ps_pglobal_lookup.  */
++  if (build_id_core_loads != 0)
++    build_id_locate_exec (from_tty);
++
+   post_create_inferior (target, from_tty);
+ 
+   /* Now go through the target stack looking for threads since there
+@@ -1072,4 +1132,11 @@ void
+ _initialize_corelow (void)
+ {
+   add_target (core_target_info, core_target_open, filename_completer);
 +
 +  add_setshow_boolean_cmd ("build-id-core-loads", class_files,
 +			   &build_id_core_loads, _("\
@@ -1054,7 +979,7 @@ diff --git a/gdb/corelow.c b/gdb/corelow.c
 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
 --- a/gdb/doc/gdb.texinfo
 +++ b/gdb/doc/gdb.texinfo
-@@ -21074,6 +21074,27 @@ information files.
+@@ -19570,6 +19570,27 @@ information files.
  
  @end table
  
@@ -1082,62 +1007,22 @@ diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
  @cindex @code{.gnu_debuglink} sections
  @cindex debug link sections
  A debug link is a special section of the executable file named
-diff --git a/gdb/dwarf2/index-cache.c b/gdb/dwarf2/index-cache.c
---- a/gdb/dwarf2/index-cache.c
-+++ b/gdb/dwarf2/index-cache.c
-@@ -95,7 +95,7 @@ index_cache::store (dwarf2_per_objfile *per_objfile)
-     return;
- 
-   /* Get build id of objfile.  */
--  const bfd_build_id *build_id = build_id_bfd_get (obj->obfd);
-+  const bfd_build_id *build_id = build_id_bfd_shdr_get (obj->obfd);
-   if (build_id == nullptr)
-     {
-       if (debug_index_cache)
-@@ -113,7 +113,8 @@ index_cache::store (dwarf2_per_objfile *per_objfile)
- 
-   if (dwz != nullptr)
-     {
--      const bfd_build_id *dwz_build_id = build_id_bfd_get (dwz->dwz_bfd.get ());
-+      const bfd_build_id *dwz_build_id
-+	= build_id_bfd_shdr_get (dwz->dwz_bfd.get ());
- 
-       if (dwz_build_id == nullptr)
- 	{
-diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
---- a/gdb/dwarf2/read.c
-+++ b/gdb/dwarf2/read.c
-@@ -2225,7 +2225,7 @@ dwarf2_get_dwz_file (dwarf2_per_bfd *per_bfd)
+diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
+--- a/gdb/dwarf2read.c
++++ b/gdb/dwarf2read.c
+@@ -2683,7 +2683,7 @@ dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile)
      }
  
    if (dwz_bfd == NULL)
 -    dwz_bfd = build_id_to_debug_bfd (buildid_len, buildid);
-+    dwz_bfd = build_id_to_debug_bfd (buildid_len, buildid, NULL);
- 
-   if (dwz_bfd == nullptr)
-     {
-@@ -5989,7 +5989,7 @@ get_gdb_index_contents_from_section (objfile *obj, T *section_owner)
- static gdb::array_view<const gdb_byte>
- get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_bfd *dwarf2_per_bfd)
- {
--  const bfd_build_id *build_id = build_id_bfd_get (obj->obfd);
-+  const bfd_build_id *build_id = build_id_bfd_shdr_get (obj->obfd);
-   if (build_id == nullptr)
-     return {};
- 
-@@ -6002,7 +6002,7 @@ get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_bfd *dwarf2_per_bfd)
- static gdb::array_view<const gdb_byte>
- get_gdb_index_contents_from_cache_dwz (objfile *obj, dwz_file *dwz)
- {
--  const bfd_build_id *build_id = build_id_bfd_get (dwz->dwz_bfd.get ());
-+  const bfd_build_id *build_id = build_id_bfd_shdr_get (dwz->dwz_bfd.get ());
-   if (build_id == nullptr)
-     return {};
++    dwz_bfd = build_id_to_debug_bfd (buildid_len, buildid, NULL, 1);
  
+   if (dwz_bfd == NULL)
+     error (_("could not find '.gnu_debugaltlink' file for %s"),
 diff --git a/gdb/elfread.c b/gdb/elfread.c
 --- a/gdb/elfread.c
 +++ b/gdb/elfread.c
-@@ -1298,7 +1298,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)
      {
@@ -1148,74 +1033,44 @@ diff --git a/gdb/elfread.c b/gdb/elfread.c
  
        if (debugfile.empty ())
  	debugfile = find_separate_debug_file_by_debuglink (objfile);
-@@ -1313,7 +1315,7 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
-       else
- 	{
- 	  has_dwarf2 = false;
--	  const struct bfd_build_id *build_id = build_id_bfd_get (objfile->obfd);
-+	  const struct bfd_build_id *build_id = build_id_bfd_shdr_get (objfile->obfd);
- 
- 	  if (build_id != nullptr)
- 	    {
-@@ -1338,6 +1340,10 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
- 		      has_dwarf2 = true;
- 		    }
- 		}
-+		/* Check if any separate debug info has been extracted out.  */
-+		else if (bfd_get_section_by_name (objfile->obfd, ".gnu_debuglink")
-+			 != NULL)
-+		  debug_print_missing (objfile_name (objfile), build_id_filename.get ());
- 	    }
+@@ -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);
  	}
++      /* Check if any separate debug info has been extracted out.  */
++      else if (bfd_get_section_by_name (objfile->obfd, ".gnu_debuglink")
++	       != NULL)
++	debug_print_missing (objfile_name (objfile), build_id_filename.get ());
      }
-diff --git a/gdb/exec.c b/gdb/exec.c
---- a/gdb/exec.c
-+++ b/gdb/exec.c
-@@ -264,7 +264,7 @@ validate_exec_file (int from_tty)
-   reopen_exec_file ();
-   current_exec_file = get_exec_file (0);
+ }
  
--  const bfd_build_id *exec_file_build_id = build_id_bfd_get (exec_bfd);
-+  const bfd_build_id *exec_file_build_id = build_id_bfd_shdr_get (exec_bfd);
-   if (exec_file_build_id != nullptr)
-     {
-       /* Prepend the target prefix, to force gdb_bfd_open to open the
-@@ -277,7 +277,7 @@ validate_exec_file (int from_tty)
-       if (abfd != nullptr)
- 	{
- 	  const bfd_build_id *target_exec_file_build_id
--	    = build_id_bfd_get (abfd.get ());
-+	    = build_id_bfd_shdr_get (abfd.get ());
- 
- 	  if (target_exec_file_build_id != nullptr)
- 	    {
 diff --git a/gdb/objfiles.h b/gdb/objfiles.h
 --- a/gdb/objfiles.h
 +++ b/gdb/objfiles.h
-@@ -714,6 +714,10 @@ struct objfile
-   bool skip_jit_symbol_lookup = false;
+@@ -470,6 +470,10 @@ struct objfile
+   htab_t static_links {};
  };
  
 +/* This file was loaded according to the BUILD_ID_CORE_LOADS rules.  */
 +
 +#define OBJF_BUILD_ID_CORE_LOADED static_cast<enum objfile_flag>(1 << 12)
 +
- /* A deleter for objfile.  */
+ /* Declarations for functions defined in objfiles.c */
  
- struct objfile_deleter
+ extern struct gdbarch *get_objfile_arch (const struct objfile *);
 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
-@@ -132,7 +132,7 @@ objfpy_get_build_id (PyObject *self, void *closure)
+@@ -137,7 +137,7 @@ objfpy_get_build_id (PyObject *self, void *closure)
  
-   try
+   TRY
      {
 -      build_id = build_id_bfd_get (objfile->obfd);
 +      build_id = build_id_bfd_shdr_get (objfile->obfd);
      }
-   catch (const gdb_exception &except)
+   CATCH (except, RETURN_MASK_ALL)
      {
-@@ -600,7 +600,7 @@ objfpy_lookup_objfile_by_build_id (const char *build_id)
+@@ -544,7 +544,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;
@@ -1235,7 +1090,7 @@ diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
  
  static struct link_map_offsets *svr4_fetch_link_map_offsets (void);
  static int svr4_have_link_map_offsets (void);
-@@ -1338,9 +1339,51 @@ svr4_read_so_list (svr4_info *info, CORE_ADDR lm, CORE_ADDR prev_lm,
+@@ -1356,9 +1357,51 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
  	  continue;
  	}
  
@@ -1290,36 +1145,16 @@ diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
  
        /* If this entry has no name, or its name matches the name
  	 for the main executable, don't include it in the list.  */
-diff --git a/gdb/source.c b/gdb/source.c
---- a/gdb/source.c
-+++ b/gdb/source.c
-@@ -1165,7 +1165,7 @@ open_source_file (struct symtab *s)
- 	      srcpath += s->filename;
- 	    }
- 
--	  const struct bfd_build_id *build_id = build_id_bfd_get (ofp->obfd);
-+	  const struct bfd_build_id *build_id = build_id_bfd_shdr_get (ofp->obfd);
- 
- 	  /* Query debuginfod for the source file.  */
- 	  if (build_id != nullptr && !srcpath.empty ())
 diff --git a/gdb/symfile.h b/gdb/symfile.h
 --- a/gdb/symfile.h
 +++ b/gdb/symfile.h
-@@ -550,12 +550,18 @@ void expand_symtabs_matching
+@@ -537,6 +537,10 @@ void expand_symtabs_matching
  void map_symbol_filenames (symbol_filename_ftype *fun, void *data,
  			   int need_fullname);
  
-+
- /* Target-agnostic function to load the sections of an executable into memory.
- 
-    ARGS should be in the form "EXECUTABLE [OFFSET]", where OFFSET is an
-    optional offset to apply to each section.  */
- extern void generic_load (const char *args, int from_tty);
- 
 +/* build-id support.  */
 +extern struct bfd_build_id *build_id_addr_get (CORE_ADDR addr);
 +extern void debug_print_missing (const char *binary, const char *debug);
-+#define BUILD_ID_MAIN_EXECUTABLE_FILENAME _("the main executable file")
 +
  /* From dwarf2read.c */
  
@@ -1327,7 +1162,7 @@ diff --git a/gdb/symfile.h b/gdb/symfile.h
 diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp
 --- a/gdb/testsuite/gdb.base/corefile.exp
 +++ b/gdb/testsuite/gdb.base/corefile.exp
-@@ -343,3 +343,33 @@ gdb_test_multiple "core-file $corefile" $test {
+@@ -311,3 +311,33 @@ gdb_test_multiple "core-file $corefile" $test {
  	pass $test
      }
  }
@@ -1361,19 +1196,6 @@ diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefi
 +    gdb_test "info files" "Local exec file:\r\n\[ \t\]*`[string_to_regexp $debugdir/$buildid]', file type .*"
 +    pass $wholetest
 +}
-diff --git a/gdb/testsuite/gdb.base/gdbinit-history.exp b/gdb/testsuite/gdb.base/gdbinit-history.exp
---- a/gdb/testsuite/gdb.base/gdbinit-history.exp
-+++ b/gdb/testsuite/gdb.base/gdbinit-history.exp
-@@ -181,7 +181,8 @@ proc test_empty_history_filename { } {
-     global env
-     global gdb_prompt
- 
--    set common_history [list "set height 0" "set width 0"]
-+    set common_history [list "set height 0" "set width 0" \
-+			    "set build-id-verbose 0"]
- 
-     set test_dir [standard_output_file history_test]
-     remote_exec host "mkdir -p $test_dir"
 diff --git a/gdb/testsuite/gdb.base/new-ui-pending-input.exp b/gdb/testsuite/gdb.base/new-ui-pending-input.exp
 --- a/gdb/testsuite/gdb.base/new-ui-pending-input.exp
 +++ b/gdb/testsuite/gdb.base/new-ui-pending-input.exp
@@ -1388,10 +1210,10 @@ 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
-@@ -2011,6 +2011,17 @@ proc default_gdb_start { } {
+@@ -1695,6 +1695,16 @@ proc default_gdb_start { } {
+ 	    warning "Couldn't set the width to 0."
  	}
      }
- 
 +    # Turn off the missing warnings as the testsuite does not expect it.
 +    send_gdb "set build-id-verbose 0\n"
 +    gdb_expect 10 {
@@ -1402,14 +1224,13 @@ diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
 +	    warning "Could not disable the missing debug infos warnings.."
 +	}
 +    }
-+
-     gdb_debug_init
      return 0
  }
+ 
 diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
 --- a/gdb/testsuite/lib/mi-support.exp
 +++ b/gdb/testsuite/lib/mi-support.exp
-@@ -308,6 +308,16 @@ proc default_mi_gdb_start { args } {
+@@ -309,6 +309,16 @@ proc default_mi_gdb_start { args } {
  	    warning "Couldn't set the width to 0."
  	}
      }

SOURCES/gdb-6.6-bz229517-gcore-without-terminal.patch

@@ -79,15 +79,15 @@ new file mode 100644
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +# Please email any bugs, comments, and/or additions to this file to:
 +# bug-gdb@prep.ai.mit.edu

SOURCES/gdb-6.6-bz230000-power6-disassembly-test.patch

@@ -31,7 +31,7 @@ new file mode 100644
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +# Test PowerPC Power6 instructions disassembly.
 +

SOURCES/gdb-6.6-bz237572-ppc-atomic-sequence-test.patch

@@ -29,7 +29,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
@@ -202,12 +202,12 @@ new file mode 100644
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

SOURCES/gdb-6.6-scheduler_locking-step-is-default.patch

@@ -0,0 +1,78 @@
+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-6.6-scheduler_locking-step-is-default.patch
+
+;; Make upstream `set scheduler-locking step' as default.
+;;=push+jan: How much is scheduler-locking relevant after non-stop?
+
+diff --git a/gdb/infrun.c b/gdb/infrun.c
+--- a/gdb/infrun.c
++++ b/gdb/infrun.c
+@@ -2193,7 +2193,7 @@ static const char *const scheduler_enums[] = {
+   schedlock_replay,
+   NULL
+ };
+-static const char *scheduler_mode = schedlock_replay;
++static const char *scheduler_mode = schedlock_step;
+ static void
+ show_scheduler_mode (struct ui_file *file, int from_tty,
+ 		     struct cmd_list_element *c, const char *value)
+diff --git a/gdb/testsuite/gdb.mi/mi-cli.exp b/gdb/testsuite/gdb.mi/mi-cli.exp
+--- a/gdb/testsuite/gdb.mi/mi-cli.exp
++++ b/gdb/testsuite/gdb.mi/mi-cli.exp
+@@ -199,7 +199,7 @@ mi_expect_stop "breakpoint-hit" "main" "" ".*basics.c" \
+ # Test that the token is output even for CLI commands
+ # Also test that *stopped includes frame information.
+ mi_gdb_test "34 next" \
+-    ".*34\\\^running.*\\*running,thread-id=\"all\"" \
++    ".*34\\\^running.*\\*running,thread-id=\"1\"" \
+     "34 next: run"
+ 
+ # Test that the new current source line is output to the console
+diff --git a/gdb/testsuite/gdb.mi/mi-console.exp b/gdb/testsuite/gdb.mi/mi-console.exp
+--- a/gdb/testsuite/gdb.mi/mi-console.exp
++++ b/gdb/testsuite/gdb.mi/mi-console.exp
+@@ -60,6 +60,9 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
+ 
+ mi_run_to_main
+ 
++# thread-id=\"all\" vs. thread-id=\"1\" below:
++mi_gdb_test "210-gdb-set scheduler-locking off" "210\\^done" "set scheduler-locking off"
++
+ # The output we get from the target depends on how it is hosted.  If
+ # we are semihosted (e.g., the sim or a remote target that supports
+ # the File I/O remote protocol extension), we see the target I/O
+diff --git a/gdb/testsuite/gdb.mi/mi-logging.exp b/gdb/testsuite/gdb.mi/mi-logging.exp
+--- a/gdb/testsuite/gdb.mi/mi-logging.exp
++++ b/gdb/testsuite/gdb.mi/mi-logging.exp
+@@ -53,7 +53,7 @@ close $chan
+ 
+ set mi_log_prompt "\[(\]gdb\[)\] \[\r\n\]+"
+ 
+-if [regexp "\\^done\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {
++if [regexp "\\^done\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"1\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"1\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {
+     pass "log file contents"
+ } else {
+     fail "log file contents"
+@@ -76,7 +76,7 @@ set chan [open $milogfile]
+ set logcontent [read $chan]
+ close $chan
+ 
+-if [regexp "1001\\^done\[\r\n\]+$mi_log_prompt.*1002\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt.*1003\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {
++if [regexp "1001\\^done\[\r\n\]+$mi_log_prompt.*1002\\^running\[\r\n\]+\\*running,thread-id=\"1\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt.*1003\\^running\[\r\n\]+\\*running,thread-id=\"1\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {
+     pass "redirect log file contents"
+ } else {
+     fail "redirect log file contents"
+diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp
+--- a/gdb/testsuite/gdb.opt/inline-cmds.exp
++++ b/gdb/testsuite/gdb.opt/inline-cmds.exp
+@@ -331,7 +331,7 @@ proc mi_cli_step {cli_output_re message} {
+ 
+     send_gdb "interpreter-exec console \"step\"\n"
+     gdb_expect {
+-	-re "\\^running\r\n\\*running,thread-id=\"all\"\r\n${mi_gdb_prompt}${cli_output_re}" {
++	-re "\\^running\r\n\\*running,thread-id=\"1\"\r\n${mi_gdb_prompt}${cli_output_re}" {
+ 	    pass $message
+ 	}
+ 	timeout {

SOURCES/gdb-6.7-charsign-test.patch

@@ -36,7 +36,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+
++ 
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -71,15 +71,15 @@ new file mode 100644
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +set testfile charsign
 +set srcfile ${testfile}.c

SOURCES/gdb-6.7-testsuite-stable-results.patch

@@ -28,7 +28,7 @@ frames-invalid can happen asynchronously.
 diff --git a/gdb/testsuite/gdb.base/fileio.c b/gdb/testsuite/gdb.base/fileio.c
 --- a/gdb/testsuite/gdb.base/fileio.c
 +++ b/gdb/testsuite/gdb.base/fileio.c
-@@ -559,6 +559,28 @@ strerrno (int err)
+@@ -560,6 +560,28 @@ strerrno (int err)
  int
  main ()
  {

SOURCES/gdb-6.8-bz436037-reg-no-longer-active.patch

@@ -0,0 +1,37 @@
+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-6.8-bz436037-reg-no-longer-active.patch
+
+;; Fix register assignments with no GDB stack frames (BZ 436037).
+;;=push+jan: This fix is incorrect.
+
+diff --git a/gdb/valops.c b/gdb/valops.c
+--- a/gdb/valops.c
++++ b/gdb/valops.c
+@@ -1104,6 +1104,8 @@ value_assign (struct value *toval, struct value *fromval)
+ 	struct gdbarch *gdbarch;
+ 	int value_reg;
+ 
++	value_reg = VALUE_REGNUM (toval);
++
+ 	/* Figure out which frame this is in currently.
+ 	
+ 	   We use VALUE_FRAME_ID for obtaining the value's frame id instead of
+@@ -1113,8 +1115,14 @@ value_assign (struct value *toval, struct value *fromval)
+ 	   frame.  */
+ 	frame = frame_find_by_id (VALUE_FRAME_ID (toval));
+ 
+-	value_reg = VALUE_REGNUM (toval);
+-
++	/* "set $reg+=1" should work on programs with no debug info,
++	   but frame_find_by_id returns NULL here (RH bug 436037).
++	   Use current frame, it represents CPU state in this case.
++	   If frame_find_by_id is changed to do it internally
++	   (it is contemplated there), remove this.  */
++	if (!frame)
++	  frame = get_current_frame ();
++	/* Probably never happens.  */
+ 	if (!frame)
+ 	  error (_("Value being assigned to is no longer active."));
+ 

SOURCES/gdb-6.8-bz442765-threaded-exec-test.patch

@@ -175,7 +175,7 @@ diff --git a/gdb/testsuite/gdb.threads/threaded-exec.exp b/gdb/testsuite/gdb.thr
 +gdb_load ${binfile_nothreads}
  
 -gdb_run_cmd
-+gdb_run_cmd [list ${binfile_nothreads} ${binfile_threads} 0]
++gdb_run_cmd ${binfile_nothreads} ${binfile_threads} 0
  
  gdb_test_multiple {} "Program exited" {
     -re "\r\n\\\[Inferior .* exited normally\\\]\r\n$gdb_prompt $" {

SOURCES/gdb-6.8-bz466901-backtrace-full-prelinked.patch

@@ -383,12 +383,12 @@ new file mode 100644
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -402,7 +402,7 @@ new file mode 100644
 +     && ![istarget *-*-elf*]
 +     && ![istarget *-*-openbsd*])
 +    || (![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"])} {
-+    return 0
++    return 0  
 +}
 +
 +set testfile "dw2-loclist-prelinked"

SOURCES/gdb-6.8-quit-never-aborts.patch

@@ -0,0 +1,78 @@
+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-6.8-quit-never-aborts.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 .
+
+We may abort the process of detaching threads with multiple SIGINTs - which are
+being sent during a testcase terminating its child GDB.
+
+Some of the threads may not be properly PTRACE_DETACHed which hurts if they
+should have been detached with SIGSTOP (as they are accidentally left running
+on the debugger termination).
+
+diff --git a/gdb/defs.h b/gdb/defs.h
+--- a/gdb/defs.h
++++ b/gdb/defs.h
+@@ -168,6 +168,10 @@ extern void default_quit_handler (void);
+ /* Flag that function quit should call quit_force.  */
+ extern volatile int sync_quit_force_run;
+ 
++#ifdef NEED_DETACH_SIGSTOP
++extern int quit_flag_cleanup;
++#endif
++
+ extern void quit (void);
+ 
+ /* Helper for the QUIT macro.  */
+diff --git a/gdb/extension.c b/gdb/extension.c
+--- a/gdb/extension.c
++++ b/gdb/extension.c
+@@ -820,6 +820,11 @@ check_quit_flag (void)
+   int i, result = 0;
+   const struct extension_language_defn *extlang;
+ 
++#ifdef NEED_DETACH_SIGSTOP
++  if (quit_flag_cleanup)
++    return 0;
++#endif
++
+   ALL_ENABLED_EXTENSION_LANGUAGES (i, extlang)
+     {
+       if (extlang->ops->check_quit_flag != NULL)
+diff --git a/gdb/top.c b/gdb/top.c
+--- a/gdb/top.c
++++ b/gdb/top.c
+@@ -1606,7 +1606,13 @@ quit_force (int *exit_arg, int from_tty)
+ 
+   qt.from_tty = from_tty;
+ 
++#ifndef NEED_DETACH_SIGSTOP
+   /* We want to handle any quit errors and exit regardless.  */
++#else
++  /* We want to handle any quit errors and exit regardless but we should never
++     get user-interrupted to properly detach the inferior.  */
++  quit_flag_cleanup = 1;
++#endif
+ 
+   /* Get out of tfind mode, and kill or detach all inferiors.  */
+   TRY
+diff --git a/gdb/utils.c b/gdb/utils.c
+--- a/gdb/utils.c
++++ b/gdb/utils.c
+@@ -108,6 +108,13 @@ static std::chrono::steady_clock::duration prompt_for_continue_wait_time;
+ 
+ static int debug_timestamp = 0;
+ 
++#ifdef NEED_DETACH_SIGSTOP
++/* Nonzero means we are already processing the quitting cleanups and we should
++   no longer get aborted.  */
++
++int quit_flag_cleanup;
++#endif
++
+ /* Nonzero means that strings with character values >0x7F should be printed
+    as octal escapes.  Zero means just print the value (e.g. it's an
+    international character, and the terminal or window can cope.)  */

SOURCES/gdb-6.8-sparc64-silence-memcpy-check.patch

@@ -0,0 +1,19 @@
+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-6.8-sparc64-silence-memcpy-check.patch
+
+;; Silence memcpy check which returns false positive (sparc64)
+;;=push: But it is just a GCC workaround, look up the existing GCC PR for it.
+
+diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
+--- a/gdb/sparc-tdep.c
++++ b/gdb/sparc-tdep.c
+@@ -1462,6 +1462,7 @@ sparc32_store_return_value (struct type *type, struct regcache *regcache,
+   if (sparc_floating_p (type) || sparc_complex_floating_p (type))
+     {
+       /* Floating return values.  */
++      len = (len <= 8) ? len : 8;
+       memcpy (buf, valbuf, len);
+       regcache->cooked_write (SPARC_F0_REGNUM, buf);
+       if (len > 4)

SOURCES/gdb-6.8-watchpoint-conditionals-test.patch

@@ -0,0 +1,90 @@
+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-6.8-watchpoint-conditionals-test.patch
+
+;; Test the watchpoints conditionals works.
+;;=fedoratest
+
+For:
+http://sourceware.org/ml/gdb-patches/2008-04/msg00379.html
+http://sourceware.org/ml/gdb-cvs/2008-04/msg00104.html
+
+diff --git a/gdb/testsuite/gdb.base/watchpoint-cond.c b/gdb/testsuite/gdb.base/watchpoint-cond.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/watchpoint-cond.c
+@@ -0,0 +1,31 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2008 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++   Please email any bugs, comments, and/or additions to this file to:
++   bug-gdb@prep.ai.mit.edu  */
++
++int
++main (int argc, char **argv)
++{
++  static int i = 0; /* `static' to start initialized.  */
++  int j = 2;
++
++  for (j = 0; j < 30; j++)
++    i = 30 - j;
++
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/watchpoint-cond.exp b/gdb/testsuite/gdb.base/watchpoint-cond.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/watchpoint-cond.exp
+@@ -0,0 +1,37 @@
++# Copyright 2008 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++set testfile watchpoint-cond
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++
++# Get things started.
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++if { [runto_main] < 0 } {
++    untested watchpoint-cond
++    return -1
++}
++
++gdb_test "watch i if i < 20" "atchpoint \[0-9\]+: i"
++gdb_test "cont" "atchpoint \[0-9\]+: i.*Old value = 20.*New value = 19.*"

SOURCES/gdb-7.2.50-sparc-add-workaround-to-broken-debug-files.patch

@@ -0,0 +1,68 @@
+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-7.2.50-sparc-add-workaround-to-broken-debug-files.patch
+
+;; Toolchain on sparc is slightly broken and debuginfo files are generated
+;; with non 64bit aligned tables/offsets.
+;; See for example readelf -S ../Xvnc.debug.
+;;
+;; As a consenquence calculation of sectp->filepos as used in
+;; dwarf2_read_section (gdb/dwarf2read.c:1525) will return a non aligned buffer
+;; that cannot be used directly as done with MMAP.
+;; Usage will result in a BusError.
+;;
+;; While we figure out what's wrong in the toolchain and do a full archive
+;; rebuild to fix it, we need to be able to use gdb :)
+;;=push
+
+diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c
+--- a/gdb/gdb_bfd.c
++++ b/gdb/gdb_bfd.c
+@@ -24,12 +24,14 @@
+ #include "hashtab.h"
+ #include "filestuff.h"
+ #include "vec.h"
++#ifndef __sparc__
+ #ifdef HAVE_MMAP
+ #include <sys/mman.h>
+ #ifndef MAP_FAILED
+ #define MAP_FAILED ((void *) -1)
+ #endif
+ #endif
++#endif
+ #include "target.h"
+ #include "gdb/fileio.h"
+ #include "inferior.h"
+@@ -484,6 +486,7 @@ free_one_bfd_section (bfd *abfd, asection *sectp, void *ignore)
+ 
+   if (sect != NULL && sect->data != NULL)
+     {
++#ifndef __sparc__
+ #ifdef HAVE_MMAP
+       if (sect->map_addr != NULL)
+ 	{
+@@ -493,6 +496,7 @@ free_one_bfd_section (bfd *abfd, asection *sectp, void *ignore)
+ 	  gdb_assert (res == 0);
+ 	}
+       else
++#endif
+ #endif
+ 	xfree (sect->data);
+     }
+@@ -659,6 +663,7 @@ gdb_bfd_map_section (asection *sectp, bfd_size_type *size)
+   if (descriptor->data != NULL)
+     goto done;
+ 
++#ifndef __sparc__
+ #ifdef HAVE_MMAP
+   if (!bfd_is_section_compressed (abfd, sectp))
+     {
+@@ -693,6 +698,7 @@ gdb_bfd_map_section (asection *sectp, bfd_size_type *size)
+ 	}
+     }
+ #endif /* HAVE_MMAP */
++#endif
+ 
+   /* Handle compressed sections, or ordinary uncompressed sections in
+      the no-mmap case.  */

SOURCES/gdb-archer-next-over-throw-cxx-exec.patch

@@ -43,7 +43,7 @@ diff --git a/gdb/testsuite/gdb.cp/cxxexec.exp b/gdb/testsuite/gdb.cp/cxxexec.exp
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.cp/cxxexec.exp
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,51 @@
 +# Copyright 2010 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -83,6 +83,15 @@ new file mode 100644
 +    }
 +}
 +
-+# Run to end.  The buggy GDB failed instead with:
-+#  Cannot access memory at address ADDR.
-+gdb_continue_to_end "" "continue" 1
++set test continue
++gdb_test_multiple $test $test {
++    -re "Cannot access memory at address 0x\[0-9a-f\]+\r\n$gdb_prompt $" {
++	fail $test
++    }
++    -re "\r\n$gdb_prompt $" {
++	pass $test
++    }
++}
++
++# `info inferiors' can show <null> on older GDBs.
++gdb_test "info threads" "info threads" "program finished"

SOURCES/gdb-archer-pie-addons-keep-disabled.patch

@@ -0,0 +1,89 @@
+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-archer-pie-addons-keep-disabled.patch
+
+;;=push+jan: Breakpoints disabling matching should not be based on address.
+
+diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
+--- a/gdb/breakpoint.c
++++ b/gdb/breakpoint.c
+@@ -15522,6 +15522,50 @@ initialize_breakpoint_ops (void)
+ 
+ static struct cmd_list_element *enablebreaklist = NULL;
+ 
++void
++breakpoints_relocate (struct objfile *objfile, struct section_offsets *delta)
++{
++  struct bp_location *bl, **blp_tmp;
++  int changed = 0;
++
++  gdb_assert (objfile->separate_debug_objfile_backlink == NULL);
++
++  ALL_BP_LOCATIONS (bl, blp_tmp)
++    {
++      struct obj_section *osect;
++
++      /* BL->SECTION can be correctly NULL for breakpoints with multiple
++         locations expanded through symtab.  */
++
++      ALL_OBJFILE_OSECTIONS (objfile, osect)
++	{
++	  CORE_ADDR relocated_address;
++	  CORE_ADDR delta_offset;
++
++	  delta_offset = ANOFFSET (delta, osect->the_bfd_section->index);
++	  if (delta_offset == 0)
++	    continue;
++	  relocated_address = bl->address + delta_offset;
++
++	  if (obj_section_addr (osect) <= relocated_address
++	      && relocated_address < obj_section_endaddr (osect))
++	    {
++	      if (bl->inserted)
++		remove_breakpoint (bl);
++
++	      bl->address += delta_offset;
++	      bl->requested_address += delta_offset;
++
++	      changed = 1;
++	    }
++	}
++    }
++
++  if (changed)
++    qsort (bp_locations, bp_locations_count, sizeof (*bp_locations),
++	   bp_locations_compare);
++}
++
+ void
+ _initialize_breakpoint (void)
+ {
+diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
+--- a/gdb/breakpoint.h
++++ b/gdb/breakpoint.h
+@@ -1679,6 +1679,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);
+ 
++extern void breakpoints_relocate (struct objfile *objfile,
++				  struct section_offsets *delta);
++
+ /* Print the specified breakpoint.  */
+ extern void print_breakpoint (breakpoint *bp);
+ 
+diff --git a/gdb/objfiles.c b/gdb/objfiles.c
+--- a/gdb/objfiles.c
++++ b/gdb/objfiles.c
+@@ -883,6 +883,11 @@ objfile_relocate1 (struct objfile *objfile,
+ 				obj_section_addr (s));
+     }
+ 
++  /* Final call of breakpoint_re_set can keep breakpoint locations disabled if
++     their addresses match.  */
++  if (objfile->separate_debug_objfile_backlink == NULL)
++    breakpoints_relocate (objfile, delta);
++
+   /* Data changed.  */
+   return 1;
+ }

SOURCES/gdb-archer-pie-addons.patch

@@ -0,0 +1,63 @@
+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-archer-pie-addons.patch
+
+;;=push+jan: May get obsoleted by Tom's unrelocated objfiles patch.
+
+diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
+--- a/gdb/gdbtypes.h
++++ b/gdb/gdbtypes.h
+@@ -505,6 +505,7 @@ enum field_loc_kind
+   {
+     FIELD_LOC_KIND_BITPOS,	/**< bitpos */
+     FIELD_LOC_KIND_ENUMVAL,	/**< enumval */
++    /* This address is unrelocated by the objfile's ANOFFSET.  */
+     FIELD_LOC_KIND_PHYSADDR,	/**< physaddr */
+     FIELD_LOC_KIND_PHYSNAME,	/**< physname */
+     FIELD_LOC_KIND_DWARF_BLOCK	/**< dwarf_block */
+@@ -556,6 +557,7 @@ union field_location
+      field.  Otherwise, physname is the mangled label of the
+      static field.  */
+ 
++  /* This address is unrelocated by the objfile's ANOFFSET.  */
+   CORE_ADDR physaddr;
+   const char *physname;
+ 
+@@ -1438,6 +1440,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
+ #define FIELD_ENUMVAL_LVAL(thisfld) ((thisfld).loc.enumval)
+ #define FIELD_ENUMVAL(thisfld) (FIELD_ENUMVAL_LVAL (thisfld) + 0)
+ #define FIELD_STATIC_PHYSNAME(thisfld) ((thisfld).loc.physname)
++/* This address is unrelocated by the objfile's ANOFFSET.  */
+ #define FIELD_STATIC_PHYSADDR(thisfld) ((thisfld).loc.physaddr)
+ #define FIELD_DWARF_BLOCK(thisfld) ((thisfld).loc.dwarf_block)
+ #define SET_FIELD_BITPOS(thisfld, bitpos)			\
+@@ -1449,6 +1452,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
+ #define SET_FIELD_PHYSNAME(thisfld, name)			\
+   (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSNAME,		\
+    FIELD_STATIC_PHYSNAME (thisfld) = (name))
++/* This address is unrelocated by the objfile's ANOFFSET.  */
+ #define SET_FIELD_PHYSADDR(thisfld, addr)			\
+   (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSADDR,		\
+    FIELD_STATIC_PHYSADDR (thisfld) = (addr))
+@@ -1465,6 +1469,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
+ #define TYPE_FIELD_BITPOS(thistype, n) FIELD_BITPOS (TYPE_FIELD (thistype, n))
+ #define TYPE_FIELD_ENUMVAL(thistype, n) FIELD_ENUMVAL (TYPE_FIELD (thistype, n))
+ #define TYPE_FIELD_STATIC_PHYSNAME(thistype, n) FIELD_STATIC_PHYSNAME (TYPE_FIELD (thistype, n))
++/* This address is unrelocated by the objfile's ANOFFSET.  */
+ #define TYPE_FIELD_STATIC_PHYSADDR(thistype, n) FIELD_STATIC_PHYSADDR (TYPE_FIELD (thistype, n))
+ #define TYPE_FIELD_DWARF_BLOCK(thistype, n) FIELD_DWARF_BLOCK (TYPE_FIELD (thistype, n))
+ #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL(TYPE_FIELD(thistype,n))
+diff --git a/gdb/value.c b/gdb/value.c
+--- a/gdb/value.c
++++ b/gdb/value.c
+@@ -2829,7 +2829,8 @@ value_static_field (struct type *type, int fieldno)
+     {
+     case FIELD_LOC_KIND_PHYSADDR:
+       retval = value_at_lazy (TYPE_FIELD_TYPE (type, fieldno),
+-			      TYPE_FIELD_STATIC_PHYSADDR (type, fieldno));
++			      TYPE_FIELD_STATIC_PHYSADDR (type, fieldno)
++			      + (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));
+       break;
+     case FIELD_LOC_KIND_PHYSNAME:
+     {

SOURCES/gdb-archer.patch

@@ -0,0 +1,600 @@
+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-archer.patch
+
+;; Python patches of: http://sourceware.org/gdb/wiki/ProjectArcher
+;;=push
+
+http://sourceware.org/gdb/wiki/ProjectArcher
+http://sourceware.org/gdb/wiki/ArcherBranchManagement
+
+GIT snapshot:
+commit 718a1618b2f691a7f407213bb50f100ac59f91c3
+
+tromey/python
+
+diff --git a/gdb/Makefile.in b/gdb/Makefile.in
+--- a/gdb/Makefile.in
++++ b/gdb/Makefile.in
+@@ -2112,6 +2112,12 @@ stamp-h: $(srcdir)/config.in config.status
+ 	  CONFIG_LINKS= \
+ 	  $(SHELL) config.status
+ 
++.gdbinit: $(srcdir)/gdbinit.in config.status
++	CONFIG_FILES=".gdbinit:gdbinit.in" \
++	  CONFIG_COMMANDS= \
++	  CONFIG_HEADERS= \
++	  $(SHELL) config.status
++
+ config.status: $(srcdir)/configure configure.nat configure.tgt configure.host ../bfd/development.sh
+ 	$(SHELL) config.status --recheck
+ 
+diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
+--- a/gdb/data-directory/Makefile.in
++++ b/gdb/data-directory/Makefile.in
+@@ -80,6 +80,7 @@ PYTHON_FILE_LIST = \
+ 	gdb/unwinder.py \
+ 	gdb/xmethod.py \
+ 	gdb/command/__init__.py \
++	gdb/command/ignore_errors.py \
+ 	gdb/command/explore.py \
+ 	gdb/command/backtrace.py \
+ 	gdb/command/frame_filters.py \
+@@ -92,6 +93,8 @@ PYTHON_FILE_LIST = \
+ 	gdb/function/as_string.py \
+ 	gdb/function/caller_is.py \
+ 	gdb/function/strfns.py \
++	gdb/function/caller_is.py \
++	gdb/function/in_scope.py \
+ 	gdb/printer/__init__.py \
+ 	gdb/printer/bound_registers.py
+ 
+diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
+--- a/gdb/doc/gdb.texinfo
++++ b/gdb/doc/gdb.texinfo
+@@ -1245,6 +1245,16 @@ for remote debugging.
+ Run using @var{device} for your program's standard input and output.
+ @c FIXME: kingdon thinks there is more to -tty.  Investigate.
+ 
++@item -P
++@cindex @code{-P}
++@itemx --python
++@cindex @code{--python}
++Change interpretation of command line so that the argument immediately
++following this switch is taken to be the name of a Python script file.
++This option stops option processing; subsequent options are passed to
++Python as @code{sys.argv}.  This option is only available if Python
++scripting support was enabled when @value{GDBN} was configured.
++
+ @c resolve the situation of these eventually
+ @item -tui
+ @cindex @code{--tui}
+diff --git a/gdb/doc/python.texi b/gdb/doc/python.texi
+--- a/gdb/doc/python.texi
++++ b/gdb/doc/python.texi
+@@ -88,8 +88,6 @@ containing @code{end}.  For example:
+ 
+ @smallexample
+ (@value{GDBP}) python
+-Type python script
+-End with a line saying just "end".
+ >print 23
+ >end
+ 23
+diff --git a/gdb/gdb-gdb.gdb.in b/gdb/gdb-gdb.gdb.in
+--- a/gdb/gdb-gdb.gdb.in
++++ b/gdb/gdb-gdb.gdb.in
+@@ -1,5 +1,15 @@
+ echo Setting up the environment for debugging gdb.\n
+ 
++# Set up the Python library and "require" command.
++python
++from os.path import abspath
++gdb.datadir = abspath ('@srcdir@/python/lib')
++gdb.pythonlibdir = gdb.datadir
++gdb.__path__ = [gdb.datadir + '/gdb']
++sys.path.insert(0, gdb.datadir)
++end
++source @srcdir@/python/lib/gdb/__init__.py
++
+ if !$gdb_init_done
+   set variable $gdb_init_done = 1
+ 
+diff --git a/gdb/main.c b/gdb/main.c
+--- a/gdb/main.c
++++ b/gdb/main.c
+@@ -33,6 +33,7 @@
+ 
+ #include "interps.h"
+ #include "main.h"
++#include "python/python.h"
+ #include "source.h"
+ #include "cli/cli-cmds.h"
+ #include "objfiles.h"
+@@ -479,7 +480,7 @@ exec_or_core_file_attach (const char *filename, int from_tty)
+ }
+ 
+ static void
+-captured_main_1 (struct captured_main_args *context)
++captured_main_1 (struct captured_main_args *context, int &python_script)
+ {
+   int argc = context->argc;
+   char **argv = context->argv;
+@@ -695,10 +696,14 @@ captured_main_1 (struct captured_main_args *context)
+       {"args", no_argument, &set_args, 1},
+       {"l", required_argument, 0, 'l'},
+       {"return-child-result", no_argument, &return_child_result, 1},
++#if HAVE_PYTHON
++      {"python", no_argument, 0, 'P'},
++      {"P", no_argument, 0, 'P'},
++#endif
+       {0, no_argument, 0, 0}
+     };
+ 
+-    while (1)
++    while (!python_script)
+       {
+ 	int option_index;
+ 
+@@ -716,6 +721,9 @@ captured_main_1 (struct captured_main_args *context)
+ 	  case 0:
+ 	    /* Long option that just sets a flag.  */
+ 	    break;
++	  case 'P':
++	    python_script = 1;
++	    break;
+ 	  case OPT_SE:
+ 	    symarg = optarg;
+ 	    execarg = optarg;
+@@ -890,7 +898,31 @@ captured_main_1 (struct captured_main_args *context)
+ 
+   /* Now that gdb_init has created the initial inferior, we're in
+      position to set args for that inferior.  */
+-  if (set_args)
++  if (python_script)
++    {
++      /* The first argument is a python script to evaluate, and
++	 subsequent arguments are passed to the script for
++	 processing there.  */
++      if (optind >= argc)
++	{
++	  fprintf_unfiltered (gdb_stderr,
++			      _("%s: Python script file name required\n"),
++			      argv[0]);
++	  exit (1);
++	}
++
++      /* FIXME: should handle inferior I/O intelligently here.
++	 E.g., should be possible to run gdb in pipeline and have
++	 Python (and gdb) output go to stderr or file; and if a
++	 prompt is needed, open the tty.  */
++      quiet = 1;
++      /* FIXME: should read .gdbinit if, and only if, a prompt is
++	 requested by the script.  Though... maybe this is not
++	 ideal?  */
++      /* FIXME: likewise, reading in history.  */
++      inhibit_gdbinit = 1;
++    }
++  else if (set_args)
+     {
+       /* The remaining options are the command-line options for the
+ 	 inferior.  The first one is the sym/exec file, and the rest
+@@ -1180,7 +1212,8 @@ captured_main_1 (struct captured_main_args *context)
+ 
+   /* Read in the old history after all the command files have been
+      read.  */
+-  init_history ();
++  if (!python_script)
++    init_history ();
+ 
+   if (batch_flag)
+     {
+@@ -1193,24 +1226,37 @@ static void
+ captured_main (void *data)
+ {
+   struct captured_main_args *context = (struct captured_main_args *) data;
++  int python_script = 0;
+ 
+-  captured_main_1 (context);
++  captured_main_1 (context, python_script);
+ 
+-  /* NOTE: cagney/1999-11-07: There is probably no reason for not
+-     moving this loop and the code found in captured_command_loop()
+-     into the command_loop() proper.  The main thing holding back that
+-     change - SET_TOP_LEVEL() - has been eliminated.  */
+-  while (1)
++#if HAVE_PYTHON
++  if (python_script)
+     {
+-      TRY
+-	{
+-	  captured_command_loop ();
+-	}
+-      CATCH (ex, RETURN_MASK_ALL)
++      extern int pagination_enabled;
++      pagination_enabled = 0;
++      run_python_script (context->argc - optind, &context->argv[optind]);
++      return;
++    }
++  else
++#endif
++    {
++      /* NOTE: cagney/1999-11-07: There is probably no reason for not
++	 moving this loop and the code found in captured_command_loop()
++	 into the command_loop() proper.  The main thing holding back that
++	 change - SET_TOP_LEVEL() - has been eliminated. */
++      while (1)
+ 	{
+-	  exception_print (gdb_stderr, ex);
++	  TRY
++	    {
++	      captured_command_loop ();
++	    }
++	  CATCH (ex, RETURN_MASK_ALL)
++	    {
++	      exception_print (gdb_stderr, ex);
++	    }
++	  END_CATCH
+ 	}
+-      END_CATCH
+     }
+   /* No exit -- exit is through quit_command.  */
+ }
+@@ -1253,6 +1299,12 @@ print_gdb_help (struct ui_file *stream)
+   fputs_unfiltered (_("\
+ This is the GNU debugger.  Usage:\n\n\
+     gdb [options] [executable-file [core-file or process-id]]\n\
++    gdb [options] --args executable-file [inferior-arguments ...]\n"), stream);
++#if HAVE_PYTHON
++  fputs_unfiltered (_("\
++    gdb [options] [--python|-P] script-file [script-arguments ...]\n"), stream);
++#endif
++  fputs_unfiltered (_("\n\
+     gdb [options] --args executable-file [inferior-arguments ...]\n\n\
+ "), stream);
+   fputs_unfiltered (_("\
+@@ -1298,6 +1350,13 @@ Output and user interface control:\n\n\
+ #endif
+   fputs_unfiltered (_("\
+   --dbx              DBX compatibility mode.\n\
++"), stream);
++#if HAVE_PYTHON
++  fputs_unfiltered (_("\
++  --python, -P       Following argument is Python script file; remaining\n\
++                     arguments are passed to script.\n"), stream);
++#endif
++  fputs_unfiltered (_("\
+   -q, --quiet, --silent\n\
+                      Do not print version number on startup.\n\n\
+ "), stream);
+diff --git a/gdb/python/lib/gdb/command/ignore_errors.py b/gdb/python/lib/gdb/command/ignore_errors.py
+new file mode 100644
+--- /dev/null
++++ b/gdb/python/lib/gdb/command/ignore_errors.py
+@@ -0,0 +1,37 @@
++# Ignore errors in user commands.
++
++# Copyright (C) 2008 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++import gdb
++
++class IgnoreErrorsCommand (gdb.Command):
++    """Execute a single command, ignoring all errors.
++Only one-line commands are supported.
++This is primarily useful in scripts."""
++
++    def __init__ (self):
++        super (IgnoreErrorsCommand, self).__init__ ("ignore-errors",
++                                                    gdb.COMMAND_OBSCURE,
++                                                    # FIXME...
++                                                    gdb.COMPLETE_COMMAND)
++
++    def invoke (self, arg, from_tty):
++        try:
++            gdb.execute (arg, from_tty)
++        except:
++            pass
++
++IgnoreErrorsCommand ()
+diff --git a/gdb/python/lib/gdb/function/in_scope.py b/gdb/python/lib/gdb/function/in_scope.py
+new file mode 100644
+--- /dev/null
++++ b/gdb/python/lib/gdb/function/in_scope.py
+@@ -0,0 +1,47 @@
++# In-scope function.
++
++# Copyright (C) 2008 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++import gdb
++
++class InScope (gdb.Function):
++    """Return True if all the given variables or macros are in scope.
++Takes one argument for each variable name to be checked."""
++
++    def __init__ (self):
++        super (InScope, self).__init__ ("in_scope")
++
++    def invoke (self, *vars):
++        if len (vars) == 0:
++            raise (TypeError, "in_scope takes at least one argument")
++
++        # gdb.Value isn't hashable so it can't be put in a map.
++        # Convert to string first.
++        wanted = set (map (lambda x: x.string (), vars))
++        found = set ()
++        block = gdb.selected_frame ().block ()
++        while block:
++            for sym in block:
++                if (sym.is_argument or sym.is_constant
++                      or sym.is_function or sym.is_variable):
++                    if sym.name in wanted:
++                        found.add (sym.name)
++
++            block = block.superblock
++
++        return wanted == found
++
++InScope ()
+diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
+--- a/gdb/python/python-internal.h
++++ b/gdb/python/python-internal.h
+@@ -644,6 +644,9 @@ class gdbpy_enter_varobj : public gdbpy_enter
+ 
+ };
+ 
++struct cleanup *ensure_python_env (struct gdbarch *gdbarch,
++				   const struct language_defn *language);
++
+ extern struct gdbarch *python_gdbarch;
+ extern const struct language_defn *python_language;
+ 
+diff --git a/gdb/python/python.c b/gdb/python/python.c
+--- a/gdb/python/python.c
++++ b/gdb/python/python.c
+@@ -95,6 +95,8 @@ const struct extension_language_defn extension_language_python =
+ #include "linespec.h"
+ #include "source.h"
+ #include "version.h"
++#include "inferior.h"
++#include "gdbthread.h"
+ #include "target.h"
+ #include "gdbthread.h"
+ #include "interps.h"
+@@ -237,6 +239,29 @@ gdbpy_enter::~gdbpy_enter ()
+   restore_active_ext_lang (m_previous_active);
+ }
+ 
++static void
++restore_python_env (void *p)
++{
++  gdbpy_enter *env = (gdbpy_enter *) p;
++
++  delete env;
++}
++
++/* Called before entering the Python interpreter to install the
++   current language and architecture to be used for Python values.
++   Also set the active extension language for GDB so that SIGINT's
++   are directed our way, and if necessary install the right SIGINT
++   handler.  */
++
++struct cleanup *
++ensure_python_env (struct gdbarch *gdbarch,
++                   const struct language_defn *language)
++{
++  gdbpy_enter *env = new gdbpy_enter (gdbarch, language);
++
++  return make_cleanup (restore_python_env, env);
++}
++
+ /* Set the quit flag.  */
+ 
+ static void
+@@ -1367,6 +1392,92 @@ gdbpy_print_stack (void)
+ 
+ /* Return the current Progspace.
+    There always is one.  */
++/* True if 'gdb -P' was used, false otherwise.  */
++static int running_python_script;
++
++/* True if we are currently in a call to 'gdb.cli', false otherwise.  */
++static int in_cli;
++
++/* Enter the command loop.  */
++
++static PyObject *
++gdbpy_cli (PyObject *unused1, PyObject *unused2)
++{
++  if (! running_python_script || in_cli)
++    return PyErr_Format (PyExc_RuntimeError, "cannot invoke CLI recursively");
++  
++  if (current_uiout->is_mi_like_p ())
++    return PyErr_Format (PyExc_RuntimeError, _("Cannot invoke CLI from MI."));
++
++  in_cli = 1;
++  /* See captured_command_loop.  */
++
++  /* Give the interpreter a chance to print a prompt.  */
++  interp_pre_command_loop (top_level_interpreter ());
++
++  /* Now it's time to start the event loop.  */
++  start_event_loop ();
++
++  in_cli = 0;
++
++  Py_RETURN_NONE;
++}
++
++/* Set up the Python argument vector and evaluate a script.  This is
++   used to implement 'gdb -P'.  */
++
++void
++run_python_script (int argc, char **argv)
++{
++  FILE *input;
++
++  /* We never free this, since we plan to exit at the end.  */
++  ensure_python_env (get_current_arch (), current_language);
++
++  running_python_script = 1;
++
++#if PYTHON_ABI_VERSION < 3
++  PySys_SetArgv (argc - 1, argv + 1);
++#else
++  {
++    wchar_t **wargv = (wchar_t **) alloca (sizeof (*wargv) * (argc + 1));
++    int i;
++
++    for (i = 1; i < argc; i++)
++      {
++	size_t len = mbstowcs (NULL, argv[i], 0);
++	/* Python-related GDB sources are built with -DNDEBUG
++	   https://sourceware.org/bugzilla/show_bug.cgi?id=20445 */
++	size_t len2 ATTRIBUTE_UNUSED;
++
++	if (len == (size_t) -1)
++	  {
++	    fprintf (stderr, "Invalid multibyte argument #%d \"%s\"\n",
++		     i, argv[i]);
++	    exit (1);
++	  }
++	wargv[i] = (wchar_t *) alloca (sizeof (**wargv) * (len + 1));
++	len2 = mbstowcs (wargv[i], argv[i], len + 1);
++	assert (len2 == len);
++      }
++    wargv[argc] = NULL;
++    PySys_SetArgv (argc - 1, wargv + 1);
++  }
++#endif
++
++  input = fopen (argv[0], "r");
++  if (! input)
++    {
++      fprintf (stderr, "could not open %s: %s\n", argv[0], strerror (errno));
++      exit (1);
++    }
++  PyRun_SimpleFile (input, argv[0]);
++  fclose (input);
++  exit (0);
++}
++
++
++
+ 
+ static PyObject *
+ gdbpy_get_current_progspace (PyObject *unused1, PyObject *unused2)
+@@ -2057,6 +2168,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." },
++  { "cli", gdbpy_cli, METH_NOARGS,
++    "Enter the gdb CLI" },
+   { "parameter", gdbpy_parameter, METH_VARARGS,
+     "Return a gdb parameter's value" },
+ 
+diff --git a/gdb/python/python.h b/gdb/python/python.h
+--- a/gdb/python/python.h
++++ b/gdb/python/python.h
+@@ -25,4 +25,6 @@
+ /* This is all that python exports to gdb.  */
+ extern const struct extension_language_defn extension_language_python;
+ 
++extern void run_python_script (int argc, char **argv);
++
+ #endif /* GDB_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
+@@ -95,6 +95,8 @@ gdb_test "python print ('result = %s' % f0.read_var ('a'))" " = 1" "test Frame.r
+ 
+ gdb_test "python print ('result = %s' % (gdb.selected_frame () == f1))" " = True" "test gdb.selected_frame"
+ 
++gdb_test "python print ('result = %s' % (f0.block ()))" "<gdb.Block object at 0x\[\[:xdigit:\]\]+>" "test Frame.block"
++
+ # Can read SP register.
+ gdb_test "python print ('result = %s' % (gdb.selected_frame ().read_register ('sp') == gdb.parse_and_eval ('\$sp')))" \
+   " = True" \
+diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
+--- a/gdb/testsuite/gdb.python/py-value.exp
++++ b/gdb/testsuite/gdb.python/py-value.exp
+@@ -384,6 +384,15 @@ proc test_value_after_death {} {
+     "print value's type"
+ }
+ 
++# Regression test for a cast failure.  The bug was that if we cast a
++# value to its own type, gdb could crash.  This happened because we
++# could end up double-freeing a struct value.
++proc test_cast_regression {} {
++  gdb_test "python v = gdb.Value(5)" "" "create value for cast test"
++  gdb_test "python v = v.cast(v.type)" "" "cast value for cast test"
++  gdb_test "python print(v)" "5" "print value for cast test"
++}
++
+ # Regression test for invalid subscript operations.  The bug was that
+ # the type of the value was not being checked before allowing a
+ # subscript operation to proceed.
+@@ -512,6 +521,7 @@ if ![runto_main] then {
+ test_value_in_inferior
+ test_inferior_function_call
+ test_value_after_death
++test_cast_regression
+ 
+ # Test either C or C++ values. 
+ 
+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)
+ }
+ 
+ #ifdef HAVE_PYTHON
++/* Helper function to install a Python environment suitable for
++   use during operations on VAR.  */
++struct cleanup *
++varobj_ensure_python_env (const struct varobj *var)
++{
++  return ensure_python_env (var->root->exp->gdbarch,
++			    var->root->exp->language_defn);
++}
+ 
+ /* See python-internal.h.  */
+ gdbpy_enter_varobj::gdbpy_enter_varobj (const struct varobj *var)
+diff --git a/gdb/varobj.h b/gdb/varobj.h
+--- a/gdb/varobj.h
++++ b/gdb/varobj.h
+@@ -328,6 +328,8 @@ extern bool varobj_has_more (const struct varobj *var, int to);
+ 
+ extern bool varobj_is_dynamic_p (const struct varobj *var);
+ 
++extern struct cleanup *varobj_ensure_python_env (const struct varobj *var);
++
+ extern bool varobj_default_value_is_changeable_p (const struct varobj *var);
+ extern bool varobj_value_is_changeable_p (const struct varobj *var);
+ 

SOURCES/gdb-attach-fail-reasons-5of5.patch

@@ -0,0 +1,357 @@
+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-attach-fail-reasons-5of5.patch
+
+;; Print reasons for failed attach/spawn incl. SELinux deny_ptrace (BZ 786878).
+;;=push+jan
+
+http://sourceware.org/ml/gdb-patches/2012-03/msg00171.html
+
+Hi,
+
+and here is the last bit for new SELinux 'deny_ptrace':
+	https://bugzilla.redhat.com/show_bug.cgi?id=786878
+
+As even PTRACE_TRACEME fails in such case it needs to install hook for even
+that event.
+
+Thanks,
+Jan
+
+gdb/
+2012-03-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* common/linux-ptrace.c [HAVE_SELINUX_SELINUX_H]: include
+	selinux/selinux.h.
+	(linux_ptrace_attach_warnings): Call linux_ptrace_create_warnings.
+	(linux_ptrace_create_warnings): New.
+	* common/linux-ptrace.h (linux_ptrace_create_warnings): New declaration.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+	* configure.ac: Check selinux/selinux.h and the selinux library.
+	* inf-ptrace.c (inf_ptrace_me): Check the ptrace result.
+	* linux-nat.c (linux_nat_create_inferior): New variable ex.  Wrap
+	to_create_inferior into TRY_CATCH, call linux_ptrace_create_warnings.
+
+gdb/gdbserver/
+	* config.in: Regenerate.
+	* configure: Regenerate.
+	* configure.ac: Check selinux/selinux.h and the selinux library.
+	* linux-low.c (linux_traceme): New function.
+	(linux_create_inferior, linux_tracefork_child): Call it instead of
+	direct ptrace.
+
+diff --git a/gdb/config.in b/gdb/config.in
+--- a/gdb/config.in
++++ b/gdb/config.in
+@@ -276,6 +276,9 @@
+ /* Define if librpm library is being used. */
+ #undef HAVE_LIBRPM
+ 
++/* Define to 1 if you have the `selinux' library (-lselinux). */
++#undef HAVE_LIBSELINUX
++
+ /* Define to 1 if you have the <libunwind-ia64.h> header file. */
+ #undef HAVE_LIBUNWIND_IA64_H
+ 
+@@ -399,6 +402,9 @@
+ /* Define to 1 if you have the `scm_new_smob' function. */
+ #undef HAVE_SCM_NEW_SMOB
+ 
++/* Define to 1 if you have the <selinux/selinux.h> header file. */
++#undef HAVE_SELINUX_SELINUX_H
++
+ /* Define to 1 if you have the `setlocale' function. */
+ #undef HAVE_SETLOCALE
+ 
+diff --git a/gdb/configure b/gdb/configure
+--- a/gdb/configure
++++ b/gdb/configure
+@@ -15854,6 +15854,64 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
++for ac_header in selinux/selinux.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
++if test "x$ac_cv_header_selinux_selinux_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SELINUX_SELINUX_H 1
++_ACEOF
++
++fi
++
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for security_get_boolean_active in -lselinux" >&5
++$as_echo_n "checking for security_get_boolean_active in -lselinux... " >&6; }
++if test "${ac_cv_lib_selinux_security_get_boolean_active+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lselinux  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char security_get_boolean_active ();
++int
++main ()
++{
++return security_get_boolean_active ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_selinux_security_get_boolean_active=yes
++else
++  ac_cv_lib_selinux_security_get_boolean_active=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_get_boolean_active" >&5
++$as_echo "$ac_cv_lib_selinux_security_get_boolean_active" >&6; }
++if test "x$ac_cv_lib_selinux_security_get_boolean_active" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBSELINUX 1
++_ACEOF
++
++  LIBS="-lselinux $LIBS"
++
++fi
++
++
+ 
+ # Support for --with-sysroot is a copy of GDB_AC_WITH_DIR,
+ # except that the argument to --with-sysroot is optional.
+diff --git a/gdb/configure.ac b/gdb/configure.ac
+--- a/gdb/configure.ac
++++ b/gdb/configure.ac
+@@ -2054,6 +2054,10 @@ case $host_os in
+ esac
+ AC_DEFINE_UNQUOTED(GDBINIT,"$gdbinit",[The .gdbinit filename.])
+ 
++dnl Check security_get_boolean_active availability.
++AC_CHECK_HEADERS(selinux/selinux.h)
++AC_CHECK_LIB(selinux, security_get_boolean_active)
++
+ dnl Handle optional features that can be enabled.
+ 
+ # Support for --with-sysroot is a copy of GDB_AC_WITH_DIR,
+diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in
+--- a/gdb/gdbserver/config.in
++++ b/gdb/gdbserver/config.in
+@@ -126,6 +126,9 @@
+ /* Define to 1 if you have the `mcheck' library (-lmcheck). */
+ #undef HAVE_LIBMCHECK
+ 
++/* Define to 1 if you have the `selinux' library (-lselinux). */
++#undef HAVE_LIBSELINUX
++
+ /* Define if the target supports branch tracing. */
+ #undef HAVE_LINUX_BTRACE
+ 
+@@ -202,6 +205,9 @@
+ /* Define to 1 if you have the `pwrite' function. */
+ #undef HAVE_PWRITE
+ 
++/* Define to 1 if you have the <selinux/selinux.h> header file. */
++#undef HAVE_SELINUX_SELINUX_H
++
+ /* Define to 1 if you have the `setns' function. */
+ #undef HAVE_SETNS
+ 
+diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
+--- a/gdb/gdbserver/configure
++++ b/gdb/gdbserver/configure
+@@ -8535,6 +8535,64 @@ if $want_ipa ; then
+    fi
+ fi
+ 
++for ac_header in selinux/selinux.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
++if test "x$ac_cv_header_selinux_selinux_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SELINUX_SELINUX_H 1
++_ACEOF
++
++fi
++
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for security_get_boolean_active in -lselinux" >&5
++$as_echo_n "checking for security_get_boolean_active in -lselinux... " >&6; }
++if test "${ac_cv_lib_selinux_security_get_boolean_active+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lselinux  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char security_get_boolean_active ();
++int
++main ()
++{
++return security_get_boolean_active ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_selinux_security_get_boolean_active=yes
++else
++  ac_cv_lib_selinux_security_get_boolean_active=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_get_boolean_active" >&5
++$as_echo "$ac_cv_lib_selinux_security_get_boolean_active" >&6; }
++if test "x$ac_cv_lib_selinux_security_get_boolean_active" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBSELINUX 1
++_ACEOF
++
++  LIBS="-lselinux $LIBS"
++
++fi
++
++
+ 
+ 
+ 
+diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
+--- a/gdb/gdbserver/configure.ac
++++ b/gdb/gdbserver/configure.ac
+@@ -486,6 +486,10 @@ if $want_ipa ; then
+    fi
+ fi
+ 
++dnl Check security_get_boolean_active availability.
++AC_CHECK_HEADERS(selinux/selinux.h)
++AC_CHECK_LIB(selinux, security_get_boolean_active)
++
+ AC_SUBST(GDBSERVER_DEPFILES)
+ AC_SUBST(GDBSERVER_LIBS)
+ AC_SUBST(srv_xmlbuiltin)
+diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
+--- a/gdb/gdbserver/linux-low.c
++++ b/gdb/gdbserver/linux-low.c
+@@ -967,7 +967,16 @@ linux_ptrace_fun ()
+ {
+   if (ptrace (PTRACE_TRACEME, 0, (PTRACE_TYPE_ARG3) 0,
+ 	      (PTRACE_TYPE_ARG4) 0) < 0)
+-    trace_start_error_with_name ("ptrace");
++    {
++      int save_errno = errno;
++
++      std::string msg (linux_ptrace_create_warnings ());
++
++      msg += _("Cannot trace created process");
++
++      errno = save_errno;
++      trace_start_error_with_name (msg.c_str ());
++    }
+ 
+   if (setpgid (0, 0) < 0)
+     trace_start_error_with_name ("setpgid");
+diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
+--- a/gdb/linux-nat.c
++++ b/gdb/linux-nat.c
+@@ -1089,7 +1089,17 @@ linux_nat_target::create_inferior (const char *exec_file,
+   /* Make sure we report all signals during startup.  */
+   pass_signals (0, NULL);
+ 
+-  inf_ptrace_target::create_inferior (exec_file, allargs, env, from_tty);
++  TRY
++    {
++      inf_ptrace_target::create_inferior (exec_file, allargs, env, from_tty);
++    }
++  CATCH (ex, RETURN_MASK_ERROR)
++    {
++      std::string result =  linux_ptrace_create_warnings ();
++
++      throw_error (ex.error, "%s%s", result.c_str (), ex.message);
++    }
++  END_CATCH
+ }
+ 
+ /* Callback for linux_proc_attach_tgid_threads.  Attach to PTID if not
+diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
+--- a/gdb/nat/linux-ptrace.c
++++ b/gdb/nat/linux-ptrace.c
+@@ -25,6 +25,10 @@
+ #include <sys/procfs.h>
+ #endif
+ 
++#ifdef HAVE_SELINUX_SELINUX_H
++# include <selinux/selinux.h>
++#endif /* HAVE_SELINUX_SELINUX_H */
++
+ /* Stores the ptrace options supported by the running kernel.
+    A value of -1 means we did not check for features yet.  A value
+    of 0 means there are no supported features.  */
+@@ -50,6 +54,8 @@ linux_ptrace_attach_fail_reason (pid_t pid)
+ 		      "terminated"),
+ 		    (int) pid);
+ 
++  result += linux_ptrace_create_warnings ();
++
+   return result;
+ }
+ 
+@@ -583,6 +589,25 @@ linux_ptrace_init_warnings (void)
+   linux_ptrace_test_ret_to_nx ();
+ }
+ 
++/* Print all possible reasons we could fail to create a traced process.  */
++
++std::string
++linux_ptrace_create_warnings ()
++{
++  std::string result;
++
++#ifdef HAVE_LIBSELINUX
++  /* -1 is returned for errors, 0 if it has no effect, 1 if PTRACE_ATTACH is
++     forbidden.  */
++  if (security_get_boolean_active ("deny_ptrace") == 1)
++    string_appendf (result,
++		    _("the SELinux boolean 'deny_ptrace' is enabled, "
++		      "you can disable this process attach protection by: "
++		      "(gdb) shell sudo setsebool deny_ptrace=0\n"));
++#endif /* HAVE_LIBSELINUX */
++  return result;
++}
++
+ /* Extract extended ptrace event from wait status.  */
+ 
+ int
+diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
+--- a/gdb/nat/linux-ptrace.h
++++ b/gdb/nat/linux-ptrace.h
+@@ -184,6 +184,7 @@ extern std::string linux_ptrace_attach_fail_reason (pid_t pid);
+ extern std::string linux_ptrace_attach_fail_reason_string (ptid_t ptid, int err);
+ 
+ extern void linux_ptrace_init_warnings (void);
++extern std::string linux_ptrace_create_warnings ();
+ extern void linux_check_ptrace_features (void);
+ extern void linux_enable_event_reporting (pid_t pid, int attached);
+ extern void linux_disable_event_reporting (pid_t pid);

SOURCES/gdb-btrobust.patch

@@ -0,0 +1,45 @@
+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-btrobust.patch
+
+;; Continue backtrace even if a frame filter throws an exception (Phil Muldoon).
+;;=push
+
+This should fix the error  with glib.  An error message will still be
+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
+@@ -1151,6 +1151,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
+ 				       htab_eq_pointer,
+ 				       NULL));
+ 
++  int count_printed = 0;
+   while (true)
+     {
+       gdbpy_ref<> item (PyIter_Next (iterable.get ()));
+@@ -1159,8 +1160,8 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
+ 	{
+ 	  if (PyErr_Occurred ())
+ 	    {
+-	      throw_quit_or_print_exception ();
+-	      return EXT_LANG_BT_ERROR;
++	      gdbpy_print_stack ();
++	      return count_printed > 0 ? EXT_LANG_BT_ERROR : EXT_LANG_BT_NO_FILTERS;
+ 	    }
+ 	  break;
+ 	}
+@@ -1193,7 +1194,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)
+-	throw_quit_or_print_exception ();
++	gdbpy_print_stack ();
++      count_printed++;
+     }
+ 
+   return success;

SOURCES/gdb-bz1219747-attach-kills.patch

@@ -0,0 +1,178 @@
+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-bz1219747-attach-kills.patch
+
+;; Never kill PID on: gdb exec PID (Jan Kratochvil, RH BZ 1219747).
+;;=push+jan
+
+http://sourceware.org/ml/gdb-patches/2015-10/msg00301.html
+
+Hi,
+
+in some cases with deleted main executable GDB will want to kill the inferior.
+
+$ cp /bin/sleep /tmp/sleep;/tmp/sleep 1h&p=$!
+$ rm /tmp/sleep
+$ gdb /tmp/sleep $p
+GNU gdb (GDB) 7.10.50.20151016-cvs
+/tmp/sleep: No such file or directory.
+Attaching to process 9694
+/tmp/sleep (deleted): No such file or directory.
+A program is being debugged already.  Kill it? (y or n) _
+
+The first attachment of "/tmp/sleep" commandline argument errors at:
+
+267               if (scratch_chan < 0)
+268                 perror_with_name (filename);
+1051          if (catch_command_errors_const (exec_file_attach, execarg,
+1052                                          !batch_flag))
+
+Then GDB tries to attach to the process $p:
+
+1082              if (catch_command_errors (attach_command, pid_or_core_arg,
+1083                                        !batch_flag) == 0)
+
+This succeeds and since this moment GDB has a valid inferior.  But despite that
+the lines
+1082              if (catch_command_errors (attach_command, pid_or_core_arg,
+1083                                        !batch_flag) == 0)
+still fail because consequently attach_command() fails to find the associated
+executable file:
+
+267               if (scratch_chan < 0)
+268                 perror_with_name (filename);
+1082              if (catch_command_errors (attach_command, pid_or_core_arg,
+1083                                        !batch_flag) == 0)
+
+and therefore GDB executes the following:
+
+(gdb) bt
+2179	  if (have_inferiors ())
+2180	    {
+2181	      if (!from_tty
+2182		  || !have_live_inferiors ()
+2183		  || query (_("A program is being debugged already.  Kill it? ")))
+2184		iterate_over_inferiors (dispose_inferior, NULL);
+2185	      else
+2186		error (_("Program not killed."));
+2187	    }
+1084		    catch_command_errors (core_file_command, pid_or_core_arg,
+1085					  !batch_flag);
+
+No regressions on {x86_64,x86_64-m32,i686}-fedora24pre-linux-gnu.
+
+Thanks,
+Jan
+
+gdb/ChangeLog
+2015-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* main.c (captured_main): Run core_file_command for pid_or_core_arg
+	only if not have_inferiors ().
+
+gdb/testsuite/ChangeLog
+2015-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.base/attach-kills.c: New.
+	* gdb.base/attach-kills.exp: New.
+
+diff --git a/gdb/main.c b/gdb/main.c
+--- a/gdb/main.c
++++ b/gdb/main.c
+@@ -1115,7 +1115,10 @@ captured_main_1 (struct captured_main_args *context)
+       if (isdigit (pid_or_core_arg[0]))
+ 	{
+ 	  if (catch_command_errors (attach_command, pid_or_core_arg,
+-				    !batch_flag) == 0)
++				    !batch_flag) == 0
++	      /* attach_command could succeed partially and core_file_command
++		 would try to kill it.  */
++	      && !have_inferiors ())
+ 	    catch_command_errors (core_file_command, pid_or_core_arg,
+ 				  !batch_flag);
+ 	}
+diff --git a/gdb/testsuite/gdb.base/attach-kills.c b/gdb/testsuite/gdb.base/attach-kills.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/attach-kills.c
+@@ -0,0 +1,25 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2015 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#include <unistd.h>
++
++int
++main (void)
++{
++  sleep (600);
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/attach-kills.exp b/gdb/testsuite/gdb.base/attach-kills.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/attach-kills.exp
+@@ -0,0 +1,49 @@
++# Copyright (C) 2015 Free Software Foundation, Inc.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++if { ![can_spawn_for_attach] } {
++    return 0
++}
++
++standard_testfile
++
++if { [build_executable ${testfile}.exp $testfile] == -1 } {
++    return -1
++}
++
++# Start the program running and then wait for a bit, to be sure
++# that it can be attached to.
++
++set test_spawn_id [spawn_wait_for_attach $binfile]
++set testpid [spawn_id_get_pid $test_spawn_id]
++
++remote_exec target "cp -pf -- $binfile $binfile-copy"
++remote_exec target "rm -f -- $binfile"
++
++set test "start gdb"
++set res [gdb_spawn_with_cmdline_opts \
++	 "-iex \"set height 0\" -iex \"set width 0\" /DoEsNoTeXySt $testpid"]
++if { $res != 0} {
++    fail "$test (spawn)"
++    kill_wait_spawned_process $test_spawn_id
++    return -1
++}
++gdb_test_multiple "" $test {
++    -re "\r\nAttaching to .*\r\n$gdb_prompt $" {
++	pass $test
++    }
++}
++
++kill_wait_spawned_process $test_spawn_id

SOURCES/gdb-bz533176-fortran-omp-step.patch

@@ -0,0 +1,130 @@
+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-bz533176-fortran-omp-step.patch
+
+;; Fix stepping with OMP parallel Fortran sections (BZ 533176).
+;;=push+jan: It requires some better DWARF annotations.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=533176#c4
+
+I find it a bug in DWARF and gdb behaves correctly according to it.  From the
+current DWARF's point of view the is a function call which you skip by "next".
+
+If you hide any /usr/lib/debug such as using:
+gdb -nx -ex 'set debug-file-directory /qwe' -ex 'file ./tpcommon_gfortran44'
+and use "step" command instead of "next" there it will work.
+(You need to hide debuginfo from libgomp as you would step into libgomp sources
+to maintain the threads for execution.)
+
+There should be some DWARF extension for it, currently tried to detect
+substring ".omp_fn." as this function is called "MAIN__.omp_fn.0" and do not
+consider such sub-function as a skippable by "next".
+
+Another problem is that with "set scheduler-locking" being "off" (default
+upstream) or "step" (default in F/RHEL) the simultaneous execution of the
+threads is inconvenient.  Setting it to "on" will lockup the debugging as the
+threads need to get synchronized at some point.  This is a more general
+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
+@@ -6695,6 +6695,16 @@ process_event_stop_test (struct execution_control_state *ecs)
+ 
+       if (ecs->event_thread->control.step_over_calls == STEP_OVER_ALL)
+ 	{
++	  struct symbol *stop_fn = find_pc_function (stop_pc);
++	  struct minimal_symbol *stopf = lookup_minimal_symbol_by_pc (stop_pc).minsym;
++
++	  if ((stop_fn == NULL
++	       || strstr (SYMBOL_LINKAGE_NAME (stop_fn), ".omp_fn.") == NULL)
++	      /* gcc-4.7.2-9.fc19.x86_64 uses a new format.  */
++	      && (stopf == NULL
++		  || strstr (MSYMBOL_LINKAGE_NAME (stopf), "._omp_fn.") == NULL))
++{	/* ".omp_fn." */
++
+ 	  /* We're doing a "next".
+ 
+ 	     Normal (forward) execution: set a breakpoint at the
+@@ -6728,6 +6738,7 @@ process_event_stop_test (struct execution_control_state *ecs)
+ 
+ 	  keep_going (ecs);
+ 	  return;
++}	/* ".omp_fn." */
+ 	}
+ 
+       /* If we are in a function call trampoline (a stub between the
+diff --git a/gdb/testsuite/gdb.fortran/omp-step.exp b/gdb/testsuite/gdb.fortran/omp-step.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.fortran/omp-step.exp
+@@ -0,0 +1,31 @@
++# Copyright 2009 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++set testfile "omp-step"
++set srcfile ${testfile}.f90
++if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f90 additional_flags=-fopenmp}] } {
++    return -1
++}
++
++if ![runto [gdb_get_line_number "start-here"]] {
++    perror "Couldn't run to start-here"
++    return 0
++}
++
++gdb_test "next" {!\$omp parallel} "step closer"
++gdb_test "next" {a\(omp_get_thread_num\(\) \+ 1\) = 1} "step into omp"
++
++gdb_breakpoint [gdb_get_line_number "success"]
++gdb_continue_to_breakpoint "success" ".*success.*"
+diff --git a/gdb/testsuite/gdb.fortran/omp-step.f90 b/gdb/testsuite/gdb.fortran/omp-step.f90
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.fortran/omp-step.f90
+@@ -0,0 +1,32 @@
++! Copyright 2009 Free Software Foundation, Inc.
++
++! This program is free software; you can redistribute it and/or modify
++! it under the terms of the GNU General Public License as published by
++! the Free Software Foundation; either version 3 of the License, or
++! (at your option) any later version.
++!
++! This program is distributed in the hope that it will be useful,
++! but WITHOUT ANY WARRANTY; without even the implied warranty of
++! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++! GNU General Public License for more details.
++!
++! You should have received a copy of the GNU General Public License
++! along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++      use omp_lib
++      integer nthreads, i, a(1000)
++      nthreads = omp_get_num_threads()
++      if (nthreads .gt. 1000) call abort
++
++      do i = 1, nthreads
++          a(i) = 0
++      end do
++      print *, "start-here"
++!$omp parallel
++      a(omp_get_thread_num() + 1) = 1
++!$omp end parallel
++      do i = 1, nthreads
++          if (a(i) .ne. 1) call abort
++      end do
++      print *, "success"
++      end

SOURCES/gdb-bz541866-rwatch-before-run.patch

@@ -0,0 +1,175 @@
+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-bz541866-rwatch-before-run.patch
+
+;; Fix i386+x86_64 rwatch+awatch before run, regression against 6.8 (BZ 541866).
+;; Fix i386 rwatch+awatch before run (BZ 688788, on top of BZ 541866).
+;;=push+jan: It should be fixed properly instead.
+
+diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
+--- a/gdb/breakpoint.c
++++ b/gdb/breakpoint.c
+@@ -8807,7 +8807,7 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch,
+ 		     int enabled, int internal, unsigned flags,
+ 		     int display_canonical)
+ {
+-  int i;
++  int i ATTRIBUTE_UNUSED;
+ 
+   if (type == bp_hardware_breakpoint)
+     {
+@@ -14356,7 +14356,7 @@ enable_breakpoint_disp (struct breakpoint *bpt, enum bpdisp disposition,
+ 
+   if (bpt->type == bp_hardware_breakpoint)
+     {
+-      int i;
++      int i ATTRIBUTE_UNUSED;
+       i = hw_breakpoint_used_count ();
+       target_resources_ok = 
+ 	target_can_use_hardware_watchpoint (bp_hardware_breakpoint, 
+diff --git a/gdb/config/i386/nm-linux.h b/gdb/config/i386/nm-linux.h
+new file mode 100644
+--- /dev/null
++++ b/gdb/config/i386/nm-linux.h
+@@ -0,0 +1,28 @@
++/* Native support for GNU/Linux i386.
++
++   Copyright 2010 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#ifndef NM_LINUX_H
++#define NM_LINUX_H
++
++#include "config/nm-linux.h"
++
++/* Red Hat backward compatibility with gdb-6.8.  */
++#define target_can_use_hardware_watchpoint(type, cnt, ot) 1
++
++#endif /* NM_LINUX64_H */
+diff --git a/gdb/config/i386/nm-linux64.h b/gdb/config/i386/nm-linux64.h
+new file mode 100644
+--- /dev/null
++++ b/gdb/config/i386/nm-linux64.h
+@@ -0,0 +1,28 @@
++/* Native support for GNU/Linux amd64.
++
++   Copyright 2010 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#ifndef NM_LINUX64_H
++#define NM_LINUX64_H
++
++#include "config/nm-linux.h"
++
++/* Red Hat backward compatibility with gdb-6.8.  */
++#define target_can_use_hardware_watchpoint(type, cnt, ot) 1
++
++#endif /* NM_LINUX64_H */
+diff --git a/gdb/configure.nat b/gdb/configure.nat
+--- a/gdb/configure.nat
++++ b/gdb/configure.nat
+@@ -238,6 +238,7 @@ case ${gdb_host} in
+ 		;;
+ 	    i386)
+ 		# Host: Intel 386 running GNU/Linux.
++		NAT_FILE="${srcdir}/config/${gdb_host_cpu}/nm-linux.h"
+ 		NATDEPFILES="${NATDEPFILES} x86-nat.o x86-dregs.o \
+ 		i386-linux-nat.o x86-linux-nat.o linux-btrace.o \
+ 		x86-linux.o x86-linux-dregs.o"
+@@ -290,6 +291,7 @@ case ${gdb_host} in
+ 	case ${gdb_host_cpu} in
+ 	    i386)
+ 		# Host: GNU/Linux x86-64
++		NAT_FILE="${srcdir}/config/${gdb_host_cpu}/nm-linux64.h"
+ 		NATDEPFILES="${NATDEPFILES} x86-nat.o x86-dregs.o \
+ 		amd64-nat.o amd64-linux-nat.o x86-linux-nat.o linux-btrace.o \
+ 		x86-linux.o x86-linux-dregs.o amd64-linux-siginfo.o"
+diff --git a/gdb/target.h b/gdb/target.h
+--- a/gdb/target.h
++++ b/gdb/target.h
+@@ -1953,9 +1953,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.  */
+ 
++#ifndef target_can_use_hardware_watchpoint
+ #define target_can_use_hardware_watchpoint(TYPE,CNT,OTHERTYPE) \
+  (current_top_target ()->can_use_hw_breakpoint) ( \
+ 					     TYPE, CNT, OTHERTYPE)
++#endif
+ 
+ /* Returns the number of debug registers needed to watch the given
+    memory region, or zero if not supported.  */
+diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-before-run.exp b/gdb/testsuite/gdb.base/watchpoint-hw-before-run.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/watchpoint-hw-before-run.exp
+@@ -0,0 +1,40 @@
++# Copyright 2009, 2010 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++# Arch not supporting hw watchpoints does not imply no_hardware_watchpoints set.
++if {(![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]
++     && ![istarget "ia64-*-*"])
++    || [target_info exists gdb,no_hardware_watchpoints]} then {
++    verbose "Skipping watchpoint-hw-before-run test."
++    return
++}
++
++set test watchpoint-hw-before-run
++set srcfile watchpoint-hw-hit-once.c
++if { [prepare_for_testing ${test}.exp ${test} ${srcfile}] } {
++    return -1
++}
++
++gdb_test "rwatch watchee" "ardware read watchpoint 1: watchee"
++
++# `runto_main' or `runto main' would delete the watchpoint created above.
++
++if { [gdb_start_cmd] < 0 } {
++    untested start
++    return -1
++}
++gdb_test "" "main .* at .*" "start"
++
++gdb_test "continue" "Continuing.\r\n\r\nHardware read watchpoint \[0-9\]+: watchee\r\n\r\nValue = 0\r\n.*"

SOURCES/gdb-bz568248-oom-is-error.patch

@@ -0,0 +1,71 @@
+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-bz568248-oom-is-error.patch
+
+;; Out of memory is just an error, not fatal (uninitialized VLS vars, BZ 568248).
+;;=push+jan: Inferior objects should be read in parts, then this patch gets obsoleted.
+
+http://sourceware.org/ml/gdb-patches/2010-06/msg00005.html
+
+Hi,
+
+unfortunately I see this problem reproducible only with the
+archer-jankratochvil-vla branch (VLA = Variable Length Arrays - char[var]).
+OTOH this branch I hopefully submit in some form for FSF GDB later.
+
+In this case (a general problem but tested for example on Fedora 13 i686):
+
+int
+main (int argc, char **argv)
+{
+  char a[argc];
+  return a[0];
+}
+
+(gdb) start
+(gdb) print a
+../../gdb/utils.c:1251: internal-error: virtual memory exhausted: can't allocate 4294951689 bytes.
+
+It is apparently because boundary for the variable `a' is not initialized
+there.  Users notice it due to Eclipse-CDT trying to automatically display all
+the local variables on each step.
+
+Apparentl no regressions on {x86_64,x86_64-m32,i686}-fedora13-linux-gnu.
+But is anone aware of the reasons to use internal_error there?
+I find simple error as a perfectly reasonable there.
+(history only tracks it since the initial import)
+
+IIRC this idea has been discussed with Tom Tromey, not sure of its origin.
+
+I understand it may be offtopic for FSF GDB but from some GDB crashes I am not
+sure if it can happen only due to the VLA variables.
+
+Thanks,
+Jan
+
+gdb/
+2010-06-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
+	    Tom Tromey  <tromey@redhat.com>
+
+	* utils.c (nomem): Change internal_error to error.
+
+diff --git a/gdb/utils.c b/gdb/utils.c
+--- a/gdb/utils.c
++++ b/gdb/utils.c
+@@ -746,13 +746,11 @@ malloc_failure (long size)
+ {
+   if (size > 0)
+     {
+-      internal_error (__FILE__, __LINE__,
+-		      _("virtual memory exhausted: can't allocate %ld bytes."),
+-		      size);
++      error (_("virtual memory exhausted: can't allocate %ld bytes."), size);
+     }
+   else
+     {
+-      internal_error (__FILE__, __LINE__, _("virtual memory exhausted."));
++      error (_("virtual memory exhausted."));
+     }
+ }
+ 

SOURCES/gdb-bz601887-dwarf4-rh-test.patch

@@ -233,11 +233,11 @@ new file mode 100644
 +    && ![istarget *-*-openbsd*]
 +    && ![istarget arm-*-eabi*]
 +    && ![istarget powerpc-*-eabi*]} {
-+    return 0
++    return 0  
 +}
 +
 +if {![istarget x86_64-*]} {
-+    return 0
++    return 0  
 +}
 +
 +set testfile "rh-dwarf4-x86_64"

SOURCES/gdb-bz634108-solib_address.patch

@@ -38,4 +38,4 @@ new file mode 100644
 +# Skip all tests if Python scripting is not enabled.
 +if { [skip_python_tests] } { continue }
 +
-+gdb_test "python print (gdb.solib_name(-1))" "None" "gdb.solib_name exists"
++gdb_test "python print gdb.solib_name(-1)" "None" "gdb.solib_name exists"

SOURCES/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
-@@ -14031,7 +14031,17 @@ remote_target::pid_to_exec_file (int pid)
+@@ -13909,7 +13909,17 @@ remote_target::pid_to_exec_file (int pid)
    char *annex = NULL;
  
    if (packet_support (PACKET_qXfer_exec_file) != PACKET_ENABLE)
@@ -26,5 +26,5 @@ diff --git a/gdb/remote.c b/gdb/remote.c
 +      return NULL;
 +    }
  
-   inferior *inf = find_inferior_pid (this, pid);
+   inf = find_inferior_pid (pid);
    if (inf == NULL)

SOURCES/gdb-core-open-vdso-warning.patch

@@ -27,7 +27,7 @@ diff --git a/gdb/testsuite/gdb.base/solib-symbol.exp b/gdb/testsuite/gdb.base/so
  
  if [get_compiler_info] {
      return -1
-@@ -71,8 +72,26 @@ gdb_test "br foo2" \
+@@ -72,8 +73,26 @@ gdb_test "br foo2" \
  	 "Breakpoint.*: foo2. .2 locations..*" \
  	 "foo2 in mdlib"
  

SOURCES/gdb-dont-overwrite-fsgsbase-m32.patch

@@ -1,139 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Tom de Vries <tdevries@suse.de>
-Date: Tue, 1 Jun 2021 10:14:31 -0700
-Subject: gdb-dont-overwrite-fsgsbase-m32.patch
-
-;; Backport "[gdb/server] Don't overwrite fs/gs_base with -m32"
-;; (Tom de Vries)
-
-Consider a minimal test-case test.c:
-...
-int main (void) { return 0; }
-...
-compiled with -m32:
-...
-$ gcc test.c -m32
-...
-
-When running the exec using gdbserver on openSUSE Factory (currently running a
-linux kernel version 5.10.5):
-...
-$ gdbserver localhost:12345 a.out
-...
-to which we connect in a gdb session, we run into a segfault in the inferior:
-...
-$ gdb -batch -q -ex "target remote localhost:12345" -ex continue
-Program received signal SIGSEGV, Segmentation fault.
-0xf7dd8bd2 in init_cacheinfo () at ../sysdeps/x86/cacheinfo.c:761
-...
-
-The segfault is caused by gdbserver overwriting $gs_base with 0 using
-PTRACE_SETREGS.  After it is overwritten, the next use of $gs in the inferior
-will trigger the segfault.
-
-Before linux kernel version 5.9, the value used by PTRACE_SETREGS for $gs_base
-was ignored, but starting version 5.9, the linux kernel has support for
-intel architecture extension FSGSBASE, which allows users to modify $gs_base,
-and consequently PTRACE_SETREGS can no longer ignore the $gs_base value.
-
-The overwrite of $gs_base with 0 is done by a memset in x86_fill_gregset,
-which was added in commit 9e0aa64f551 "Fix gdbserver qGetTLSAddr for
-x86_64 -m32".  The memset intends to zero-extend 32-bit registers that are
-tracked in the regcache to 64-bit when writing them into the PTRACE_SETREGS
-data argument.  But in addition, it overwrites other registers that are
-not tracked in the regcache, such as $gs_base.
-
-Fix the segfault by redoing the fix from commit 9e0aa64f551 in minimal form.
-
-Tested on x86_64-linux:
-- openSUSE Leap 15.2 (using kernel version 5.3.18):
-  - native
-  - gdbserver -m32
-  - -m32
-- openSUSE Factory (using kernel version 5.10.5):
-  - native
-  - m32
-
-gdbserver/ChangeLog:
-
-2021-01-20  Tom de Vries  <tdevries@suse.de>
-
-	* linux-x86-low.cc (collect_register_i386): New function.
-	(x86_fill_gregset):  Remove memset.  Use collect_register_i386.
-
-diff --git a/gdbserver/linux-x86-low.cc b/gdbserver/linux-x86-low.cc
---- a/gdbserver/linux-x86-low.cc
-+++ b/gdbserver/linux-x86-low.cc
-@@ -397,6 +397,35 @@ x86_target::low_cannot_fetch_register (int regno)
-   return regno >= I386_NUM_REGS;
- }
- 
-+static void
-+collect_register_i386 (struct regcache *regcache, int regno, void *buf)
-+{
-+  collect_register (regcache, regno, buf);
-+
-+#ifdef __x86_64__
-+  /* In case of x86_64 -m32, collect_register only writes 4 bytes, but the
-+     space reserved in buf for the register is 8 bytes.  Make sure the entire
-+     reserved space is initialized.  */
-+
-+  gdb_assert (register_size (regcache->tdesc, regno) == 4);
-+
-+  if (regno == RAX)
-+    {
-+      /* Sign extend EAX value to avoid potential syscall restart
-+	 problems.
-+
-+	 See amd64_linux_collect_native_gregset() in
-+	 gdb/amd64-linux-nat.c for a detailed explanation.  */
-+      *(int64_t *) buf = *(int32_t *) buf;
-+    }
-+  else
-+    {
-+      /* Zero-extend.  */
-+      *(uint64_t *) buf = *(uint32_t *) buf;
-+    }
-+#endif
-+}
-+
- static void
- x86_fill_gregset (struct regcache *regcache, void *buf)
- {
-@@ -411,32 +440,14 @@ x86_fill_gregset (struct regcache *regcache, void *buf)
- 
-       return;
-     }
--
--  /* 32-bit inferior registers need to be zero-extended.
--     Callers would read uninitialized memory otherwise.  */
--  memset (buf, 0x00, X86_64_USER_REGS * 8);
- #endif
- 
-   for (i = 0; i < I386_NUM_REGS; i++)
--    collect_register (regcache, i, ((char *) buf) + i386_regmap[i]);
--
--  collect_register_by_name (regcache, "orig_eax",
--			    ((char *) buf) + ORIG_EAX * REGSIZE);
-+    collect_register_i386 (regcache, i, ((char *) buf) + i386_regmap[i]);
- 
--#ifdef __x86_64__
--  /* Sign extend EAX value to avoid potential syscall restart
--     problems. 
--
--     See amd64_linux_collect_native_gregset() in gdb/amd64-linux-nat.c
--     for a detailed explanation.  */
--  if (register_size (regcache->tdesc, 0) == 4)
--    {
--      void *ptr = ((gdb_byte *) buf
--                   + i386_regmap[find_regno (regcache->tdesc, "eax")]);
--
--      *(int64_t *) ptr = *(int32_t *) ptr;
--    }
--#endif
-+  /* Handle ORIG_EAX, which is not in i386_regmap.  */
-+  collect_register_i386 (regcache, find_regno (regcache->tdesc, "orig_eax"),
-+			 ((char *) buf) + ORIG_EAX * REGSIZE);
- }
- 
- static void

SOURCES/gdb-dts-rhel6-python-compat.patch

@@ -0,0 +1,315 @@
+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-dts-rhel6-python-compat.patch
+
+;; [rhel6] DTS backward Python compatibility API (BZ 1020004, Phil Muldoon).
+;;=fedora
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1020004
+
+diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
+--- a/gdb/data-directory/Makefile.in
++++ b/gdb/data-directory/Makefile.in
+@@ -71,6 +71,8 @@ PYTHON_FILE_LIST = \
+ 	gdb/__init__.py \
+ 	gdb/FrameDecorator.py \
+ 	gdb/FrameIterator.py \
++	gdb/FrameWrapper.py \
++	gdb/backtrace.py \
+ 	gdb/frames.py \
+ 	gdb/printing.py \
+ 	gdb/prompt.py \
+@@ -79,6 +81,7 @@ PYTHON_FILE_LIST = \
+ 	gdb/xmethod.py \
+ 	gdb/command/__init__.py \
+ 	gdb/command/explore.py \
++	gdb/command/backtrace.py \
+ 	gdb/command/frame_filters.py \
+ 	gdb/command/pretty_printers.py \
+ 	gdb/command/prompt.py \
+diff --git a/gdb/python/lib/gdb/FrameWrapper.py b/gdb/python/lib/gdb/FrameWrapper.py
+new file mode 100644
+--- /dev/null
++++ b/gdb/python/lib/gdb/FrameWrapper.py
+@@ -0,0 +1,122 @@
++# Wrapper API for frames.
++
++# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++import gdb
++
++# FIXME: arguably all this should be on Frame somehow.
++class FrameWrapper:
++    def __init__ (self, frame):
++        self.frame = frame;
++
++    def write_symbol (self, stream, sym, block):
++        if len (sym.linkage_name):
++            nsym, is_field_of_this = gdb.lookup_symbol (sym.linkage_name, block)
++            if nsym.addr_class != gdb.SYMBOL_LOC_REGISTER:
++                sym = nsym
++
++        stream.write (sym.print_name + "=")
++        try:
++            val = self.read_var (sym)
++            if val != None:
++                val = str (val)
++        # FIXME: would be nice to have a more precise exception here.
++        except RuntimeError as text:
++            val = text
++        if val == None:
++            stream.write ("???")
++        else:
++            stream.write (str (val))
++
++    def print_frame_locals (self, stream, func):
++
++        try:
++            block = self.frame.block()
++        except RuntimeError:
++            block = None
++
++        while block != None:
++            if block.is_global or block.is_static:
++                break
++
++        for sym in block:
++            if sym.is_argument:
++                continue;
++
++            self.write_symbol (stream, sym, block)
++            stream.write ('\n')
++
++    def print_frame_args (self, stream, func):
++
++        try:
++            block = self.frame.block()
++        except RuntimeError:
++            block = None
++
++        while block != None:
++            if block.function != None:
++                break
++            block = block.superblock
++
++        first = True
++        for sym in block:
++            if not sym.is_argument:
++                continue;
++
++            if not first:
++                stream.write (", ")
++
++            self.write_symbol (stream, sym, block)
++            first = False
++
++    # FIXME: this should probably just be a method on gdb.Frame.
++    # But then we need stream wrappers.
++    def describe (self, stream, full):
++        if self.type () == gdb.DUMMY_FRAME:
++            stream.write (" <function called from gdb>\n")
++        elif self.type () == gdb.SIGTRAMP_FRAME:
++            stream.write (" <signal handler called>\n")
++        else:
++            sal = self.find_sal ()
++            pc = self.pc ()
++            name = self.name ()
++            if not name:
++                name = "??"
++            if pc != sal.pc or not sal.symtab:
++                stream.write (" 0x%08x in" % pc)
++            stream.write (" " + name + " (")
++
++            func = self.function ()
++            self.print_frame_args (stream, func)
++
++            stream.write (")")
++
++            if sal.symtab and sal.symtab.filename:
++                stream.write (" at " + sal.symtab.filename)
++                stream.write (":" + str (sal.line))
++
++            if not self.name () or (not sal.symtab or not sal.symtab.filename):
++                lib = gdb.solib_name (pc)
++                if lib:
++                    stream.write (" from " + lib)
++
++            stream.write ("\n")
++
++            if full:
++                self.print_frame_locals (stream, func)
++
++    def __getattr__ (self, name):
++        return getattr (self.frame, name)
+diff --git a/gdb/python/lib/gdb/backtrace.py b/gdb/python/lib/gdb/backtrace.py
+new file mode 100644
+--- /dev/null
++++ b/gdb/python/lib/gdb/backtrace.py
+@@ -0,0 +1,42 @@
++# Filtering backtrace.
++
++# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++import gdb
++import itertools
++
++# Our only exports.
++__all__ = ['push_frame_filter', 'create_frame_filter']
++
++old_frame_filter = None
++
++def push_frame_filter (constructor):
++    """Register a new backtrace filter class with the 'backtrace' command.
++The filter will be passed an iterator as an argument.  The iterator
++will return gdb.Frame-like objects.  The filter should in turn act as
++an iterator returning such objects."""
++    global old_frame_filter
++    if old_frame_filter == None:
++        old_frame_filter = constructor
++    else:
++        old_frame_filter = lambda iterator, filter = frame_filter: constructor (filter(iterator))
++
++def create_frame_filter (iter):
++    global old_frame_filter
++    if old_frame_filter is None:
++        return iter
++    return old_frame_filter (iter)
++
+diff --git a/gdb/python/lib/gdb/command/backtrace.py b/gdb/python/lib/gdb/command/backtrace.py
+new file mode 100644
+--- /dev/null
++++ b/gdb/python/lib/gdb/command/backtrace.py
+@@ -0,0 +1,106 @@
++# New backtrace command.
++
++# Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++import gdb
++import gdb.backtrace
++import itertools
++from gdb.FrameIterator import FrameIterator
++from gdb.FrameWrapper import FrameWrapper
++import sys
++
++class ReverseBacktraceParameter (gdb.Parameter):
++    """The new-backtrace command can show backtraces in 'reverse' order.
++This means that the innermost frame will be printed last.
++Note that reverse backtraces are more expensive to compute."""
++
++    set_doc = "Enable or disable reverse backtraces."
++    show_doc = "Show whether backtraces will be printed in reverse order."
++
++    def __init__(self):
++        gdb.Parameter.__init__ (self, "reverse-backtrace",
++                                gdb.COMMAND_STACK, gdb.PARAM_BOOLEAN)
++        # Default to compatibility with gdb.
++        self.value = False
++
++class FilteringBacktrace (gdb.Command):
++    """Print backtrace of all stack frames, or innermost COUNT frames.
++With a negative argument, print outermost -COUNT frames.
++Use of the 'full' qualifier also prints the values of the local variables.
++Use of the 'raw' qualifier avoids any filtering by loadable modules.
++"""
++
++    def __init__ (self):
++        # FIXME: this is not working quite well enough to replace
++        # "backtrace" yet.
++        gdb.Command.__init__ (self, "new-backtrace", gdb.COMMAND_STACK)
++        self.reverse = ReverseBacktraceParameter()
++
++    def reverse_iter (self, iter):
++        result = []
++        for item in iter:
++            result.append (item)
++        result.reverse()
++        return result
++
++    def final_n (self, iter, x):
++        result = []
++        for item in iter:
++            result.append (item)
++        return result[x:]
++
++    def invoke (self, arg, from_tty):
++        i = 0
++        count = 0
++        filter = True
++        full = False
++
++        for word in arg.split (" "):
++            if word == '':
++                continue
++            elif word == 'raw':
++                filter = False
++            elif word == 'full':
++                full = True
++            else:
++                count = int (word)
++
++        # FIXME: provide option to start at selected frame
++        # However, should still number as if starting from newest
++        newest_frame = gdb.newest_frame()
++        iter = itertools.imap (FrameWrapper,
++                               FrameIterator (newest_frame))
++        if filter:
++            iter = gdb.backtrace.create_frame_filter (iter)
++
++        # Now wrap in an iterator that numbers the frames.
++        iter = itertools.izip (itertools.count (0), iter)
++
++        # Reverse if the user wanted that.
++        if self.reverse.value:
++            iter = self.reverse_iter (iter)
++
++        # Extract sub-range user wants.
++        if count < 0:
++            iter = self.final_n (iter, count)
++        elif count > 0:
++            iter = itertools.islice (iter, 0, count)
++
++        for pair in iter:
++            sys.stdout.write ("#%-2d" % pair[0])
++            pair[1].describe (sys.stdout, full)
++
++FilteringBacktrace()

SOURCES/gdb-fedora-libncursesw.patch

@@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1270534
 diff --git a/gdb/configure b/gdb/configure
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -9649,6 +9649,7 @@ if test x"$prefer_curses" = xyes; then
+@@ -9393,6 +9393,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.
@@ -20,7 +20,7 @@ diff --git a/gdb/configure b/gdb/configure
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing waddstr" >&5
  $as_echo_n "checking for library containing waddstr... " >&6; }
  if ${ac_cv_search_waddstr+:} false; then :
-@@ -9673,7 +9674,7 @@ return waddstr ();
+@@ -9417,7 +9418,7 @@ return waddstr ();
    return 0;
  }
  _ACEOF
@@ -29,7 +29,7 @@ diff --git a/gdb/configure b/gdb/configure
    if test -z "$ac_lib"; then
      ac_res="none required"
    else
-@@ -9747,6 +9748,7 @@ case $host_os in
+@@ -9491,6 +9492,7 @@ case $host_os in
  esac
  
  # These are the libraries checked by Readline.
@@ -37,19 +37,19 @@ diff --git a/gdb/configure b/gdb/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
  $as_echo_n "checking for library containing tgetent... " >&6; }
  if ${ac_cv_search_tgetent+:} false; then :
-@@ -9771,7 +9773,7 @@ return tgetent ();
+@@ -9515,7 +9517,7 @@ return tgetent ();
    return 0;
  }
  _ACEOF
--for ac_lib in '' termcap tinfow tinfo curses ncursesw ncurses; do
-+for ac_lib in '' ncursesw; do
+-for ac_lib in '' termcap tinfo curses ncursesw ncurses; do
++for ac_lib in '' termcap tinfo ncursesw; do
    if test -z "$ac_lib"; then
      ac_res="none required"
    else
 diff --git a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -712,7 +712,8 @@ if test x"$prefer_curses" = xyes; then
+@@ -766,7 +766,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,13 +59,13 @@ diff --git a/gdb/configure.ac b/gdb/configure.ac
  
    if test "$ac_cv_search_waddstr" != no; then
      curses_found=yes
-@@ -754,7 +755,8 @@ case $host_os in
+@@ -808,7 +809,8 @@ case $host_os in
  esac
  
  # These are the libraries checked by Readline.
--AC_SEARCH_LIBS(tgetent, [termcap tinfow tinfo curses ncursesw ncurses])
+-AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncursesw ncurses])
 +# Fedora: Force libncursesw over libncurses to match the includes.
-+AC_SEARCH_LIBS(tgetent, [ncursesw])
++AC_SEARCH_LIBS(tgetent, [termcap tinfo ncursesw])
  
  if test "$ac_cv_search_tgetent" = no; then
    CONFIG_OBS="$CONFIG_OBS stub-termcap.o"

SOURCES/gdb-flexible-array-member-expected-pattern.patch

@@ -1,88 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Simon Marchi <simon.marchi@efficios.com>
-Date: Tue, 4 May 2021 11:20:09 -0400
-Subject: gdb-flexible-array-member-expected-pattern.patch
-
-;; Backport "adjust gdb.python/flexible-array-member.exp expected pattern"
-;; (Simon Marchi)
-
-The `Type.range ()` tests in gdb.python/flexible-array-member.exp pass
-when the test is compiled with gcc 9 or later, but not with gcc 8 or
-earlier:
-
-    $ make check TESTS="gdb.python/flexible-array-member.exp" RUNTESTFLAGS="CC_FOR_TARGET='gcc-8'"
-
-    python print(zs['items'].type.range())^M
-    (0, 0)^M
-    (gdb) FAIL: gdb.python/flexible-array-member.exp: python print(zs['items'].type.range())
-    python print(zso['items'].type.range())^M
-    (0, 0)^M
-    (gdb) FAIL: gdb.python/flexible-array-member.exp: python print(zso['items'].type.range())
-
-The value that we get for the upper bound of a flexible array member
-declared with a "0" size is 0 with gcc <= 8 and is -1 for gcc >= 9.
-This is due to different debug info.  For this member, gcc 8 does:
-
-    0x000000d5:   DW_TAG_array_type
-                    DW_AT_type [DW_FORM_ref4]       (0x00000034 "int")
-                    DW_AT_sibling [DW_FORM_ref4]    (0x000000e4)
-
-    0x000000de:     DW_TAG_subrange_type
-                      DW_AT_type [DW_FORM_ref4]     (0x0000002d "long unsigned int")
-
-For the same type, gcc 9 does:
-
-    0x000000d5:   DW_TAG_array_type
-                    DW_AT_type [DW_FORM_ref4]       (0x00000034 "int")
-                    DW_AT_sibling [DW_FORM_ref4]    (0x000000e5)
-
-    0x000000de:     DW_TAG_subrange_type
-                      DW_AT_type [DW_FORM_ref4]     (0x0000002d "long unsigned int")
-                      DW_AT_count [DW_FORM_data1]   (0x00)
-
-Ideally, GDB would present a consistent and documented value for an
-array member declared with size 0, regardless of how the debug info
-looks like.  But for now, just change the test to accept the two
-values, to get rid of the failure and make the test in sync
-
-I also realized (by looking at the py-type.exp test) that calling the
-fields method on an array type yields one field representing the "index"
-of the array.  The type of that field is of type range
-(gdb.TYPE_CODE_RANGE).  When calling `.range()` on that range type, it
-yields the same range tuple as when calling `.range()` on the array type
-itself.  For completeness, add some tests to access the range tuple
-through that range type as well.
-
-gdb/testsuite/ChangeLog:
-
-	* gdb.python/flexible-array-member.exp: Adjust expected range
-	value for member declared with 0 size.  Test accessing range
-	tuple through range type.
-
-Change-Id: Ie4e06d99fe9315527f04577888f48284d649ca4c
-
-diff --git a/gdb/testsuite/gdb.python/flexible-array-member.exp b/gdb/testsuite/gdb.python/flexible-array-member.exp
---- a/gdb/testsuite/gdb.python/flexible-array-member.exp
-+++ b/gdb/testsuite/gdb.python/flexible-array-member.exp
-@@ -76,9 +76,17 @@ gdb_test "python print(zso\['items'\] == zso\['items'\]\[0\].address)" "True"
- gdb_test "python print(zso\['items'\]\[0\].address + 1 == zso\['items'\]\[1\].address)" "True"
- 
- # Verify the range attribute.  It looks a bit inconsistent that the high bound
--# is sometimes 0, sometimes -1, but that's what GDB produces today, so that's
--# what we test.
-+# is sometimes 0, sometimes -1.  It depends on the way the flexible array
-+# member is specified and on the compiler version (the debug info is
-+# different).  But that's what GDB produces today, so that's what we test.
- 
- gdb_test "python print(ns\['items'\].type.range())" "\\(0, 0\\)"
--gdb_test "python print(zs\['items'\].type.range())" "\\(0, -1\\)"
--gdb_test "python print(zso\['items'\].type.range())" "\\(0, -1\\)"
-+gdb_test "python print(zs\['items'\].type.range())" "\\(0, (0|-1)\\)"
-+gdb_test "python print(zso\['items'\].type.range())" "\\(0, (0|-1)\\)"
-+
-+# Test the same thing, but going explicitly through the array index's range
-+# type.
-+
-+gdb_test "python print(ns\['items'\].type.fields()\[0\].type.range())" "\\(0, 0\\)"
-+gdb_test "python print(zs\['items'\].type.fields()\[0\].type.range())" "\\(0, (0|-1)\\)"
-+gdb_test "python print(zso\['items'\].type.fields()\[0\].type.range())" "\\(0, (0|-1)\\)"

SOURCES/gdb-follow-child-stale-parent.patch

@@ -0,0 +1,36 @@
+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-follow-child-stale-parent.patch
+
+;; Fix regression by python on ia64 due to stale current frame.
+;;=push+jan
+
+Problem occurs with python and its get_current_arch () as it selects
+selected_frame and current_frame while still inferior_ptid is valid for the
+original parent.  But since this place it is already attached and later
+unwinders try to access it, breaking:
+  -PASS: gdb.threads/watchpoint-fork.exp: child: singlethreaded: breakpoint after the first fork
+  -PASS: gdb.threads/watchpoint-fork.exp: child: singlethreaded: watchpoint after the first fork
+  -PASS: gdb.threads/watchpoint-fork.exp: child: singlethreaded: breakpoint after the second fork
+  -PASS: gdb.threads/watchpoint-fork.exp: child: singlethreaded: watchpoint after the second fork
+  -PASS: gdb.threads/watchpoint-fork.exp: child: singlethreaded: finish
+  +FAIL: gdb.threads/watchpoint-fork.exp: child: singlethreaded: breakpoint after the first fork
+  +FAIL: gdb.threads/watchpoint-fork.exp: child: singlethreaded: watchpoint after the first fork
+  +FAIL: gdb.threads/watchpoint-fork.exp: child: singlethreaded: breakpoint after the second fork
+  +FAIL: gdb.threads/watchpoint-fork.exp: child: singlethreaded: watchpoint after the second fork
+  +FAIL: gdb.threads/watchpoint-fork.exp: child: singlethreaded: finish
+
+diff --git a/gdb/infrun.c b/gdb/infrun.c
+--- a/gdb/infrun.c
++++ b/gdb/infrun.c
+@@ -752,6 +752,9 @@ follow_fork (void)
+ 	  }
+ 	else
+ 	  {
++	    /* Possibly referenced PARENT is no longer valid.  */
++	    reinit_frame_cache ();
++
+ 	    /* This pending follow fork event is now handled, one way
+ 	       or another.  The previous selected thread may be gone
+ 	       from the lists by now, but if it is still around, need

SOURCES/gdb-fortran-frame-string.patch

@@ -39,15 +39,15 @@ new file mode 100644
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
-+#
++# 
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
-+#
++# 
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +standard_testfile .f90
 +if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}] } {
@@ -67,7 +67,7 @@ new file mode 100644
 +
 +# Fix rejected upstream:
 +# https://sourceware.org/ml/gdb-patches/2014-07/msg00768.html
-+setup_kfail "rejected" *-*-*
++setup_kfail "rejected" *-*-* 
 +gdb_test "frame" { \(s='foo', .*}
 diff --git a/gdb/testsuite/gdb.fortran/fortran-frame-string.f90 b/gdb/testsuite/gdb.fortran/fortran-frame-string.f90
 new file mode 100644

SOURCES/gdb-gdb27743-psymtab-imported-unit.patch

@@ -1,281 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Tom Tromey <tromey@adacore.com>
-Date: Fri, 23 Apr 2021 11:28:48 -0600
-Subject: gdb-gdb27743-psymtab-imported-unit.patch
-
-;; Backport "Fix crash when expanding partial symtabs with DW_TAG_imported_unit"
-;; (Tom Tromey, gdb/27743)
-
-   From e7d77ce0c408e7019f9885b8be64c9cdb46dd312 Mon Sep 17 00:00:00 2001
-   Subject: [PATCH] Fix crash when expanding partial symtabs with
- DW_TAG_imported_unit
-
-PR gdb/27743 points out a gdb crash when expanding partial symtabs,
-where one of the compilation units uses DW_TAG_imported_unit.
-
-The bug is that partial_map_expand_apply expects only to be called for
-the outermost psymtab.  However, filename searching doesn't (and
-probably shouldn't) guarantee this.  The fix is to walk upward to find
-the outermost CU.
-
-A new test case is included.  It is mostly copied from other test
-cases, which really sped up the effort.
-
-This bug does not occur on trunk.  There,
-psym_map_symtabs_matching_filename is gone, replaced by
-psymbol_functions::expand_symtabs_matching.  When this find a match,
-it calls psymtab_to_symtab, which does this same upward walk.
-
-Tested on x86-64 Fedora 32.
-
-I propose checking in this patch on the gdb-10 branch, and just the
-new test case on trunk.
-
-gdb/ChangeLog
-2021-04-23  Tom Tromey  <tromey@adacore.com>
-
-	PR gdb/27743:
-	* psymtab.c (partial_map_expand_apply): Expand outermost psymtab.
-
-gdb/testsuite/ChangeLog
-2021-04-23  Tom Tromey  <tromey@adacore.com>
-
-	PR gdb/27743:
-	* gdb.dwarf2/imported-unit-bp.exp: New file.
-	* gdb.dwarf2/imported-unit-bp-main.c: New file.
-	* gdb.dwarf2/imported-unit-bp-alt.c: New file.
-
-diff --git a/gdb/psymtab.c b/gdb/psymtab.c
---- a/gdb/psymtab.c
-+++ b/gdb/psymtab.c
-@@ -127,9 +127,10 @@ partial_map_expand_apply (struct objfile *objfile,
- {
-   struct compunit_symtab *last_made = objfile->compunit_symtabs;
- 
--  /* Shared psymtabs should never be seen here.  Instead they should
--     be handled properly by the caller.  */
--  gdb_assert (pst->user == NULL);
-+  /* We may see a shared psymtab here, but we want to expand the
-+     outermost symtab.  */
-+  while (pst->user != nullptr)
-+    pst = pst->user;
- 
-   /* Don't visit already-expanded psymtabs.  */
-   if (pst->readin_p (objfile))
-diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-bp-alt.c b/gdb/testsuite/gdb.dwarf2/imported-unit-bp-alt.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/imported-unit-bp-alt.c
-@@ -0,0 +1,50 @@
-+/* Copyright 2020-2021 Free Software Foundation, Inc.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+/* Used to insert labels with which we can build a fake line table.  */
-+#define LL(N) asm ("line_label_" #N ": .globl line_label_" #N)
-+
-+volatile int var;
-+volatile int bar;
-+
-+/* Generate some code to take up some space.  */
-+#define FILLER do { \
-+    var = 99;	    \
-+} while (0)
-+
-+int
-+func (void)
-+{					/* func prologue */
-+  asm ("func_label: .globl func_label");
-+  LL (1);	// F1, Ln 16
-+  FILLER;
-+  LL (2);	// F1, Ln 17
-+  FILLER;
-+  LL (3);	// F2, Ln 21
-+  FILLER;
-+  LL (4);	// F2, Ln 22 // F1, Ln 18, !S
-+  FILLER;
-+  LL (5);	// F1, Ln 19 !S
-+  FILLER;
-+  LL (6);	// F1, Ln 20
-+  FILLER;
-+  LL (7);
-+  FILLER;
-+  return 0;				/* func end */
-+}
-+
-+#ifdef WITHMAIN
-+int main () { return 0; }
-+#endif
-diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-bp-main.c b/gdb/testsuite/gdb.dwarf2/imported-unit-bp-main.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/imported-unit-bp-main.c
-@@ -0,0 +1,24 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2004-2021 Free Software Foundation, Inc.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+extern int func (void);
-+
-+int
-+main()
-+{
-+  return func ();
-+}
-diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp b/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp
-@@ -0,0 +1,128 @@
-+# Copyright 2020-2021 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+# Test that "break /absolute/file:line" works ok with imported CUs.
-+
-+load_lib dwarf.exp
-+
-+# This test can only be run on targets which support DWARF-2 and use gas.
-+if {![dwarf2_support]} {
-+    return 0
-+}
-+
-+# The .c files use __attribute__.
-+if [get_compiler_info] {
-+    return -1
-+}
-+if !$gcc_compiled {
-+    return 0
-+}
-+
-+standard_testfile imported-unit-bp-alt.c .S imported-unit-bp-main.c
-+
-+set build_options {nodebug optimize=-O1}
-+
-+set asm_file [standard_output_file $srcfile2]
-+Dwarf::assemble $asm_file {
-+    global srcdir subdir srcfile srcfile
-+    global build_options
-+    declare_labels lines_label callee_subprog_label cu_label
-+
-+    get_func_info func "$build_options additional_flags=-DWITHMAIN"
-+
-+    cu {} {
-+	compile_unit {
-+	    {language @DW_LANG_C}
-+	    {name "<artificial>"}
-+	} {
-+	    imported_unit {
-+		{import %$cu_label}
-+	    }
-+	}
-+    }
-+
-+    cu {} {
-+	cu_label: compile_unit {
-+	    {producer "gcc"}
-+	    {language @DW_LANG_C}
-+	    {name ${srcfile}}
-+	    {comp_dir "/tmp"}
-+	    {low_pc 0 addr}
-+	    {stmt_list ${lines_label} DW_FORM_sec_offset}
-+	} {
-+	    callee_subprog_label: subprogram {
-+		{external 1 flag}
-+		{name callee}
-+		{inline 3 data1}
-+	    }
-+	    subprogram {
-+		{external 1 flag}
-+		{name func}
-+		{low_pc $func_start addr}
-+		{high_pc "$func_start + $func_len" addr}
-+	    } {
-+	    }
-+	}
-+    }
-+
-+    lines {version 2 default_is_stmt 1} lines_label {
-+	include_dir "/tmp"
-+	file_name "$srcfile" 1
-+
-+	program {
-+	    {DW_LNE_set_address line_label_1}
-+	    {DW_LNS_advance_line 15}
-+	    {DW_LNS_copy}
-+
-+	    {DW_LNE_set_address line_label_2}
-+	    {DW_LNS_advance_line 1}
-+	    {DW_LNS_copy}
-+
-+	    {DW_LNE_set_address line_label_3}
-+	    {DW_LNS_advance_line 4}
-+	    {DW_LNS_copy}
-+
-+	    {DW_LNE_set_address line_label_4}
-+	    {DW_LNS_advance_line 1}
-+	    {DW_LNS_copy}
-+
-+	    {DW_LNS_advance_line -4}
-+	    {DW_LNS_negate_stmt}
-+	    {DW_LNS_copy}
-+
-+	    {DW_LNE_set_address line_label_5}
-+	    {DW_LNS_advance_line 1}
-+	    {DW_LNS_copy}
-+
-+	    {DW_LNE_set_address line_label_6}
-+	    {DW_LNS_advance_line 1}
-+	    {DW_LNS_negate_stmt}
-+	    {DW_LNS_copy}
-+
-+	    {DW_LNE_set_address line_label_7}
-+	    {DW_LNE_end_sequence}
-+	}
-+    }
-+}
-+
-+if { [prepare_for_testing "failed to prepare" ${testfile} \
-+	  [list $srcfile $asm_file $srcfile3] $build_options] } {
-+    return -1
-+}
-+
-+gdb_reinitialize_dir /tmp
-+
-+# Using an absolute path is important to see the bug.
-+gdb_test "break /tmp/${srcfile}:19" "Breakpoint .* file $srcfile, line .*"

SOURCES/gdb-glibc-strstr-workaround.patch

@@ -4,13 +4,43 @@ Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-glibc-strstr-workaround.patch
 
 ;; Workaround PR libc/14166 for inferior calls of strstr.
-;;=fedoratest: Compatibility with RHELs (unchecked which ones).
+;;=fedora: Compatibility with RHELs (unchecked which ones).
 
+diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
+--- a/gdb/dwarf2read.c
++++ b/gdb/dwarf2read.c
+@@ -21286,6 +21286,26 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
+       /* Cache this symbol's name and the name's demangled form (if any).  */
+       SYMBOL_SET_LANGUAGE (sym, cu->language, &objfile->objfile_obstack);
+       linkagename = dwarf2_physname (name, die, cu);
++
++      /* Workaround for:
++       * invalid IFUNC DW_AT_linkage_name: memmove strstr time
++       * http://sourceware.org/bugzilla/show_bug.cgi?id=14166  */
++      if (strcmp (linkagename, "strstr") == 0
++	  && strstr (objfile_name (objfile), "/libc") != NULL)
++	{
++	  struct objfile *objfile_msym;
++	  struct bound_minimal_symbol bmsym;
++
++	  if (objfile->separate_debug_objfile_backlink)
++	    objfile_msym = objfile->separate_debug_objfile_backlink;
++	  else
++	    objfile_msym = objfile;
++	  bmsym = lookup_minimal_symbol ("strstr", NULL, objfile_msym);
++	  if (bmsym.minsym != NULL
++	      && MSYMBOL_TYPE (bmsym.minsym) == mst_text_gnu_ifunc)
++	    linkagename = "__strstr";
++	}
++
+       SYMBOL_SET_NAMES (sym, linkagename, strlen (linkagename), 0, objfile);
+ 
+       /* Fortran does not have mangling standard and the mangling does differ
 diff --git a/gdb/testsuite/gdb.base/gnu-ifunc-strstr-workaround.exp b/gdb/testsuite/gdb.base/gnu-ifunc-strstr-workaround.exp
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gnu-ifunc-strstr-workaround.exp
-@@ -0,0 +1,119 @@
+@@ -0,0 +1,108 @@
 +# Copyright (C) 2012 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -56,10 +86,6 @@ new file mode 100644
 +	untested "$test (no DWARF)"
 +	return 0
 +    }
-+    -re "type = <unknown return type> \\(\\)\r\n$gdb_prompt $" {
-+	untested "$test (no DWARF)"
-+	return 0
-+    }
 +}
 +
 +set addr ""
@@ -77,10 +103,6 @@ new file mode 100644
 +	set addr $expect_out(1,string)
 +	pass "$test (fixed glibc)"
 +    }
-+    -re " = {<text gnu-indirect-function variable, no debug info>} (0x\[0-9a-f\]+) <__libc_strstr_ifunc>\r\n$gdb_prompt $" {
-+	set addr $expect_out(1,string)
-+	pass "$test (fixed glibc)"
-+    }
 +    -re " = {char \\*\\(const char \\*, const char \\*\\)} 0x\[0-9a-f\]+ <strstr>\r\n$gdb_prompt $" {
 +	untested "$test (gnu-ifunc not in use by glibc)"
 +	return 0
@@ -120,13 +142,10 @@ new file mode 100644
 +    -re " = {<text gnu-indirect-function variable, no debug info>} $addr <__libc_strstr>\r\n$gdb_prompt $" {
 +	pass "$test (fixed glibc)"
 +    }
-+    -re " = {<text gnu-indirect-function variable, no debug info>} $addr <__libc_strstr_ifunc>\r\n$gdb_prompt $" {
-+	pass "$test (fixed glibc)"
-+    }
 +    -re " = {void \\*\\(void\\)} 0x\[0-9a-f\]+ <strstr>\r\n$gdb_prompt $" {
 +	fail $test
 +    }
 +}
 +
-+gdb_test {print (char *)strstr("abc","b")} { = 0x[0-9a-f]+ "bc"}
-+gdb_test {print (char *)strstr("def","e")} { = 0x[0-9a-f]+ "ef"}
++gdb_test {print strstr("abc","b")} { = 0x[0-9a-f]+ "bc"}
++gdb_test {print strstr("def","e")} { = 0x[0-9a-f]+ "ef"}

SOURCES/gdb-gnat-dwarf-crash-3of3.patch

@@ -0,0 +1,236 @@
+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-gnat-dwarf-crash-3of3.patch
+
+;; Fix crash of -readnow /usr/lib/debug/usr/bin/gnatbind.debug (BZ 1069211).
+;;=push+jan
+
+http://sourceware.org/ml/gdb-patches/2014-02/msg00731.html
+
+--6TrnltStXW4iwmi0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+
+Hi,
+
+PR 16581:
+	GDB crash on inherit_abstract_dies infinite recursion
+	https://sourceware.org/bugzilla/show_bug.cgi?id=16581
+
+fixed crash from an infinite recursion.  But in rare cases the new code can
+now gdb_assert() due to weird DWARF file.
+
+I do not yet fully understand why the DWARF is as it is but just GDB should
+never crash due to invalid DWARF anyway.  The "invalid" DWARF I see only in
+Fedora GCC build, not in FSF GCC build, more info at:
+	https://bugzilla.redhat.com/show_bug.cgi?id=1069382
+	http://people.redhat.com/jkratoch/gcc-debuginfo-4.8.2-7.fc20.x86_64-gnatbind.debug
+
+Thanks,
+Jan
+
+--6TrnltStXW4iwmi0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline; filename="complaint.patch"
+
+gdb/
+2014-02-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* dwarf2read.c (process_die): Change gdb_assert to complaint.
+
+diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
+--- a/gdb/dwarf2read.c
++++ b/gdb/dwarf2read.c
+@@ -10499,6 +10499,13 @@ private:
+ static void
+ process_die (struct die_info *die, struct dwarf2_cu *cu)
+ {
++  if (die->in_process)
++    {
++      complaint (_("DIE at 0x%s attempted to be processed twice"),
++		 sect_offset_str (die->sect_off));
++      return;
++    }
++
+   process_die_scope scope (die, cu);
+ 
+   switch (die->tag)
+diff --git a/gdb/infrun.c b/gdb/infrun.c
+--- a/gdb/infrun.c
++++ b/gdb/infrun.c
+@@ -607,6 +607,13 @@ holding the child stopped.  Try \"set detach-on-fork\" or \
+ 				target_pid_to_str (process_ptid));
+ 	    }
+ 
++#ifdef NEED_DETACH_SIGSTOP
++	  /* We should check PID_WAS_STOPPED and detach it stopped accordingly.
++	     In this point of code it cannot be 1 as we would not get FORK
++	     executed without CONTINUE first which resets PID_WAS_STOPPED.
++	     We would have to first TARGET_STOP and WAITPID it as with running
++	     inferior PTRACE_DETACH, SIGSTOP will ignore the signal.  */
++#endif
+ 	  target_detach (parent_inf, 0);
+ 	}
+ 
+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;
+ /* Does the current host support PTRACE_GETREGSET?  */
+ enum tribool have_ptrace_getregset = TRIBOOL_UNKNOWN;
+ 
++#ifdef NEED_DETACH_SIGSTOP
++/* PID of the inferior stopped by SIGSTOP before attaching (or zero).  */
++static pid_t pid_was_stopped;
++
++#endif
++
+ /* The saved to_close method, inherited from inf-ptrace.c.
+    Called by our to_close.  */
+ static void (*super_close) (struct target_ops *);
+@@ -1027,6 +1033,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");
++#ifdef NEED_DETACH_SIGSTOP
++      pid_was_stopped = ptid.pid ();
++#endif
+ 
+       /* 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)
+       return gdb_signal_to_host (signo);
+     }
+ 
++#ifdef NEED_DETACH_SIGSTOP
++  /* Workaround RHEL-5 kernel which has unreliable PTRACE_DETACH, SIGSTOP (that
++     many TIDs are left unstopped).  See RH Bug 496732.  */
++  if (lp->ptid.pid () == pid_was_stopped)
++    {
++      int err;
++
++      errno = 0;
++      err = kill_lwp (lp->ptid.lwp (), SIGSTOP);
++      if (debug_linux_nat)
++	{
++	  fprintf_unfiltered (gdb_stdlog,
++			      "SC:  lwp kill %d %s\n",
++			      err,
++			      errno ? safe_strerror (errno) : "ERRNO-OK");
++	}
++    }
++
++#endif
+   return 0;
+ }
+ 
+@@ -1507,6 +1535,10 @@ linux_nat_target::detach (inferior *inf, int from_tty)
+       detach_one_lwp (main_lwp, &signo);
+ 
+       detach_success (inf);
++
++#ifdef NEED_DETACH_SIGSTOP
++      pid_was_stopped = 0;
++#endif
+     }
+ }
+ 
+@@ -1765,6 +1797,16 @@ linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
+       return;
+     }
+ 
++#ifdef NEED_DETACH_SIGSTOP
++  /* At this point, we are going to resume the inferior and if we
++     have attached to a stopped process, we no longer should leave
++     it as stopped if the user detaches.  PTID variable has PID set to LWP
++     while we need to check the real PID here.  */
++
++  if (!step && lp && pid_was_stopped == lp->ptid.pid ())
++    pid_was_stopped = 0;
++
++#endif
+   if (resume_many)
+     iterate_over_lwps (ptid, linux_nat_resume_callback, lp);
+ 
+@@ -3761,6 +3803,10 @@ linux_nat_target::mourn_inferior ()
+ 
+   /* Let the arch-specific native code know this process is gone.  */
+   linux_target->low_forget_process (pid);
++#ifdef NEED_DETACH_SIGSTOP
++
++  pid_was_stopped = 0;
++#endif
+ }
+ 
+ /* Convert a native/host siginfo object, into/from the siginfo in the
+diff --git a/gdb/testsuite/gdb.threads/attach-stopped.exp b/gdb/testsuite/gdb.threads/attach-stopped.exp
+--- a/gdb/testsuite/gdb.threads/attach-stopped.exp
++++ b/gdb/testsuite/gdb.threads/attach-stopped.exp
+@@ -56,7 +56,65 @@ proc corefunc { threadtype } {
+     gdb_reinitialize_dir $srcdir/$subdir
+     gdb_load ${binfile}
+ 
+-    # Verify that we can attach to the stopped process.
++    # Verify that we can attach to the process by first giving its
++    # executable name via the file command, and using attach with the
++    # process ID.
++
++    set test "$threadtype: set file, before attach1 to stopped process"
++    gdb_test_multiple "file $binfile" "$test" {
++       -re "Load new symbol table from.*y or n. $" {
++	    gdb_test "y" "Reading symbols from $escapedbinfile\.\.\.*done." \
++		    "$test (re-read)"
++	}
++	-re "Reading symbols from $escapedbinfile\.\.\.*done.*$gdb_prompt $" {
++	    pass "$test"
++	}
++    }
++
++    set test "$threadtype: attach1 to stopped, after setting file"
++    gdb_test_multiple "attach $testpid" "$test" {
++	-re "Attaching to program.*`?$escapedbinfile'?, process $testpid.*$gdb_prompt $" {
++	    pass "$test"
++	}
++    }
++
++    # ".*sleep.*clone.*" would fail on s390x as bt stops at START_THREAD there.
++    if {[string equal $threadtype threaded]} {
++	gdb_test "thread apply all bt" ".*sleep.*start_thread.*" "$threadtype: attach1 to stopped bt"
++    } else {
++	gdb_test "bt" ".*sleep.*main.*" "$threadtype: attach1 to stopped bt"
++    }
++
++    # Exit and detach the process.
++       
++    gdb_exit
++
++    # Avoid some race:
++    sleep 2
++
++    if [catch {open /proc/${testpid}/status r} fileid] {
++	set line2 "NOTFOUND"
++    } else {
++	gets $fileid line1;
++	gets $fileid line2;
++	close $fileid;
++    }
++
++    set test "$threadtype: attach1, exit leaves process stopped"
++    if {[string match "*(stopped)*" $line2]} {
++      pass $test
++    } else {
++      fail $test
++    }
++
++    # At this point, the process should still be stopped
++
++    gdb_start
++    gdb_reinitialize_dir $srcdir/$subdir
++    gdb_load ${binfile}
++
++    # Verify that we can attach to the process just by giving the
++    # process ID.
+        
+     set test "$threadtype: attach2 to stopped, after setting file"
+     gdb_test_multiple "attach $testpid" "$test" {

SOURCES/gdb-jit-reader-multilib.patch

@@ -0,0 +1,46 @@
+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-jit-reader-multilib.patch
+
+;; Fix jit-reader.h for multi-lib.
+;;=push+jan
+
+diff --git a/gdb/configure b/gdb/configure
+--- a/gdb/configure
++++ b/gdb/configure
+@@ -9680,10 +9680,12 @@ _ACEOF
+ 
+ 
+ 
+-if test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
+-  TARGET_PTR="unsigned long"
+-elif test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
++# Try to keep TARGET_PTR the same across archs so that jit-reader.h file
++# content is the same for multilib distributions.
++if test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
+   TARGET_PTR="unsigned long long"
++elif test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
++  TARGET_PTR="unsigned long"
+ elif test "x${ac_cv_sizeof_unsigned___int128}" = "x16"; then
+   TARGET_PTR="unsigned __int128"
+ else
+diff --git a/gdb/configure.ac b/gdb/configure.ac
+--- a/gdb/configure.ac
++++ b/gdb/configure.ac
+@@ -843,10 +843,12 @@ AC_CHECK_SIZEOF(unsigned long long)
+ AC_CHECK_SIZEOF(unsigned long)
+ AC_CHECK_SIZEOF(unsigned __int128)
+ 
+-if test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
+-  TARGET_PTR="unsigned long"
+-elif test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
++# Try to keep TARGET_PTR the same across archs so that jit-reader.h file
++# content is the same for multilib distributions.
++if test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
+   TARGET_PTR="unsigned long long"
++elif test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
++  TARGET_PTR="unsigned long"
+ elif test "x${ac_cv_sizeof_unsigned___int128}" = "x16"; then
+   TARGET_PTR="unsigned __int128"
+ else

SOURCES/gdb-libexec-add-index.patch

@@ -4,33 +4,19 @@ Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-libexec-add-index.patch
 
 ;; Fix gdb-headless /usr/bin/ executables (BZ 1390251).
-;;
-;; Also, make /usr/bin/gdb.minimal be the default GDB used, if it's
-;; present.  For rationale, see:
-;;
-;;   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 ;;=fedora
 
 diff --git a/gdb/contrib/gdb-add-index.sh b/gdb/contrib/gdb-add-index.sh
 --- a/gdb/contrib/gdb-add-index.sh
 +++ b/gdb/contrib/gdb-add-index.sh
-@@ -22,6 +22,20 @@ GDB=${GDB:=gdb}
+@@ -21,6 +21,11 @@
+ GDB=${GDB:=gdb}
  OBJCOPY=${OBJCOPY:=objcopy}
- READELF=${READELF:=readelf}
  
 +GDB2=/usr/libexec/gdb
 +if test -x $GDB2 && ! which $GDB &>/dev/null; then
 +    GDB=$GDB2
 +fi
-+
-+# We default to using /usr/bin/gdb.minimal if it's present.  See
-+# https://bugzilla.redhat.com/show_bug.cgi?id=1695015 and
-+# https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot for
-+# explanations.
-+GDB3=/usr/bin/gdb.minimal
-+if test -x $GDB3; then
-+    GDB=$GDB3
-+fi
 +
  myname="${0##*/}"
  

SOURCES/gdb-lineno-makeup-test.patch

@@ -64,10 +64,10 @@ new file mode 100644
 +
 +/* DW_AT_low_pc-DW_AT_high_pc should cover the function without line number
 +   information (.debug_line) so we cannot use an external object file.
-+
++   
 +   It must not be just a label as it would alias on the next function even for
 +   correct GDB.  Therefore some stub data must be placed there.
-+
++   
 +   We need to provide a real stub function body as at least s390
 +   (s390_analyze_prologue) would skip the whole body till reaching `main'.  */
 +

SOURCES/gdb-linux_perf-bundle.patch

@@ -6,6 +6,30 @@ Subject: gdb-linux_perf-bundle.patch
 ;; [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 ;;=fedora
 
+diff --git a/gdb/configure b/gdb/configure
+--- a/gdb/configure
++++ b/gdb/configure
+@@ -12059,7 +12059,7 @@ else
+ 
+ #include <linux/perf_event.h>
+ #ifndef PERF_ATTR_SIZE_VER5
+-# error
++// error // PERF_ATTR_SIZE_VER5_BUNDLE is not available here - Fedora+RHEL
+ #endif
+ 
+ _ACEOF
+diff --git a/gdb/configure.ac b/gdb/configure.ac
+--- a/gdb/configure.ac
++++ b/gdb/configure.ac
+@@ -1477,7 +1477,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])
+   if test "$perf_event" != yes; then
 diff --git a/gdb/gdb.c b/gdb/gdb.c
 --- a/gdb/gdb.c
 +++ b/gdb/gdb.c
@@ -32,7 +56,7 @@ diff --git a/gdb/gdb.c b/gdb/gdb.c
 diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h
 --- a/gdb/nat/linux-btrace.h
 +++ b/gdb/nat/linux-btrace.h
-@@ -27,6 +27,177 @@
+@@ -28,6 +28,177 @@
  #  include <linux/perf_event.h>
  #endif
  
@@ -210,15 +234,3 @@ diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h
  struct target_ops;
  
  #if HAVE_LINUX_PERF_EVENT_H
-diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4
---- a/gdbsupport/common.m4
-+++ b/gdbsupport/common.m4
-@@ -145,7 +145,7 @@ AC_DEFUN([GDB_AC_COMMON], [
-     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])
-     if test "$perf_event" != yes; then

SOURCES/gdb-moribund-utrace-workaround.patch

@@ -0,0 +1,25 @@
+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-moribund-utrace-workaround.patch
+
+;; Workaround non-stop moribund locations exploited by kernel utrace (BZ 590623).
+;;=push+jan: Currently it is still not fully safe.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=590623
+http://sources.redhat.com/bugzilla/show_bug.cgi?id=11593
+
+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
+@@ -12016,6 +12016,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);
++	      /* Red Hat Bug 590623.  */
++	      old_loc->events_till_retirement *= 10;
+ 	      old_loc->owner = NULL;
+ 
+ 	      VEC_safe_push (bp_location_p, moribund_locations, old_loc);

SOURCES/gdb-physname-pr11734-test.patch

@@ -12,7 +12,7 @@ diff --git a/gdb/testsuite/gdb.cp/pr11734-1.cc b/gdb/testsuite/gdb.cp/pr11734-1.
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.cp/pr11734-1.cc
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,30 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2010 Free Software Foundation, Inc.
@@ -42,11 +42,12 @@ new file mode 100644
 +  p->foo ();
 +  return 0;
 +}
++
 diff --git a/gdb/testsuite/gdb.cp/pr11734-2.cc b/gdb/testsuite/gdb.cp/pr11734-2.cc
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.cp/pr11734-2.cc
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,27 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2010 Free Software Foundation, Inc.
@@ -73,11 +74,12 @@ new file mode 100644
 +pr11734::foo(void)
 +{
 +}
++
 diff --git a/gdb/testsuite/gdb.cp/pr11734-3.cc b/gdb/testsuite/gdb.cp/pr11734-3.cc
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.cp/pr11734-3.cc
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,27 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2010 Free Software Foundation, Inc.
@@ -104,11 +106,12 @@ new file mode 100644
 +pr11734::foo (int a)
 +{
 +}
++
 diff --git a/gdb/testsuite/gdb.cp/pr11734-4.cc b/gdb/testsuite/gdb.cp/pr11734-4.cc
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.cp/pr11734-4.cc
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,27 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2010 Free Software Foundation, Inc.
@@ -135,6 +138,7 @@ new file mode 100644
 +pr11734::foo (char *a)
 +{
 +}
++
 diff --git a/gdb/testsuite/gdb.cp/pr11734.exp b/gdb/testsuite/gdb.cp/pr11734.exp
 new file mode 100644
 --- /dev/null
@@ -199,7 +203,7 @@ diff --git a/gdb/testsuite/gdb.cp/pr11734.h b/gdb/testsuite/gdb.cp/pr11734.h
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.cp/pr11734.h
-@@ -0,0 +1,27 @@
+@@ -0,0 +1,28 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2010 Free Software Foundation, Inc.
@@ -227,3 +231,4 @@ new file mode 100644
 +  void foo (int);
 +  void foo (char *);
 +};
++

SOURCES/gdb-ppc-power7-test.patch

@@ -25,7 +25,7 @@ new file mode 100644
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
 +# Test PowerPC Power7 instructions disassembly.
 +
@@ -48,7 +48,7 @@ new file mode 100644
 +gdb_start
 +gdb_reinitialize_dir $srcdir/$subdir
 +gdb_load ${objfile}
-+
++ 
 +
 +# Disassemble the function.
 +

SOURCES/gdb-python-gil.patch

@@ -0,0 +1,241 @@
+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-python-gil.patch
+
+;; Fix Python GIL with gdb.execute("continue") (Phil Muldoon, BZ 1116957).
+;;=push
+
+diff --git a/gdb/doc/python.texi b/gdb/doc/python.texi
+--- a/gdb/doc/python.texi
++++ b/gdb/doc/python.texi
+@@ -232,6 +232,14 @@ returned as a string.  The default is @code{False}, in which case the
+ return value is @code{None}.  If @var{to_string} is @code{True}, the
+ @value{GDBN} virtual terminal will be temporarily set to unlimited width
+ and height, and its pagination will be disabled; @pxref{Screen Size}.
++
++The @var{release_gil} flag specifies whether @value{GDBN} ought to
++release the Python GIL before executing the command.  This is useful
++in multi-threaded Python programs where by default the Python
++interpreter will acquire the GIL and lock other threads from
++executing.  After the command has completed executing in @value{GDBN}
++the Python GIL is reacquired. This flag must be a boolean value.  If
++omitted, it defaults to @code{False}.
+ @end defun
+ 
+ @findex gdb.breakpoints
+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
+@@ -148,6 +148,8 @@ typedef int Py_ssize_t;
+ #define PyGILState_Release(ARG) ((void)(ARG))
+ #define PyEval_InitThreads()
+ #define PyThreadState_Swap(ARG) ((void)(ARG))
++#define PyEval_SaveThread() ((void)(ARG))
++#define PyEval_RestoreThread(ARG) ((void)(ARG))
+ #define PyEval_ReleaseLock()
+ #endif
+ 
+diff --git a/gdb/python/python.c b/gdb/python/python.c
+--- a/gdb/python/python.c
++++ b/gdb/python/python.c
+@@ -556,12 +556,16 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
+ {
+   const char *arg;
+   PyObject *from_tty_obj = NULL, *to_string_obj = NULL;
+-  int from_tty, to_string;
+-  static const char *keywords[] = { "command", "from_tty", "to_string", NULL };
++  int from_tty, to_string, release_gil;
++  static const char *keywords[] = {"command", "from_tty", "to_string", "release_gil", NULL };
++  PyObject *release_gil_obj = NULL;
++  /* Initialize it just to avoid a GCC false warning.  */
++  PyThreadState *state = NULL;
+ 
+-  if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, "s|O!O!", keywords, &arg,
++  if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, "s|O!O!O!", keywords, &arg,
+ 					&PyBool_Type, &from_tty_obj,
+-					&PyBool_Type, &to_string_obj))
++					&PyBool_Type, &to_string_obj,
++					&PyBool_Type, &release_gil_obj))
+     return NULL;
+ 
+   from_tty = 0;
+@@ -582,6 +586,15 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
+       to_string = cmp;
+     }
+ 
++  release_gil = 0;
++  if (release_gil_obj)
++    {
++      int cmp = PyObject_IsTrue (release_gil_obj);
++      if (cmp < 0)
++	return NULL;
++      release_gil = cmp;
++    }
++
+   std::string to_string_res;
+ 
+   TRY
+@@ -602,6 +615,13 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
+ 
+       counted_command_line lines = read_command_lines_1 (reader, 1, nullptr);
+ 
++      /* In the case of long running GDB commands, allow the user to
++	 release the Python GIL acquired by Python.  Restore the GIL
++	 after the command has completed before handing back to
++	 Python.  */
++      if (release_gil)
++	state = PyEval_SaveThread();
++
+       scoped_restore save_async = make_scoped_restore (&current_ui->async, 0);
+ 
+       scoped_restore save_uiout = make_scoped_restore (&current_uiout);
+@@ -617,10 +637,22 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
+ 							    from_tty);
+       else
+ 	execute_control_commands (lines.get (), from_tty);
++
++      /* Reacquire the GIL if it was released earlier.  */
++      if (release_gil)
++	PyEval_RestoreThread (state);
+     }
+   CATCH (except, RETURN_MASK_ALL)
+     {
+-      GDB_PY_HANDLE_EXCEPTION (except);
++      if (except.reason < 0)
++	{
++	  /* Reacquire the GIL if it was released earlier.  */
++	  if (release_gil)
++	    PyEval_RestoreThread (state);
++
++	  gdbpy_convert_exception (except);
++	  return NULL;
++	}
+     }
+   END_CATCH
+ 
+diff --git a/gdb/testsuite/gdb.python/py-gil-mthread.c b/gdb/testsuite/gdb.python/py-gil-mthread.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.python/py-gil-mthread.c
+@@ -0,0 +1,13 @@
++#include <stdio.h>
++#include <unistd.h>
++
++int
++main (void)
++{
++  int i;
++  for (i = 0; i < 10; i++)
++    {
++      sleep (1); /* break-here */
++      printf ("Sleeping %d\n", i);
++    }
++}
+diff --git a/gdb/testsuite/gdb.python/py-gil-mthread.exp b/gdb/testsuite/gdb.python/py-gil-mthread.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.python/py-gil-mthread.exp
+@@ -0,0 +1,69 @@
++# Copyright (C) 2014 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++standard_testfile .c .py
++set executable $testfile
++
++if { [prepare_for_testing $testfile.exp $executable $srcfile] } {
++    return -1
++}
++
++# Skip all tests if Python scripting is not enabled.
++if { [skip_python_tests] } { continue }
++
++if ![runto_main] {
++    return -1
++}
++
++gdb_breakpoint $srcfile:[gdb_get_line_number "break-here"] temporary
++gdb_continue_to_breakpoint "break-here" ".* break-here .*"
++
++set test "response"
++set timeout 60
++set sleeping_last -1
++set hello_last 0
++set minimal 5
++gdb_test_multiple "python exec (open ('$srcdir/$subdir/$srcfile2').read ())" $test {
++    -re "Error: unable to start thread\r\n" {
++	fail $test
++	# Not $gdb_prompt-synced!
++    }
++    -re "Sleeping (\[0-9\]+)\r\n" {
++	set n $expect_out(1,string)
++	if { $sleeping_last + 1 != $n } {
++	    fail $test
++	} else {
++	    set sleeping_last $n
++	    if { $sleeping_last >= $minimal && $hello_last >= $minimal } {
++		pass $test
++	    } else {
++		exp_continue
++	    }
++	}
++    }
++    -re "Hello \\( (\[0-9\]+) \\)\r\n" {
++	set n $expect_out(1,string)
++	if { $hello_last + 1 != $n } {
++	    fail $test
++	} else {
++	    set hello_last $n
++	    if { $sleeping_last >= $minimal && $hello_last >= $minimal } {
++		pass $test
++	    } else {
++		exp_continue
++	    }
++	}
++    }
++}
+diff --git a/gdb/testsuite/gdb.python/py-gil-mthread.py b/gdb/testsuite/gdb.python/py-gil-mthread.py
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.python/py-gil-mthread.py
+@@ -0,0 +1,28 @@
++try:
++   import thread
++except:
++   import _thread
++import time
++import gdb
++
++# Define a function for the thread
++def print_thread_hello():
++   count = 0
++   while count < 10:
++      time.sleep(1)
++      count += 1
++      print ("Hello ( %d )" % count)
++
++# Create a threads a continue
++try:
++   thread.start_new_thread (print_thread_hello, ())
++   gdb.execute ("continue", release_gil=True)
++except:
++   try:
++      _thread.start_new_thread (print_thread_hello, ())
++      gdb.execute ("continue", release_gil=True)
++   except:
++      print ("Error: unable to start thread")
++
++while 1:
++   pass

SOURCES/gdb-readline62-ask-more-rh.patch

@@ -0,0 +1,25 @@
+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-readline62-ask-more-rh.patch
+
+;; Work around readline-6.2 incompatibility not asking for --more-- (BZ 701131).
+;;=fedora
+
+diff --git a/gdb/event-top.c b/gdb/event-top.c
+--- a/gdb/event-top.c
++++ b/gdb/event-top.c
+@@ -1183,6 +1183,13 @@ gdb_setup_readline (int editing)
+ {
+   struct ui *ui = current_ui;
+ 
++#ifdef NEED_RL_STATE_FEDORA_GDB
++  /* 6.2 regression: no longed asks for --more--
++     gdb.base/readline-ask.exp
++     https://bugzilla.redhat.com/show_bug.cgi?id=701131  */
++  RL_SETSTATE (RL_STATE_FEDORA_GDB);
++#endif
++
+   /* This function is a noop for the sync case.  The assumption is
+      that the sync setup is ALL done in gdb_init, and we would only
+      mess it up here.  The sync stuff should really go away over

SOURCES/gdb-rhbz-2130624-assert_in_jit_event_handler.patch

@@ -1,115 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Tom de Vries <tdevries@suse.de>
-Date: Fri, 21 May 2021 15:09:14 +0200
-Subject: gdb-rhbz-2130624-assert_in_jit_event_handler.patch
-
-;; Backport "[gdb/breakpoint] Fix assert in jit_event_handler"
-;; (Tom de Vries, RHBZ2130624)
-
-Consider a minimal test-case test.c:
-...
-int main (void) { return 0; }
-...
-which we can compile into llvm byte code using clang:
-...
-$ clang -g -S -emit-llvm --target=x86_64-unknown-unknown-elf test.c
-...
-and then run using lli, which uses the llvm jit:
-...
-$ lli test.ll
-...
-
-If we run this under gdb, we run into an assert:
-...
-$ gdb -q -batch -ex run --args /usr/bin/lli test.ll
-Dwarf Error: Cannot not find DIE at 0x18a936e7 \
-  [from module libLLVM.so.10-10.0.1-lp152.30.4.x86_64.debug]
-
-[Thread debugging using libthread_db enabled]
-Using host libthread_db library "/lib64/libthread_db.so.1".
-src/gdb/jit.c:1178: internal-error: \
-  void jit_event_handler(gdbarch*, objfile*): \
-  Assertion `jiter->jiter_data != nullptr' failed.
-...
-
-This is caused by the following.
-
-When running jit_breakpoint_re_set_internal, we first handle
-libLLVM.so.10.debug, and set a jit breakpoint.
-
-Next we handle libLLVM.so.10:
-...
-(gdb) p the_objfile.original_name
-$42 = 0x2494170 "libLLVM.so.10"
-...
-but the minimal symbols we find are from libLLVM.so.10.debug:
-...
-(gdb) p reg_symbol.objfile.original_name
-$43 = 0x38e7c50 "libLLVM.so.10-10.0.1-lp152.30.4.x86_64.debug"
-(gdb) p desc_symbol.objfile.original_name
-$44 = 0x38e7c50 "libLLVM.so.10-10.0.1-lp152.30.4.x86_64.debug"
-...
-and consequently, the objf_data is the one from libLLVM.so.10.debug:
-...
-      jiter_objfile_data *objf_data
-        = get_jiter_objfile_data (reg_symbol.objfile);
-...
-and so we hit this:
-...
-      if (objf_data->cached_code_address == addr)
-        continue;
-...
-and no second jit breakpoint is inserted.
-
-Subsequently, the jit breakpoint is triggered and handled, but when finding
-the symbol for the breakpoint address we get:
-...
-(gdb) p jit_bp_sym.objfile.original_name
-$52 = 0x2494170 "libLLVM.so.10"
-...
-
-The assert 'jiter->jiter_data != nullptr' triggers because it checks
-libLLVM.so.10 while the one with jiter_data setup is libLLVM.so.10.debug.
-
-This fixes the assert:
-...
-       jiter_objfile_data *objf_data
--        = get_jiter_objfile_data (reg_symbol.objfile);
--        = get_jiter_objfile_data (the_objfile);
-...
-but consequently we'll have two jit breakpoints, so we also make sure we don't
-set a jit breakpoint on separate debug objects like libLLVM.so.10.debug.
-
-Tested on x86_64-linux.
-
-gdb/ChangeLog:
-
-2021-05-21  Tom de Vries  <tdevries@suse.de>
-
-	PR breakpoint/27889
-	* jit.c (jit_breakpoint_re_set_internal): Skip separate debug
-	objects.  Call get_jiter_objfile_data with the_objfile.
-
-diff --git a/gdb/jit.c b/gdb/jit.c
---- a/gdb/jit.c
-+++ b/gdb/jit.c
-@@ -893,6 +893,10 @@ jit_breakpoint_re_set_internal (struct gdbarch *gdbarch, program_space *pspace)
- {
-   for (objfile *the_objfile : pspace->objfiles ())
-     {
-+      /* Skip separate debug objects.  */
-+      if (the_objfile->separate_debug_objfile_backlink != nullptr)
-+	continue;
-+
-       if (the_objfile->skip_jit_symbol_lookup)
- 	continue;
- 
-@@ -919,7 +923,7 @@ jit_breakpoint_re_set_internal (struct gdbarch *gdbarch, program_space *pspace)
- 	}
- 
-       jiter_objfile_data *objf_data
--	= get_jiter_objfile_data (reg_symbol.objfile);
-+	= get_jiter_objfile_data (the_objfile);
-       objf_data->register_code = reg_symbol.minsym;
-       objf_data->descriptor = desc_symbol.minsym;
- 

SOURCES/gdb-rhbz1156192-recursive-dlopen-test.patch

@@ -81,7 +81,7 @@ diff --git a/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen.c b/gdb/tes
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen.c
-@@ -0,0 +1,125 @@
+@@ -0,0 +1,124 @@
 +/* Testcase for recursive dlopen calls.
 +
 +   Copyright (C) 2014 Free Software Foundation, Inc.
@@ -178,7 +178,6 @@ new file mode 100644
 +  /* Called recursively.  */
 +  result = malloc (size);
 +  /* Restore new hooks.  */
-+  old_malloc_hook = __malloc_hook;
 +  __malloc_hook = custom_malloc_hook;
 +  return result;
 +}
@@ -211,7 +210,7 @@ diff --git a/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen.exp b/gdb/t
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen.exp
-@@ -0,0 +1,157 @@
+@@ -0,0 +1,137 @@
 +# Copyright 2014 Free Software Foundation, Inc.
 +#
 +# This program is free software; you can redistribute it and/or modify
@@ -227,12 +226,8 @@ new file mode 100644
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
-+if {[skip_shlib_tests]} {
-+    untested "skipping shlib tests"
-+    return 0
-+} elseif {[use_gdb_stub]} {
-+    untested "skipping tests because of stub"
-+    return 0
++if { [skip_shlib_tests] } {
++  return 0
 +}
 +
 +# Library foo
@@ -267,21 +262,6 @@ new file mode 100644
 +    return -1
 +}
 +
-+set supported 0
-+gdb_test_multiple "run" "initial trial run" {
-+    -re -wrap "exited normally.*" {
-+	set supported 1
-+	pass $gdb_test_name
-+    }
-+    -re -wrap "exited with code.*" {
-+	untested "failed at $gdb_test_name"
-+    }
-+}
-+
-+if { $supported == 0 } {
-+    return -1
-+}
-+
 +proc do_test { has_libfoo has_libbar } {
 +  global hex binfile_lib2 binfile_lib1 gdb_prompt
 +  set libbar_match "[string_to_regexp $binfile_lib2]"
@@ -334,7 +314,6 @@ new file mode 100644
 +    gdb_test_no_output "set stop-on-solib-events 1" "setting stop-on-solib-events"
 +
 +    gdb_run_cmd
-+    gdb_test "" "Wait for first prompt"
 +    foreach l $solib_event_order {
 +      incr pass
 +      with_test_prefix "pass #$pass" {

SOURCES/gdb-rhbz1187581-power8-regs-1of7.patch

@@ -0,0 +1,65 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date: Thu, 9 Aug 2018 17:09:48 +0200
+Subject: gdb-rhbz1187581-power8-regs-1of7.patch
+
+;; Add GDB support to access/display POWER8 registers (IBM, RH BZ 1187581).
+
+commit 05abfc39c719e740530000059bb963ad33462479
+Author: Pedro Franco de Carvalho <pedromfc@linux.ibm.com>
+Date:   Mon Aug 6 16:24:55 2018 -0300
+
+    Fix indentation in remote_target::download_tracepoint
+
+    gdb/ChangeLog:
+    2018-08-06  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
+
+            * remote.c (remote_target::download_tracepoint): Fix indentation
+            in for block.
+
+diff --git a/gdb/remote.c b/gdb/remote.c
+--- a/gdb/remote.c
++++ b/gdb/remote.c
+@@ -12912,24 +12912,24 @@ remote_target::download_tracepoint (struct bp_location *loc)
+ 	error (_("Error on target while setting tracepoints."));
+     }
+ 
+-    for (auto action_it = stepping_actions.begin ();
+-	 action_it != stepping_actions.end (); action_it++)
+-      {
+-	QUIT;	/* Allow user to bail out with ^C.  */
+-
+-	bool is_first = action_it == stepping_actions.begin ();
+-	bool has_more = action_it != stepping_actions.end ();
+-
+-	xsnprintf (buf, BUF_SIZE, "QTDP:-%x:%s:%s%s%s",
+-		   b->number, addrbuf, /* address */
+-		   is_first ? "S" : "",
+-		   action_it->c_str (),
+-		   has_more ? "-" : "");
+-	putpkt (buf);
+-	remote_get_noisy_reply ();
+-	if (strcmp (rs->buf, "OK"))
+-	  error (_("Error on target while setting tracepoints."));
+-      }
++  for (auto action_it = stepping_actions.begin ();
++       action_it != stepping_actions.end (); action_it++)
++    {
++      QUIT;	/* Allow user to bail out with ^C.  */
++
++      bool is_first = action_it == stepping_actions.begin ();
++      bool has_more = action_it != stepping_actions.end ();
++
++      xsnprintf (buf, BUF_SIZE, "QTDP:-%x:%s:%s%s%s",
++		 b->number, addrbuf, /* address */
++		 is_first ? "S" : "",
++		 action_it->c_str (),
++		 has_more ? "-" : "");
++      putpkt (buf);
++      remote_get_noisy_reply ();
++      if (strcmp (rs->buf, "OK"))
++	error (_("Error on target while setting tracepoints."));
++    }
+ 
+   if (packet_support (PACKET_TracepointSource) == PACKET_ENABLE)
+     {

SOURCES/gdb-rhbz1187581-power8-regs-2of7.patch

@@ -0,0 +1,45 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date: Thu, 9 Aug 2018 17:10:46 +0200
+Subject: gdb-rhbz1187581-power8-regs-2of7.patch
+
+;; Add GDB support to access/display POWER8 registers (IBM, RH BZ 1187581).
+
+commit aa6f3694ce867884e43d1c0406c64df08ea24bd3
+Author: Pedro Franco de Carvalho <pedromfc@linux.ibm.com>
+Date:   Mon Aug 6 16:24:55 2018 -0300
+
+    Remove trailing '-' from the last QTDP action packet
+
+    The has_more predicate in remote_target::download_tracepoint always
+    evaluates to true, so the last action packet will be sent with a
+    trailing '-'.  This patch changes the predicate to remove the last
+    trailing '-'.
+
+    gdb/ChangeLog:
+    2018-08-06  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
+
+            * remote.c (remote_target::download_tracepoint): Fix the has_more
+            predicate in the QTDP action list iteration.
+
+diff --git a/gdb/remote.c b/gdb/remote.c
+--- a/gdb/remote.c
++++ b/gdb/remote.c
+@@ -12899,7 +12899,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
+     {
+       QUIT;	/* Allow user to bail out with ^C.  */
+ 
+-      bool has_more = (action_it != tdp_actions.end ()
++      bool has_more = ((action_it + 1) != tdp_actions.end ()
+ 		       || !stepping_actions.empty ());
+ 
+       xsnprintf (buf, BUF_SIZE, "QTDP:-%x:%s:%s%c",
+@@ -12918,7 +12918,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
+       QUIT;	/* Allow user to bail out with ^C.  */
+ 
+       bool is_first = action_it == stepping_actions.begin ();
+-      bool has_more = action_it != stepping_actions.end ();
++      bool has_more = (action_it + 1) != stepping_actions.end ();
+ 
+       xsnprintf (buf, BUF_SIZE, "QTDP:-%x:%s:%s%s%s",
+ 		 b->number, addrbuf, /* address */

SOURCES/gdb-rhbz1187581-power8-regs-3of7.patch

@@ -0,0 +1,258 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date: Thu, 9 Aug 2018 17:11:09 +0200
+Subject: gdb-rhbz1187581-power8-regs-3of7.patch
+
+;; Add GDB support to access/display POWER8 registers (IBM, RH BZ 1187581).
+
+commit 3df3a985a475db004706d64f83d9085f99053611
+Author: Pedro Franco de Carvalho <pedromfc@linux.ibm.com>
+Date:   Mon Aug 6 16:24:55 2018 -0300
+
+    Use get_remote_packet_size in download_tracepoint
+
+    This patch changes the remote target to use the remote packet size to
+    build QTDP packets, and to check if there is enough room for the
+    packet.
+
+    I changed the function to raise an error if the packet is too small,
+    instead of aborting gdb (through xsnprintf).  It isn't clear if gdb
+    will be in a consistent state with respect to the stub after this,
+    since it's possible that some packets will be sent but not others, and
+    there could be an incomplete tracepoint on the stub.
+
+    The char array used to build the packets is changed to a
+    gdb::char_vector and sized with the result from
+    get_remote_packet_size.
+
+    When checking if the buffer is large enough to hold the tracepoint
+    condition agent expression, the length of the expression is multiplied
+    by two, since it is encoded with two hex digits per expression
+    byte.  For simplicity, I assume that the result won't overflow, which
+    can happen for very long condition expressions.
+
+    gdb/ChangeLog:
+    2018-08-06  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
+
+            * remote.c (remote_target::download_tracepoint): Remove BUF_SIZE.
+            Replace array buf with gdb::char_vector buf, of size
+            get_remote_packet_size ().  Replace references to buf and
+            BUF_SIZE to buf.data () and buf.size ().  Replace strcpy, strcat
+            and xsnprintf with snprintf.  Raise errors if the buffer is too
+            small.
+
+diff --git a/gdb/remote.c b/gdb/remote.c
+--- a/gdb/remote.c
++++ b/gdb/remote.c
+@@ -12799,26 +12799,35 @@ remote_target::remote_download_command_source (int num, ULONGEST addr,
+ void
+ remote_target::download_tracepoint (struct bp_location *loc)
+ {
+-#define BUF_SIZE 2048
+-
+   CORE_ADDR tpaddr;
+   char addrbuf[40];
+-  char buf[BUF_SIZE];
+   std::vector<std::string> tdp_actions;
+   std::vector<std::string> stepping_actions;
+   char *pkt;
+   struct breakpoint *b = loc->owner;
+   struct tracepoint *t = (struct tracepoint *) b;
+   struct remote_state *rs = get_remote_state ();
++  int ret;
++  char *err_msg = _("Tracepoint packet too large for target.");
++  size_t size_left;
++
++  /* We use a buffer other than rs->buf because we'll build strings
++     across multiple statements, and other statements in between could
++     modify rs->buf.  */
++  gdb::char_vector buf (get_remote_packet_size ());
+ 
+   encode_actions_rsp (loc, &tdp_actions, &stepping_actions);
+ 
+   tpaddr = loc->address;
+   sprintf_vma (addrbuf, tpaddr);
+-  xsnprintf (buf, BUF_SIZE, "QTDP:%x:%s:%c:%lx:%x", b->number,
+-	     addrbuf, /* address */
+-	     (b->enable_state == bp_enabled ? 'E' : 'D'),
+-	     t->step_count, t->pass_count);
++  ret = snprintf (buf.data (), buf.size (), "QTDP:%x:%s:%c:%lx:%x",
++		  b->number, addrbuf, /* address */
++		  (b->enable_state == bp_enabled ? 'E' : 'D'),
++		  t->step_count, t->pass_count);
++
++  if (ret < 0 || ret >= buf.size ())
++    error (err_msg);
++
+   /* Fast tracepoints are mostly handled by the target, but we can
+      tell the target how big of an instruction block should be moved
+      around.  */
+@@ -12830,8 +12839,15 @@ remote_target::download_tracepoint (struct bp_location *loc)
+ 	{
+ 	  if (gdbarch_fast_tracepoint_valid_at (loc->gdbarch, tpaddr,
+ 						NULL))
+-	    xsnprintf (buf + strlen (buf), BUF_SIZE - strlen (buf), ":F%x",
+-		       gdb_insn_length (loc->gdbarch, tpaddr));
++	    {
++	      size_left = buf.size () - strlen (buf.data ());
++	      ret = snprintf (buf.data () + strlen (buf.data ()),
++			      size_left, ":F%x",
++			      gdb_insn_length (loc->gdbarch, tpaddr));
++
++	      if (ret < 0 || ret >= size_left)
++		error (err_msg);
++	    }
+ 	  else
+ 	    /* If it passed validation at definition but fails now,
+ 	       something is very wrong.  */
+@@ -12855,7 +12871,14 @@ remote_target::download_tracepoint (struct bp_location *loc)
+ 	  struct static_tracepoint_marker marker;
+ 
+ 	  if (target_static_tracepoint_marker_at (tpaddr, &marker))
+-	    strcat (buf, ":S");
++	    {
++	      size_left = buf.size () - strlen (buf.data ());
++	      ret = snprintf (buf.data () + strlen (buf.data ()),
++			      size_left, ":S");
++
++	      if (ret < 0 || ret >= size_left)
++		error (err_msg);
++	    }
+ 	  else
+ 	    error (_("Static tracepoint not valid during download"));
+ 	}
+@@ -12873,10 +12896,26 @@ remote_target::download_tracepoint (struct bp_location *loc)
+ 	 capabilities at definition time.  */
+       if (remote_supports_cond_tracepoints ())
+ 	{
+-	  agent_expr_up aexpr = gen_eval_for_expr (tpaddr, loc->cond.get ());
+-	  xsnprintf (buf + strlen (buf), BUF_SIZE - strlen (buf), ":X%x,",
+-		     aexpr->len);
+-	  pkt = buf + strlen (buf);
++	  agent_expr_up aexpr = gen_eval_for_expr (tpaddr,
++						   loc->cond.get ());
++
++	  size_left = buf.size () - strlen (buf.data ());
++
++	  ret = snprintf (buf.data () + strlen (buf.data ()),
++			  size_left, ":X%x,", aexpr->len);
++
++	  if (ret < 0 || ret >= size_left)
++	    error (err_msg);
++
++	  size_left = buf.size () - strlen (buf.data ());
++
++	  /* Two bytes to encode each aexpr byte, plus the terminating
++	     null byte.  */
++	  if (aexpr->len * 2 + 1 > size_left)
++	    error (err_msg);
++
++	  pkt = buf.data () + strlen (buf.data ());
++
+ 	  for (int ndx = 0; ndx < aexpr->len; ++ndx)
+ 	    pkt = pack_hex_byte (pkt, aexpr->buf[ndx]);
+ 	  *pkt = '\0';
+@@ -12887,8 +12926,17 @@ remote_target::download_tracepoint (struct bp_location *loc)
+     }
+ 
+   if (b->commands || *default_collect)
+-    strcat (buf, "-");
+-  putpkt (buf);
++    {
++      size_left = buf.size () - strlen (buf.data ());
++
++      ret = snprintf (buf.data () + strlen (buf.data ()),
++		      size_left, "-");
++
++      if (ret < 0 || ret >= size_left)
++	error (err_msg);
++    }
++
++  putpkt (buf.data ());
+   remote_get_noisy_reply ();
+   if (strcmp (rs->buf, "OK"))
+     error (_("Target does not support tracepoints."));
+@@ -12902,11 +12950,15 @@ remote_target::download_tracepoint (struct bp_location *loc)
+       bool has_more = ((action_it + 1) != tdp_actions.end ()
+ 		       || !stepping_actions.empty ());
+ 
+-      xsnprintf (buf, BUF_SIZE, "QTDP:-%x:%s:%s%c",
+-		 b->number, addrbuf, /* address */
+-		 action_it->c_str (),
+-		 has_more ? '-' : 0);
+-      putpkt (buf);
++      ret = snprintf (buf.data (), buf.size (), "QTDP:-%x:%s:%s%c",
++		      b->number, addrbuf, /* address */
++		      action_it->c_str (),
++		      has_more ? '-' : 0);
++
++      if (ret < 0 || ret >= buf.size ())
++	error (err_msg);
++
++      putpkt (buf.data ());
+       remote_get_noisy_reply ();
+       if (strcmp (rs->buf, "OK"))
+ 	error (_("Error on target while setting tracepoints."));
+@@ -12920,12 +12972,16 @@ remote_target::download_tracepoint (struct bp_location *loc)
+       bool is_first = action_it == stepping_actions.begin ();
+       bool has_more = (action_it + 1) != stepping_actions.end ();
+ 
+-      xsnprintf (buf, BUF_SIZE, "QTDP:-%x:%s:%s%s%s",
+-		 b->number, addrbuf, /* address */
+-		 is_first ? "S" : "",
+-		 action_it->c_str (),
+-		 has_more ? "-" : "");
+-      putpkt (buf);
++      ret = snprintf (buf.data (), buf.size (), "QTDP:-%x:%s:%s%s%s",
++		      b->number, addrbuf, /* address */
++		      is_first ? "S" : "",
++		      action_it->c_str (),
++		      has_more ? "-" : "");
++
++      if (ret < 0 || ret >= buf.size ())
++	error (err_msg);
++
++      putpkt (buf.data ());
+       remote_get_noisy_reply ();
+       if (strcmp (rs->buf, "OK"))
+ 	error (_("Error on target while setting tracepoints."));
+@@ -12935,22 +12991,32 @@ remote_target::download_tracepoint (struct bp_location *loc)
+     {
+       if (b->location != NULL)
+ 	{
+-	  strcpy (buf, "QTDPsrc:");
++	  ret = snprintf (buf.data (), buf.size (), "QTDPsrc:");
++
++	  if (ret < 0 || ret >= buf.size ())
++	    error (err_msg);
++
+ 	  encode_source_string (b->number, loc->address, "at",
+ 				event_location_to_string (b->location.get ()),
+-				buf + strlen (buf), 2048 - strlen (buf));
+-	  putpkt (buf);
++				buf.data () + strlen (buf.data ()),
++				buf.size () - strlen (buf.data ()));
++	  putpkt (buf.data ());
+ 	  remote_get_noisy_reply ();
+ 	  if (strcmp (rs->buf, "OK"))
+ 	    warning (_("Target does not support source download."));
+ 	}
+       if (b->cond_string)
+ 	{
+-	  strcpy (buf, "QTDPsrc:");
++	  ret = snprintf (buf.data (), buf.size (), "QTDPsrc:");
++
++	  if (ret < 0 || ret >= buf.size ())
++	    error (err_msg);
++
+ 	  encode_source_string (b->number, loc->address,
+-				"cond", b->cond_string, buf + strlen (buf),
+-				2048 - strlen (buf));
+-	  putpkt (buf);
++				"cond", b->cond_string,
++				buf.data () + strlen (buf.data ()),
++				buf.size () - strlen (buf.data ()));
++	  putpkt (buf.data ());
+ 	  remote_get_noisy_reply ();
+ 	  if (strcmp (rs->buf, "OK"))
+ 	    warning (_("Target does not support source download."));

SOURCES/gdb-rhbz1187581-power8-regs-4of7.patch

@@ -0,0 +1,449 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date: Thu, 9 Aug 2018 17:17:16 +0200
+Subject: gdb-rhbz1187581-power8-regs-4of7.patch
+
+;; Add GDB support to access/display POWER8 registers (IBM, RH BZ 1187581).
+
+commit 4277c4b87addb5354cc47b98d7a73e44cfaf22c2
+Author: Pedro Franco de Carvalho <pedromfc@linux.ibm.com>
+Date:   Mon Aug 6 16:24:55 2018 -0300
+
+    Use remote register numbers in tracepoint mask
+
+    Currently, tracepoint register masks in the QTDP packets include both
+    internal and remote register numbers, as well as pseudo-register
+    numbers.
+
+    This patch changes this so that the mask only includes remote register
+    numbers.
+
+    Register numbers from agent expressions are already set in the mask
+    using remote numbers.  Other tracepoint actions used internal numbers,
+    e.g. "collect $regs" or "collect $<pseudoreg>".  To handle pseudoreg
+    numbers, an empty agent expression is created and ax_reg_mask is
+    called for this expression and the pseudoreg.  This will cause the ax
+    to set its mask with the corresponding remote raw register
+    numbers (using ax_regs_mask, which calls
+    gdbarch_ax_pseudo_register_collect).
+
+    If ax_regs_mask and gdbarch_ax_pseudo_register_collect also generate
+    more ax bytecode, the ax is also appended to the collection list.  It
+    isn't clear that this was the original intent for
+    gdbarch_ax_pseudo_register_collect, and none of the arches seem to do
+    this, but if this changes in the future, it should work.
+
+    The patch also refactors the code used by validate_action line to
+    validate axs into a function that is now called from every place that
+    generates axs.  Previously, some parts of tracepoint.c that generated
+    axs didn't check if the ax length was greater than MAX_AGENT_EXPR_LEN.
+
+    gdb/ChangeLog:
+    2018-08-06  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
+
+            * tracepoint.h (class collection_list) <add_register>: Remove.
+            <add_remote_register, add_ax_registers, add_local_register>:
+            Declare.
+            <add_memrange>: Add scope parameter.
+            * tracepoint.c (encode_actions_1): Likewise.
+            (collection_list::add_register): Rename to ...
+            (collection_list::add_remote_register): ... this.  Update
+            comment.
+            (collection_list::add_ax_registers, add_local_register): New
+            methods.
+            (collection_list::add_memrange): Add scope parameter.  Call
+            add_local_register instead of add_register.
+            (finalize_tracepoint_aexpr): New function.
+            (collection_list::collect_symbol): Update calls to add_memrange.
+            Call add_local_register instead of add_register.  Call
+            add_ax_registers.  Call finalize_tracepoint_aexpr.
+            (encode_actions_1): Get remote regnos for $reg action.  Call
+            add_remote_register, add_ax_registers, and add_local_register.
+            Update call to add_memrange.  Call finalize_tracepoint_aexpr.
+            (validate_actionline): Call finalize_tracepoint_aexpr.
+
++2018-08-06  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
++
++	* tracepoint.h (class collection_list) <add_register>: Remove.
++	<add_remote_register, add_ax_registers, add_local_register>:
++	Declare.
++	<add_memrange>: Add scope parameter.
++	* tracepoint.c (encode_actions_1): Likewise.
++	(collection_list::add_register): Rename to ...
++	(collection_list::add_remote_register): ... this.  Update
++	comment.
++	(collection_list::add_ax_registers, add_local_register): New
++	methods.
++	(collection_list::add_memrange): Add scope parameter.  Call
++	add_local_register instead of add_register.
++	(finalize_tracepoint_aexpr): New function.
++	(collection_list::collect_symbol): Update calls to add_memrange.
++	Call add_local_register instead of add_register.  Call
++	add_ax_registers.  Call finalize_tracepoint_aexpr.
++	(encode_actions_1): Get remote regnos for $reg action.  Call
++	add_remote_register, add_ax_registers, and add_local_register.
++	Update call to add_memrange.  Call finalize_tracepoint_aexpr.
++	(validate_actionline): Call finalize_tracepoint_aexpr.
++
+ 2018-08-06  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
+
+ 	* remote.c (remote_target::download_tracepoint): Remove BUF_SIZE.
+
+diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
+--- a/gdb/tracepoint.c
++++ b/gdb/tracepoint.c
+@@ -615,6 +615,19 @@ report_agent_reqs_errors (struct agent_expr *aexpr)
+     error (_("Expression is too complicated."));
+ }
+ 
++/* Call ax_reqs on AEXPR and raise an error if something is wrong.  */
++
++static void
++finalize_tracepoint_aexpr (struct agent_expr *aexpr)
++{
++  ax_reqs (aexpr);
++
++  if (aexpr->len > MAX_AGENT_EXPR_LEN)
++    error (_("Expression is too complicated."));
++
++  report_agent_reqs_errors (aexpr);
++}
++
+ /* worker function */
+ void
+ validate_actionline (const char *line, struct breakpoint *b)
+@@ -699,12 +712,7 @@ validate_actionline (const char *line, struct breakpoint *b)
+ 							exp.get (),
+ 							trace_string);
+ 
+-	      if (aexpr->len > MAX_AGENT_EXPR_LEN)
+-		error (_("Expression is too complicated."));
+-
+-	      ax_reqs (aexpr.get ());
+-
+-	      report_agent_reqs_errors (aexpr.get ());
++	      finalize_tracepoint_aexpr (aexpr.get ());
+ 	    }
+ 	}
+       while (p && *p++ == ',');
+@@ -731,11 +739,7 @@ validate_actionline (const char *line, struct breakpoint *b)
+ 		 long.  */
+ 	      agent_expr_up aexpr = gen_eval_for_expr (loc->address, exp.get ());
+ 
+-	      if (aexpr->len > MAX_AGENT_EXPR_LEN)
+-		error (_("Expression is too complicated."));
+-
+-	      ax_reqs (aexpr.get ());
+-	      report_agent_reqs_errors (aexpr.get ());
++	      finalize_tracepoint_aexpr (aexpr.get ());
+ 	    }
+ 	}
+       while (p && *p++ == ',');
+@@ -811,10 +815,10 @@ memrange_sortmerge (std::vector<memrange> &memranges)
+     }
+ }
+ 
+-/* Add a register to a collection list.  */
++/* Add remote register number REGNO to the collection list mask.  */
+ 
+ void
+-collection_list::add_register (unsigned int regno)
++collection_list::add_remote_register (unsigned int regno)
+ {
+   if (info_verbose)
+     printf_filtered ("collect register %d\n", regno);
+@@ -824,12 +828,74 @@ collection_list::add_register (unsigned int regno)
+   m_regs_mask[regno / 8] |= 1 << (regno % 8);
+ }
+ 
++/* Add all the registers from the mask in AEXPR to the mask in the
++   collection list.  Registers in the AEXPR mask are already remote
++   register numbers.  */
++
++void
++collection_list::add_ax_registers (struct agent_expr *aexpr)
++{
++  if (aexpr->reg_mask_len > 0)
++    {
++      for (int ndx1 = 0; ndx1 < aexpr->reg_mask_len; ndx1++)
++	{
++	  QUIT;	/* Allow user to bail out with ^C.  */
++	  if (aexpr->reg_mask[ndx1] != 0)
++	    {
++	      /* Assume chars have 8 bits.  */
++	      for (int ndx2 = 0; ndx2 < 8; ndx2++)
++		if (aexpr->reg_mask[ndx1] & (1 << ndx2))
++		  /* It's used -- record it.  */
++		  add_remote_register (ndx1 * 8 + ndx2);
++	    }
++	}
++    }
++}
++
++/* If REGNO is raw, add its corresponding remote register number to
++   the mask.  If REGNO is a pseudo-register, figure out the necessary
++   registers using a temporary agent expression, and add it to the
++   list if it needs more than just a mask.  */
++
++void
++collection_list::add_local_register (struct gdbarch *gdbarch,
++				     unsigned int regno,
++				     CORE_ADDR scope)
++{
++  if (regno < gdbarch_num_regs (gdbarch))
++    {
++      int remote_regno = gdbarch_remote_register_number (gdbarch, regno);
++
++      if (remote_regno < 0)
++	error (_("Can't collect register %d"), regno);
++
++      add_remote_register (remote_regno);
++    }
++  else
++    {
++      agent_expr_up aexpr (new agent_expr (gdbarch, scope));
++
++      ax_reg_mask (aexpr.get (), regno);
++
++      finalize_tracepoint_aexpr (aexpr.get ());
++
++      add_ax_registers (aexpr.get ());
++
++      /* Usually ax_reg_mask for a pseudo-regiser only sets the
++	 corresponding raw registers in the ax mask, but if this isn't
++	 the case add the expression that is generated to the
++	 collection list.  */
++      if (aexpr->len > 0)
++	add_aexpr (std::move (aexpr));
++    }
++}
++
+ /* Add a memrange to a collection list.  */
+ 
+ void
+ collection_list::add_memrange (struct gdbarch *gdbarch,
+ 			       int type, bfd_signed_vma base,
+-			       ULONGEST len)
++			       ULONGEST len, CORE_ADDR scope)
+ {
+   if (info_verbose)
+     printf_filtered ("(%d,%s,%s)\n", type, paddress (gdbarch, base), pulongest (len));
+@@ -840,7 +906,7 @@ collection_list::add_memrange (struct gdbarch *gdbarch,
+   m_memranges.emplace_back (type, base, base + len);
+ 
+   if (type != memrange_absolute)    /* Better collect the base register!  */
+-    add_register (type);
++    add_local_register (gdbarch, type, scope);
+ }
+ 
+ /* Add a symbol to a collection list.  */
+@@ -882,19 +948,19 @@ collection_list::collect_symbol (struct symbol *sym,
+       if (TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_STRUCT)
+ 	treat_as_expr = 1;
+       else
+-	add_memrange (gdbarch, memrange_absolute, offset, len);
++	add_memrange (gdbarch, memrange_absolute, offset, len, scope);
+       break;
+     case LOC_REGISTER:
+       reg = SYMBOL_REGISTER_OPS (sym)->register_number (sym, gdbarch);
+       if (info_verbose)
+ 	printf_filtered ("LOC_REG[parm] %s: ", 
+ 			 SYMBOL_PRINT_NAME (sym));
+-      add_register (reg);
++      add_local_register (gdbarch, reg, scope);
+       /* Check for doubles stored in two registers.  */
+       /* FIXME: how about larger types stored in 3 or more regs?  */
+       if (TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_FLT &&
+ 	  len > register_size (gdbarch, reg))
+-	add_register (reg + 1);
++	add_local_register (gdbarch, reg + 1, scope);
+       break;
+     case LOC_REF_ARG:
+       printf_filtered ("Sorry, don't know how to do LOC_REF_ARG yet.\n");
+@@ -911,7 +977,7 @@ collection_list::collect_symbol (struct symbol *sym,
+ 			   SYMBOL_PRINT_NAME (sym), pulongest (len),
+ 			   paddress (gdbarch, offset), reg);
+ 	}
+-      add_memrange (gdbarch, reg, offset, len);
++      add_memrange (gdbarch, reg, offset, len, scope);
+       break;
+     case LOC_REGPARM_ADDR:
+       reg = SYMBOL_VALUE (sym);
+@@ -923,7 +989,7 @@ collection_list::collect_symbol (struct symbol *sym,
+ 			   SYMBOL_PRINT_NAME (sym), pulongest (len),
+ 			   paddress (gdbarch, offset), reg);
+ 	}
+-      add_memrange (gdbarch, reg, offset, len);
++      add_memrange (gdbarch, reg, offset, len, scope);
+       break;
+     case LOC_LOCAL:
+       reg = frame_regno;
+@@ -935,7 +1001,7 @@ collection_list::collect_symbol (struct symbol *sym,
+ 			   SYMBOL_PRINT_NAME (sym), pulongest (len),
+ 			   paddress (gdbarch, offset), reg);
+ 	}
+-      add_memrange (gdbarch, reg, offset, len);
++      add_memrange (gdbarch, reg, offset, len, scope);
+       break;
+ 
+     case LOC_UNRESOLVED:
+@@ -968,26 +1034,10 @@ collection_list::collect_symbol (struct symbol *sym,
+ 	  return;
+ 	}
+ 
+-      ax_reqs (aexpr.get ());
+-
+-      report_agent_reqs_errors (aexpr.get ());
++      finalize_tracepoint_aexpr (aexpr.get ());
+ 
+       /* Take care of the registers.  */
+-      if (aexpr->reg_mask_len > 0)
+-	{
+-	  for (int ndx1 = 0; ndx1 < aexpr->reg_mask_len; ndx1++)
+-	    {
+-	      QUIT;	/* Allow user to bail out with ^C.  */
+-	      if (aexpr->reg_mask[ndx1] != 0)
+-		{
+-		  /* Assume chars have 8 bits.  */
+-		  for (int ndx2 = 0; ndx2 < 8; ndx2++)
+-		    if (aexpr->reg_mask[ndx1] & (1 << ndx2))
+-		      /* It's used -- record it.  */
+-		      add_register (ndx1 * 8 + ndx2);
+-		}
+-	    }
+-	}
++      add_ax_registers (aexpr.get ());
+ 
+       add_aexpr (std::move (aexpr));
+     }
+@@ -1257,8 +1307,18 @@ encode_actions_1 (struct command_line *action,
+ 
+ 	      if (0 == strncasecmp ("$reg", action_exp, 4))
+ 		{
+-		  for (i = 0; i < gdbarch_num_regs (target_gdbarch ()); i++)
+-		    collect->add_register (i);
++		  for (i = 0; i < gdbarch_num_regs (target_gdbarch ());
++		       i++)
++		    {
++		      int remote_regno = (gdbarch_remote_register_number
++					  (target_gdbarch (), i));
++
++		      /* Ignore arch regnos without a corresponding
++			 remote regno.  This can happen for regnos not
++			 in the tdesc.  */
++		      if (remote_regno >= 0)
++			collect->add_remote_register (remote_regno);
++		    }
+ 		  action_exp = strchr (action_exp, ',');	/* more? */
+ 		}
+ 	      else if (0 == strncasecmp ("$arg", action_exp, 4))
+@@ -1288,27 +1348,10 @@ encode_actions_1 (struct command_line *action,
+ 						    target_gdbarch (),
+ 						    trace_string);
+ 
+-		  ax_reqs (aexpr.get ());
+-		  report_agent_reqs_errors (aexpr.get ());
++		  finalize_tracepoint_aexpr (aexpr.get ());
+ 
+ 		  /* take care of the registers */
+-		  if (aexpr->reg_mask_len > 0)
+-		    {
+-		      for (int ndx1 = 0; ndx1 < aexpr->reg_mask_len; ndx1++)
+-			{
+-			  QUIT;	/* allow user to bail out with ^C */
+-			  if (aexpr->reg_mask[ndx1] != 0)
+-			    {
+-			      /* assume chars have 8 bits */
+-			      for (int ndx2 = 0; ndx2 < 8; ndx2++)
+-				if (aexpr->reg_mask[ndx1] & (1 << ndx2))
+-				  {
+-				    /* It's used -- record it.  */
+-				    collect->add_register (ndx1 * 8 + ndx2);
+-				  }
+-			    }
+-			}
+-		    }
++		  collect->add_ax_registers (aexpr.get ());
+ 
+ 		  collect->add_aexpr (std::move (aexpr));
+ 		  action_exp = strchr (action_exp, ',');	/* more? */
+@@ -1340,7 +1383,8 @@ encode_actions_1 (struct command_line *action,
+ 					  name);
+ 			if (info_verbose)
+ 			  printf_filtered ("OP_REGISTER: ");
+-			collect->add_register (i);
++			collect->add_local_register (target_gdbarch (),
++						     i, tloc->address);
+ 			break;
+ 		      }
+ 
+@@ -1352,7 +1396,8 @@ encode_actions_1 (struct command_line *action,
+ 		      check_typedef (exp->elts[1].type);
+ 		      collect->add_memrange (target_gdbarch (),
+ 					     memrange_absolute, addr,
+-					     TYPE_LENGTH (exp->elts[1].type));
++					     TYPE_LENGTH (exp->elts[1].type),
++					     tloc->address);
+ 		      collect->append_exp (exp.get ());
+ 		      break;
+ 
+@@ -1376,28 +1421,10 @@ encode_actions_1 (struct command_line *action,
+ 								exp.get (),
+ 								trace_string);
+ 
+-		      ax_reqs (aexpr.get ());
+-
+-		      report_agent_reqs_errors (aexpr.get ());
++		      finalize_tracepoint_aexpr (aexpr.get ());
+ 
+ 		      /* Take care of the registers.  */
+-		      if (aexpr->reg_mask_len > 0)
+-			{
+-			  for (int ndx1 = 0; ndx1 < aexpr->reg_mask_len; ndx1++)
+-			    {
+-			      QUIT;	/* Allow user to bail out with ^C.  */
+-			      if (aexpr->reg_mask[ndx1] != 0)
+-				{
+-				  /* Assume chars have 8 bits.  */
+-				  for (int ndx2 = 0; ndx2 < 8; ndx2++)
+-				    if (aexpr->reg_mask[ndx1] & (1 << ndx2))
+-				      {
+-					/* It's used -- record it.  */
+-					collect->add_register (ndx1 * 8 + ndx2);
+-				      }
+-				}
+-			    }
+-			}
++		      collect->add_ax_registers (aexpr.get ());
+ 
+ 		      collect->add_aexpr (std::move (aexpr));
+ 		      collect->append_exp (exp.get ());
+@@ -1422,8 +1449,7 @@ encode_actions_1 (struct command_line *action,
+ 		  agent_expr_up aexpr = gen_eval_for_expr (tloc->address,
+ 							   exp.get ());
+ 
+-		  ax_reqs (aexpr.get ());
+-		  report_agent_reqs_errors (aexpr.get ());
++		  finalize_tracepoint_aexpr (aexpr.get ());
+ 
+ 		  /* Even though we're not officially collecting, add
+ 		     to the collect list anyway.  */
+diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
+--- a/gdb/tracepoint.h
++++ b/gdb/tracepoint.h
+@@ -263,9 +263,14 @@ public:
+   void add_aexpr (agent_expr_up aexpr);
+ 
+   void add_register (unsigned int regno);
++  void add_remote_register (unsigned int regno);
++  void add_ax_registers (struct agent_expr *aexpr);
++  void add_local_register (struct gdbarch *gdbarch,
++			   unsigned int regno,
++			   CORE_ADDR scope);
+   void add_memrange (struct gdbarch *gdbarch,
+ 		     int type, bfd_signed_vma base,
+-		     ULONGEST len);
++		     ULONGEST len, CORE_ADDR scope);
+   void collect_symbol (struct symbol *sym,
+ 		       struct gdbarch *gdbarch,
+ 		       long frame_regno, long frame_offset,

SOURCES/gdb-rhbz1187581-power8-regs-5of7.patch

@@ -0,0 +1,215 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date: Thu, 9 Aug 2018 17:17:46 +0200
+Subject: gdb-rhbz1187581-power8-regs-5of7.patch
+
+;; Add GDB support to access/display POWER8 registers (IBM, RH BZ 1187581).
+
+commit a04b9d62a234923826e431a209d396a628661548
+Author: Pedro Franco de Carvalho <pedromfc@linux.ibm.com>
+Date:   Mon Aug 6 16:24:55 2018 -0300
+
+    Variable size for regs mask in collection list
+
+    This patch changes collection_list to allow larger register masks.
+
+    The mask is changed from an array to a vector and is initialized to
+    hold the maximum possible remote register number.  The stringify
+    method is updated to resize temp_buf if needed.
+
+    gdb/ChangeLog:
+    2018-08-06  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
+
+            * tracepoint.h (collection_list) <m_regs_mask>: Change type to
+            std::vector<unsigned char>.
+            * tracepoint.c (collection_list::collection_list): Remove
+            m_regs_mask initializer from initializer list.  Resize
+            m_regs_mask using the largest remote register number.
+            (collection_list::add_remote_register): Remove size check on
+            m_regs_mask.  Use at to access element.
+            (collection_list::stringify): Change type of temp_buf to
+            gdb::char_vector.  Update uses of temp_buf.  Resize if needed to
+            stringify the register mask.  Use pack_hex_byte for the register
+            mask.
+
++2018-08-06  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
++
++	* tracepoint.h (collection_list) <m_regs_mask>: Change type to
++	std::vector<unsigned char>.
++	* tracepoint.c (collection_list::collection_list): Remove
++	m_regs_mask initializer from initializer list.  Resize
++	m_regs_mask using the largest remote register number.
++	(collection_list::add_remote_register): Remove size check on
++	m_regs_mask.  Use at to access element.
++	(collection_list::stringify): Change type of temp_buf to
++	gdb::char_vector.  Update uses of temp_buf.  Resize if needed to
++	stringify the register mask.  Use pack_hex_byte for the register
++	mask.
++
+ 2018-08-06  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
+
+ 	* tracepoint.h (class collection_list) <add_register>: Remove.
+
+diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
+--- a/gdb/tracepoint.c
++++ b/gdb/tracepoint.c
+@@ -822,10 +822,8 @@ collection_list::add_remote_register (unsigned int regno)
+ {
+   if (info_verbose)
+     printf_filtered ("collect register %d\n", regno);
+-  if (regno >= (8 * sizeof (m_regs_mask)))
+-    error (_("Internal: register number %d too large for tracepoint"),
+-	   regno);
+-  m_regs_mask[regno / 8] |= 1 << (regno % 8);
++
++  m_regs_mask.at (regno / 8) |= 1 << (regno % 8);
+ }
+ 
+ /* Add all the registers from the mask in AEXPR to the mask in the
+@@ -1136,9 +1134,20 @@ collection_list::add_static_trace_data ()
+ }
+ 
+ collection_list::collection_list ()
+-  : m_regs_mask (),
+-    m_strace_data (false)
++  : m_strace_data (false)
+ {
++  int max_remote_regno = 0;
++  for (int i = 0; i < gdbarch_num_regs (target_gdbarch ()); i++)
++    {
++      int remote_regno = (gdbarch_remote_register_number
++			  (target_gdbarch (), i));
++
++      if (remote_regno >= 0 && remote_regno > max_remote_regno)
++	max_remote_regno = remote_regno;
++    }
++
++  m_regs_mask.resize ((max_remote_regno / 8) + 1);
++
+   m_memranges.reserve (128);
+   m_aexprs.reserve (128);
+ }
+@@ -1148,7 +1157,8 @@ collection_list::collection_list ()
+ std::vector<std::string>
+ collection_list::stringify ()
+ {
+-  char temp_buf[2048];
++  gdb::char_vector temp_buf (2048);
++
+   int count;
+   char *end;
+   long i;
+@@ -1158,35 +1168,45 @@ collection_list::stringify ()
+     {
+       if (info_verbose)
+ 	printf_filtered ("\nCollecting static trace data\n");
+-      end = temp_buf;
++      end = temp_buf.data ();
+       *end++ = 'L';
+-      str_list.emplace_back (temp_buf, end - temp_buf);
++      str_list.emplace_back (temp_buf.data (), end - temp_buf.data ());
+     }
+ 
+-  for (i = sizeof (m_regs_mask) - 1; i > 0; i--)
++  for (i = m_regs_mask.size () - 1; i > 0; i--)
+     if (m_regs_mask[i] != 0)    /* Skip leading zeroes in regs_mask.  */
+       break;
+   if (m_regs_mask[i] != 0)	/* Prepare to send regs_mask to the stub.  */
+     {
+       if (info_verbose)
+ 	printf_filtered ("\nCollecting registers (mask): 0x");
+-      end = temp_buf;
++
++      /* One char for 'R', one for the null terminator and two per
++	 mask byte.  */
++      std::size_t new_size = (i + 1) * 2 + 2;
++      if (new_size > temp_buf.size ())
++	temp_buf.resize (new_size);
++
++      end = temp_buf.data ();
+       *end++ = 'R';
+       for (; i >= 0; i--)
+ 	{
+ 	  QUIT;			/* Allow user to bail out with ^C.  */
+ 	  if (info_verbose)
+ 	    printf_filtered ("%02X", m_regs_mask[i]);
+-	  sprintf (end, "%02X", m_regs_mask[i]);
+-	  end += 2;
++
++	  end = pack_hex_byte (end, m_regs_mask[i]);
+ 	}
+-      str_list.emplace_back (temp_buf);
++      *end = '\0';
++
++      str_list.emplace_back (temp_buf.data ());
+     }
+   if (info_verbose)
+     printf_filtered ("\n");
+   if (!m_memranges.empty () && info_verbose)
+     printf_filtered ("Collecting memranges: \n");
+-  for (i = 0, count = 0, end = temp_buf; i < m_memranges.size (); i++)
++  for (i = 0, count = 0, end = temp_buf.data ();
++       i < m_memranges.size (); i++)
+     {
+       QUIT;			/* Allow user to bail out with ^C.  */
+       if (info_verbose)
+@@ -1200,9 +1220,9 @@ collection_list::stringify ()
+ 	}
+       if (count + 27 > MAX_AGENT_EXPR_LEN)
+ 	{
+-	  str_list.emplace_back (temp_buf, count);
++	  str_list.emplace_back (temp_buf.data (), count);
+ 	  count = 0;
+-	  end = temp_buf;
++	  end = temp_buf.data ();
+ 	}
+ 
+       {
+@@ -1222,7 +1242,7 @@ collection_list::stringify ()
+       }
+ 
+       count += strlen (end);
+-      end = temp_buf + count;
++      end = temp_buf.data () + count;
+     }
+ 
+   for (i = 0; i < m_aexprs.size (); i++)
+@@ -1230,9 +1250,9 @@ collection_list::stringify ()
+       QUIT;			/* Allow user to bail out with ^C.  */
+       if ((count + 10 + 2 * m_aexprs[i]->len) > MAX_AGENT_EXPR_LEN)
+ 	{
+-	  str_list.emplace_back (temp_buf, count);
++	  str_list.emplace_back (temp_buf.data (), count);
+ 	  count = 0;
+-	  end = temp_buf;
++	  end = temp_buf.data ();
+ 	}
+       sprintf (end, "X%08X,", m_aexprs[i]->len);
+       end += 10;		/* 'X' + 8 hex digits + ',' */
+@@ -1244,9 +1264,9 @@ collection_list::stringify ()
+ 
+   if (count != 0)
+     {
+-      str_list.emplace_back (temp_buf, count);
++      str_list.emplace_back (temp_buf.data (), count);
+       count = 0;
+-      end = temp_buf;
++      end = temp_buf.data ();
+     }
+ 
+   return str_list;
+diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
+--- a/gdb/tracepoint.h
++++ b/gdb/tracepoint.h
+@@ -293,8 +293,9 @@ public:
+   { return m_computed; }
+ 
+ private:
+-  /* room for up to 256 regs */
+-  unsigned char m_regs_mask[32];
++  /* We need the allocator zero-initialize the mask, so we don't use
++     gdb::byte_vector.  */
++  std::vector<unsigned char> m_regs_mask;
+ 
+   std::vector<memrange> m_memranges;
+ 

SOURCES/gdb-rhbz1187581-power8-regs-6of7.patch

@@ -0,0 +1,187 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date: Thu, 9 Aug 2018 17:18:15 +0200
+Subject: gdb-rhbz1187581-power8-regs-6of7.patch
+
+;; Add GDB support to access/display POWER8 registers (IBM, RH BZ 1187581).
+
+commit 296956befef3711ed458c7cba8041fde0dab9c50
+Author: Pedro Franco de Carvalho <pedromfc@linux.ibm.com>
+Date:   Mon Aug 6 16:24:55 2018 -0300
+
+    Allow larger regblock sizes when saving tracefiles
+
+    The tracefile.c:trace_save function assumes trace_regblock_size won't
+    be larger than the MAX_TRACE_UPLOAD constant, used to size the buffer
+    which holds trace data.  This can cause buffer overruns when this is
+    not the case.  This patch changes this function so that the larger
+    size is used to size the buffer.
+
+    gdb/ChangeLog:
+    2018-08-06  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
+
+            * tracefile.c: Include common/byte-vector.h.
+            (trace_save): Change type of buf to gdb::byte_vector.  Initialize
+            with trace_regblock_size if needed.  Update uses of buf.
+
++2018-08-06  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
++
++	* tracefile.c: Include common/byte-vector.h.
++	(trace_save): Change type of buf to gdb::byte_vector.  Initialize
++	with trace_regblock_size if needed.  Update uses of buf.
++
+ 2018-08-06  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
+
+ 	* tracepoint.h (collection_list) <m_regs_mask>: Change type to
+
+diff --git a/gdb/tracefile.c b/gdb/tracefile.c
+--- a/gdb/tracefile.c
++++ b/gdb/tracefile.c
+@@ -22,6 +22,7 @@
+ #include "ctf.h"
+ #include "exec.h"
+ #include "regcache.h"
++#include "common/byte-vector.h"
+ 
+ /* Helper macros.  */
+ 
+@@ -67,7 +68,7 @@ trace_save (const char *filename, struct trace_file_writer *writer,
+ 
+   ULONGEST offset = 0;
+ #define MAX_TRACE_UPLOAD 2000
+-  gdb_byte buf[MAX_TRACE_UPLOAD];
++  gdb::byte_vector buf (std::max (MAX_TRACE_UPLOAD, trace_regblock_size));
+   enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
+ 
+   /* If the target is to save the data to a file on its own, then just
+@@ -144,7 +145,7 @@ trace_save (const char *filename, struct trace_file_writer *writer,
+ 	  /* We ask for big blocks, in the hopes of efficiency, but
+ 	     will take less if the target has packet size limitations
+ 	     or some such.  */
+-	  gotten = target_get_raw_trace_data (buf, offset,
++	  gotten = target_get_raw_trace_data (buf.data (), offset,
+ 					      MAX_TRACE_UPLOAD);
+ 	  if (gotten < 0)
+ 	    error (_("Failure to get requested trace buffer data"));
+@@ -152,7 +153,7 @@ trace_save (const char *filename, struct trace_file_writer *writer,
+ 	  if (gotten == 0)
+ 	    break;
+ 
+-	  writer->ops->write_trace_buffer (writer, buf, gotten);
++	  writer->ops->write_trace_buffer (writer, buf.data (), gotten);
+ 
+ 	  offset += gotten;
+ 	}
+@@ -163,7 +164,7 @@ trace_save (const char *filename, struct trace_file_writer *writer,
+ 	  /* Parse the trace buffers according to how data are stored
+ 	     in trace buffer in GDBserver.  */
+ 
+-	  gotten = target_get_raw_trace_data (buf, offset, 6);
++	  gotten = target_get_raw_trace_data (buf.data (), offset, 6);
+ 
+ 	  if (gotten == 0)
+ 	    break;
+@@ -171,10 +172,10 @@ trace_save (const char *filename, struct trace_file_writer *writer,
+ 	  /* Read the first six bytes in, which is the tracepoint
+ 	     number and trace frame size.  */
+ 	  tp_num = (uint16_t)
+-	    extract_unsigned_integer (&buf[0], 2, byte_order);
++	    extract_unsigned_integer (&((buf.data ())[0]), 2, byte_order);
+ 
+ 	  tf_size = (uint32_t)
+-	    extract_unsigned_integer (&buf[2], 4, byte_order);
++	    extract_unsigned_integer (&((buf.data ())[2]), 4, byte_order);
+ 
+ 	  writer->ops->frame_ops->start (writer, tp_num);
+ 	  gotten = 6;
+@@ -192,7 +193,8 @@ trace_save (const char *filename, struct trace_file_writer *writer,
+ 		  /* We'll fetch one block each time, in order to
+ 		     handle the extremely large 'M' block.  We first
+ 		     fetch one byte to get the type of the block.  */
+-		  gotten = target_get_raw_trace_data (buf, offset, 1);
++		  gotten = target_get_raw_trace_data (buf.data (),
++						      offset, 1);
+ 		  if (gotten < 1)
+ 		    error (_("Failure to get requested trace buffer data"));
+ 
+@@ -205,13 +207,13 @@ trace_save (const char *filename, struct trace_file_writer *writer,
+ 		    {
+ 		    case 'R':
+ 		      gotten
+-			= target_get_raw_trace_data (buf, offset,
++			= target_get_raw_trace_data (buf.data (), offset,
+ 						     trace_regblock_size);
+ 		      if (gotten < trace_regblock_size)
+ 			error (_("Failure to get requested trace"
+ 				 " buffer data"));
+ 
+-		      TRACE_WRITE_R_BLOCK (writer, buf,
++		      TRACE_WRITE_R_BLOCK (writer, buf.data (),
+ 					   trace_regblock_size);
+ 		      break;
+ 		    case 'M':
+@@ -221,7 +223,8 @@ trace_save (const char *filename, struct trace_file_writer *writer,
+ 			LONGEST t;
+ 			int j;
+ 
+-			t = target_get_raw_trace_data (buf,offset, 10);
++			t = target_get_raw_trace_data (buf.data (),
++						       offset, 10);
+ 			if (t < 10)
+ 			  error (_("Failure to get requested trace"
+ 				   " buffer data"));
+@@ -231,10 +234,10 @@ trace_save (const char *filename, struct trace_file_writer *writer,
+ 
+ 			gotten = 0;
+ 			addr = (ULONGEST)
+-			  extract_unsigned_integer (buf, 8,
++			  extract_unsigned_integer (buf.data (), 8,
+ 						    byte_order);
+ 			mlen = (unsigned short)
+-			  extract_unsigned_integer (&buf[8], 2,
++			  extract_unsigned_integer (&((buf.data ())[8]), 2,
+ 						    byte_order);
+ 
+ 			TRACE_WRITE_M_BLOCK_HEADER (writer, addr,
+@@ -252,14 +255,15 @@ trace_save (const char *filename, struct trace_file_writer *writer,
+ 			    else
+ 			      read_length = mlen - j;
+ 
+-			    t = target_get_raw_trace_data (buf,
++			    t = target_get_raw_trace_data (buf.data (),
+ 							   offset + j,
+ 							   read_length);
+ 			    if (t < read_length)
+ 			      error (_("Failure to get requested"
+ 				       " trace buffer data"));
+ 
+-			    TRACE_WRITE_M_BLOCK_MEMORY (writer, buf,
++			    TRACE_WRITE_M_BLOCK_MEMORY (writer,
++							buf.data (),
+ 							read_length);
+ 
+ 			    j += read_length;
+@@ -274,18 +278,18 @@ trace_save (const char *filename, struct trace_file_writer *writer,
+ 			LONGEST val;
+ 
+ 			gotten
+-			  = target_get_raw_trace_data (buf, offset,
+-						       12);
++			  = target_get_raw_trace_data (buf.data (),
++						       offset, 12);
+ 			if (gotten < 12)
+ 			  error (_("Failure to get requested"
+ 				   " trace buffer data"));
+ 
+-			vnum  = (int) extract_signed_integer (buf,
++			vnum  = (int) extract_signed_integer (buf.data (),
+ 							      4,
+ 							      byte_order);
+ 			val
+-			  = extract_signed_integer (&buf[4], 8,
+-						    byte_order);
++			  = extract_signed_integer (&((buf.data ())[4]),
++						    8, byte_order);
+ 
+ 			TRACE_WRITE_V_BLOCK (writer, vnum, val);
+ 		      }

SOURCES/gdb-rhbz1187581-power8-regs-7of7.patch

@@ -0,0 +1,129 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date: Thu, 9 Aug 2018 17:18:49 +0200
+Subject: gdb-rhbz1187581-power8-regs-7of7.patch
+
+;; Add GDB support to access/display POWER8 registers (IBM, RH BZ 1187581).
+
+commit a7f25a84f4cc1df5248c46346337f19a2a66af5a
+Author: Simon Marchi <simon.marchi@ericsson.com>
+Date:   Mon Aug 6 16:54:47 2018 -0400
+
+    Fix compilation failure in remote.c
+
+    A recent patch introduced a few of these:
+
+    /home/emaisin/src/binutils-gdb/gdb/remote.c:12862:19: error: format not a string literal and no format arguments [-Werror=format-security]
+         error (err_msg);
+                       ^
+
+    Fix them by replacing the call to error with
+
+      error ("%s", err_msg);
+
+    gdb/ChangeLog:
+
+            * remote.c (remote_target::download_tracepoint): Fix format
+            string errors.
+
++2018-08-06  Simon Marchi  <simon.marchi@ericsson.com>
++
++	* remote.c (remote_target::download_tracepoint): Fix format
++	string errors.
++
+ 2018-08-06  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
+
+ 	* tracefile.c: Include common/byte-vector.h.
+
+diff --git a/gdb/remote.c b/gdb/remote.c
+--- a/gdb/remote.c
++++ b/gdb/remote.c
+@@ -12826,7 +12826,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
+ 		  t->step_count, t->pass_count);
+ 
+   if (ret < 0 || ret >= buf.size ())
+-    error (err_msg);
++    error ("%s", err_msg);
+ 
+   /* Fast tracepoints are mostly handled by the target, but we can
+      tell the target how big of an instruction block should be moved
+@@ -12846,7 +12846,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
+ 			      gdb_insn_length (loc->gdbarch, tpaddr));
+ 
+ 	      if (ret < 0 || ret >= size_left)
+-		error (err_msg);
++		error ("%s", err_msg);
+ 	    }
+ 	  else
+ 	    /* If it passed validation at definition but fails now,
+@@ -12877,7 +12877,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
+ 			      size_left, ":S");
+ 
+ 	      if (ret < 0 || ret >= size_left)
+-		error (err_msg);
++		error ("%s", err_msg);
+ 	    }
+ 	  else
+ 	    error (_("Static tracepoint not valid during download"));
+@@ -12905,14 +12905,14 @@ remote_target::download_tracepoint (struct bp_location *loc)
+ 			  size_left, ":X%x,", aexpr->len);
+ 
+ 	  if (ret < 0 || ret >= size_left)
+-	    error (err_msg);
++	    error ("%s", err_msg);
+ 
+ 	  size_left = buf.size () - strlen (buf.data ());
+ 
+ 	  /* Two bytes to encode each aexpr byte, plus the terminating
+ 	     null byte.  */
+ 	  if (aexpr->len * 2 + 1 > size_left)
+-	    error (err_msg);
++	    error ("%s", err_msg);
+ 
+ 	  pkt = buf.data () + strlen (buf.data ());
+ 
+@@ -12933,7 +12933,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
+ 		      size_left, "-");
+ 
+       if (ret < 0 || ret >= size_left)
+-	error (err_msg);
++	error ("%s", err_msg);
+     }
+ 
+   putpkt (buf.data ());
+@@ -12956,7 +12956,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
+ 		      has_more ? '-' : 0);
+ 
+       if (ret < 0 || ret >= buf.size ())
+-	error (err_msg);
++	error ("%s", err_msg);
+ 
+       putpkt (buf.data ());
+       remote_get_noisy_reply ();
+@@ -12979,7 +12979,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
+ 		      has_more ? "-" : "");
+ 
+       if (ret < 0 || ret >= buf.size ())
+-	error (err_msg);
++	error ("%s", err_msg);
+ 
+       putpkt (buf.data ());
+       remote_get_noisy_reply ();
+@@ -12994,7 +12994,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
+ 	  ret = snprintf (buf.data (), buf.size (), "QTDPsrc:");
+ 
+ 	  if (ret < 0 || ret >= buf.size ())
+-	    error (err_msg);
++	    error ("%s", err_msg);
+ 
+ 	  encode_source_string (b->number, loc->address, "at",
+ 				event_location_to_string (b->location.get ()),
+@@ -13010,7 +13010,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
+ 	  ret = snprintf (buf.data (), buf.size (), "QTDPsrc:");
+ 
+ 	  if (ret < 0 || ret >= buf.size ())
+-	    error (err_msg);
++	    error ("%s", err_msg);
+ 
+ 	  encode_source_string (b->number, loc->address,
+ 				"cond", b->cond_string,

SOURCES/gdb-rhbz1187581-power8-regs-not-in-8.2-01of15.patch

@@ -0,0 +1,35 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Keith Seitz <keiths@redhat.com>
+Date: Fri, 11 Jan 2019 17:02:12 -0500
+Subject: gdb-rhbz1187581-power8-regs-not-in-8.2-01of15.patch
+
+;; Fix remote.c build failure
+;; Szabolcs Nagy, RH BZ 1187581
+
+Fix gdb/remote.c build failure
+
+Add const qualifier to fix
+
+/S/gdb/common/gdb_locale.h:35:27: error: deprecated conversion from string c
+ # define _(String) (String)
+                           ^
+/S/gdb/remote.c:12844:19: note: in expansion of macro '_'
+   char *err_msg = _("Tracepoint packet too large for target.");
+                   ^
+gdb/ChangeLog:
+
+    * remote.c (remote_target::download_tracepoint): Change char* to
+    const char*.
+
+diff --git a/gdb/remote.c b/gdb/remote.c
+--- a/gdb/remote.c
++++ b/gdb/remote.c
+@@ -12808,7 +12808,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
+   struct tracepoint *t = (struct tracepoint *) b;
+   struct remote_state *rs = get_remote_state ();
+   int ret;
+-  char *err_msg = _("Tracepoint packet too large for target.");
++  const char *err_msg = _("Tracepoint packet too large for target.");
+   size_t size_left;
+ 
+   /* We use a buffer other than rs->buf because we'll build strings

SOURCES/gdb-rhbz1187581-power8-regs-not-in-8.2-02of15.patch

@@ -0,0 +1,479 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Keith Seitz <keiths@redhat.com>
+Date: Fri, 11 Jan 2019 17:02:12 -0500
+Subject: gdb-rhbz1187581-power8-regs-not-in-8.2-02of15.patch
+
+;; Add grok/write functions for new ppc core note sections
+;; Edjunior Barbosa Machado, RH BZ 1187581
+
+Add grok/write functions for new ppc core note sections
+
+This patch adds functions for grokking and writing more register core
+note sections (NT_PPC_TAR, NT_PPC_PPR, NT_PPC_DSCR, NT_PPC_EBB,
+NT_PPC_PMU, NT_PPC_TM_CGPR, NT_PPC_TM_CFPR, NT_PPC_TM_CVMX,
+NT_PPC_TM_CVSX, NT_PPC_TM_SPR, NT_PPC_TM_CTAR, NT_PPC_TM_CPPR,
+NT_PPC_TM_CDSCR).
+
+2018-07-16  Edjunior Barbosa Machado  <emachado@linux.vnet.ibm.com>
+
+bfd/
+    * elf-bfd.h (elfcore_write_ppc_tar): Add prototype.
+    (elfcore_write_ppc_ppr): Likewise.
+    (elfcore_write_ppc_dscr): Likewise.
+    (elfcore_write_ppc_ebb): Likewise.
+    (elfcore_write_ppc_pmu): Likewise.
+    (elfcore_write_ppc_tm_cgpr): Likewise.
+    (elfcore_write_ppc_tm_cfpr): Likewise.
+    (elfcore_write_ppc_tm_cvmx): Likewise.
+    (elfcore_write_ppc_tm_cvsx): Likewise.
+    (elfcore_write_ppc_tm_spr): Likewise.
+    (elfcore_write_ppc_tm_ctar): Likewise.
+    (elfcore_write_ppc_tm_cppr): Likewise.
+    (elfcore_write_ppc_tm_cdscr): Likewise.
+    * elf.c (elfcore_write_ppc_tar): New function.
+    (elfcore_write_ppc_ppr): Likewise.
+    (elfcore_write_ppc_dscr): Likewise.
+    (elfcore_write_ppc_ebb): Likewise.
+    (elfcore_write_ppc_pmu): Likewise.
+    (elfcore_write_ppc_tm_cgpr): Likewise.
+    (elfcore_write_ppc_tm_cfpr): Likewise.
+    (elfcore_write_ppc_tm_cvmx): Likewise.
+    (elfcore_write_ppc_tm_cvsx): Likewise.
+    (elfcore_write_ppc_tm_spr): Likewise.
+    (elfcore_write_ppc_tm_ctar): Likewise.
+    (elfcore_write_ppc_tm_cppr): Likewise.
+    (elfcore_write_ppc_tm_cdscr): Likewise.
+    (elfcore_write_register_note): Call them.
+    (elfcore_grok_ppc_tar): New function.
+    (elfcore_grok_ppc_ppr): Likewise.
+    (elfcore_grok_ppc_dscr): Likewise.
+    (elfcore_grok_ppc_ebb): Likewise.
+    (elfcore_grok_ppc_pmu): Likewise.
+    (elfcore_grok_ppc_tm_cgpr): Likewise.
+    (elfcore_grok_ppc_tm_cfpr): Likewise.
+    (elfcore_grok_ppc_tm_cvmx): Likewise.
+    (elfcore_grok_ppc_tm_cvsx): Likewise.
+    (elfcore_grok_ppc_tm_spr): Likewise.
+    (elfcore_grok_ppc_tm_ctar): Likewise.
+    (elfcore_grok_ppc_tm_cppr): Likewise.
+    (elfcore_grok_ppc_tm_cdscr): Likewise.
+    (elfcore_grok_note): Call them.
+
+diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
+--- a/bfd/elf-bfd.h
++++ b/bfd/elf-bfd.h
+@@ -2569,6 +2569,32 @@ extern char *elfcore_write_ppc_vmx
+   (bfd *, char *, int *, const void *, int);
+ extern char *elfcore_write_ppc_vsx
+   (bfd *, char *, int *, const void *, int);
++extern char *elfcore_write_ppc_tar
++  (bfd *, char *, int *, const void *, int);
++extern char *elfcore_write_ppc_ppr
++  (bfd *, char *, int *, const void *, int);
++extern char *elfcore_write_ppc_dscr
++  (bfd *, char *, int *, const void *, int);
++extern char *elfcore_write_ppc_ebb
++  (bfd *, char *, int *, const void *, int);
++extern char *elfcore_write_ppc_pmu
++  (bfd *, char *, int *, const void *, int);
++extern char *elfcore_write_ppc_tm_cgpr
++  (bfd *, char *, int *, const void *, int);
++extern char *elfcore_write_ppc_tm_cfpr
++  (bfd *, char *, int *, const void *, int);
++extern char *elfcore_write_ppc_tm_cvmx
++  (bfd *, char *, int *, const void *, int);
++extern char *elfcore_write_ppc_tm_cvsx
++  (bfd *, char *, int *, const void *, int);
++extern char *elfcore_write_ppc_tm_spr
++  (bfd *, char *, int *, const void *, int);
++extern char *elfcore_write_ppc_tm_ctar
++  (bfd *, char *, int *, const void *, int);
++extern char *elfcore_write_ppc_tm_cppr
++  (bfd *, char *, int *, const void *, int);
++extern char *elfcore_write_ppc_tm_cdscr
++  (bfd *, char *, int *, const void *, int);
+ extern char *elfcore_write_s390_timer
+   (bfd *, char *, int *, const void *, int);
+ extern char *elfcore_write_s390_todcmp
+diff --git a/bfd/elf.c b/bfd/elf.c
+--- a/bfd/elf.c
++++ b/bfd/elf.c
+@@ -9238,6 +9238,84 @@ elfcore_grok_ppc_vsx (bfd *abfd, Elf_Internal_Note *note)
+   return elfcore_make_note_pseudosection (abfd, ".reg-ppc-vsx", note);
+ }
+ 
++static bfd_boolean
++elfcore_grok_ppc_tar (bfd *abfd, Elf_Internal_Note *note)
++{
++  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-tar", note);
++}
++
++static bfd_boolean
++elfcore_grok_ppc_ppr (bfd *abfd, Elf_Internal_Note *note)
++{
++  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-ppr", note);
++}
++
++static bfd_boolean
++elfcore_grok_ppc_dscr (bfd *abfd, Elf_Internal_Note *note)
++{
++  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-dscr", note);
++}
++
++static bfd_boolean
++elfcore_grok_ppc_ebb (bfd *abfd, Elf_Internal_Note *note)
++{
++  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-ebb", note);
++}
++
++static bfd_boolean
++elfcore_grok_ppc_pmu (bfd *abfd, Elf_Internal_Note *note)
++{
++  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-pmu", note);
++}
++
++static bfd_boolean
++elfcore_grok_ppc_tm_cgpr (bfd *abfd, Elf_Internal_Note *note)
++{
++  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-tm-cgpr", note);
++}
++
++static bfd_boolean
++elfcore_grok_ppc_tm_cfpr (bfd *abfd, Elf_Internal_Note *note)
++{
++  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-tm-cfpr", note);
++}
++
++static bfd_boolean
++elfcore_grok_ppc_tm_cvmx (bfd *abfd, Elf_Internal_Note *note)
++{
++  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-tm-cvmx", note);
++}
++
++static bfd_boolean
++elfcore_grok_ppc_tm_cvsx (bfd *abfd, Elf_Internal_Note *note)
++{
++  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-tm-cvsx", note);
++}
++
++static bfd_boolean
++elfcore_grok_ppc_tm_spr (bfd *abfd, Elf_Internal_Note *note)
++{
++  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-tm-spr", note);
++}
++
++static bfd_boolean
++elfcore_grok_ppc_tm_ctar (bfd *abfd, Elf_Internal_Note *note)
++{
++  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-tm-ctar", note);
++}
++
++static bfd_boolean
++elfcore_grok_ppc_tm_cppr (bfd *abfd, Elf_Internal_Note *note)
++{
++  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-tm-cppr", note);
++}
++
++static bfd_boolean
++elfcore_grok_ppc_tm_cdscr (bfd *abfd, Elf_Internal_Note *note)
++{
++  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-tm-cdscr", note);
++}
++
+ static bfd_boolean
+ elfcore_grok_s390_high_gprs (bfd *abfd, Elf_Internal_Note *note)
+ {
+@@ -9723,6 +9801,97 @@ elfcore_grok_note (bfd *abfd, Elf_Internal_Note *note)
+       else
+ 	return TRUE;
+ 
++    case NT_PPC_TAR:
++      if (note->namesz == 6
++          && strcmp (note->namedata, "LINUX") == 0)
++        return elfcore_grok_ppc_tar (abfd, note);
++      else
++        return TRUE;
++
++    case NT_PPC_PPR:
++      if (note->namesz == 6
++          && strcmp (note->namedata, "LINUX") == 0)
++        return elfcore_grok_ppc_ppr (abfd, note);
++      else
++        return TRUE;
++
++    case NT_PPC_DSCR:
++      if (note->namesz == 6
++          && strcmp (note->namedata, "LINUX") == 0)
++        return elfcore_grok_ppc_dscr (abfd, note);
++      else
++        return TRUE;
++
++    case NT_PPC_EBB:
++      if (note->namesz == 6
++          && strcmp (note->namedata, "LINUX") == 0)
++        return elfcore_grok_ppc_ebb (abfd, note);
++      else
++        return TRUE;
++
++    case NT_PPC_PMU:
++      if (note->namesz == 6
++          && strcmp (note->namedata, "LINUX") == 0)
++        return elfcore_grok_ppc_pmu (abfd, note);
++      else
++        return TRUE;
++
++    case NT_PPC_TM_CGPR:
++      if (note->namesz == 6
++          && strcmp (note->namedata, "LINUX") == 0)
++        return elfcore_grok_ppc_tm_cgpr (abfd, note);
++      else
++        return TRUE;
++
++    case NT_PPC_TM_CFPR:
++      if (note->namesz == 6
++          && strcmp (note->namedata, "LINUX") == 0)
++        return elfcore_grok_ppc_tm_cfpr (abfd, note);
++      else
++        return TRUE;
++
++    case NT_PPC_TM_CVMX:
++      if (note->namesz == 6
++          && strcmp (note->namedata, "LINUX") == 0)
++        return elfcore_grok_ppc_tm_cvmx (abfd, note);
++      else
++        return TRUE;
++
++    case NT_PPC_TM_CVSX:
++      if (note->namesz == 6
++          && strcmp (note->namedata, "LINUX") == 0)
++        return elfcore_grok_ppc_tm_cvsx (abfd, note);
++      else
++        return TRUE;
++
++    case NT_PPC_TM_SPR:
++      if (note->namesz == 6
++          && strcmp (note->namedata, "LINUX") == 0)
++        return elfcore_grok_ppc_tm_spr (abfd, note);
++      else
++        return TRUE;
++
++    case NT_PPC_TM_CTAR:
++      if (note->namesz == 6
++          && strcmp (note->namedata, "LINUX") == 0)
++        return elfcore_grok_ppc_tm_ctar (abfd, note);
++      else
++        return TRUE;
++
++    case NT_PPC_TM_CPPR:
++      if (note->namesz == 6
++          && strcmp (note->namedata, "LINUX") == 0)
++        return elfcore_grok_ppc_tm_cppr (abfd, note);
++      else
++        return TRUE;
++
++    case NT_PPC_TM_CDSCR:
++      if (note->namesz == 6
++          && strcmp (note->namedata, "LINUX") == 0)
++        return elfcore_grok_ppc_tm_cdscr (abfd, note);
++      else
++        return TRUE;
++
+     case NT_S390_HIGH_GPRS:
+       if (note->namesz == 6
+ 	  && strcmp (note->namedata, "LINUX") == 0)
+@@ -10830,6 +10999,162 @@ elfcore_write_ppc_vsx (bfd *abfd,
+ 			     note_name, NT_PPC_VSX, ppc_vsx, size);
+ }
+ 
++char *
++elfcore_write_ppc_tar (bfd *abfd,
++                       char *buf,
++                       int *bufsiz,
++                       const void *ppc_tar,
++                       int size)
++{
++  char *note_name = "LINUX";
++  return elfcore_write_note (abfd, buf, bufsiz,
++                             note_name, NT_PPC_TAR, ppc_tar, size);
++}
++
++char *
++elfcore_write_ppc_ppr (bfd *abfd,
++                       char *buf,
++                       int *bufsiz,
++                       const void *ppc_ppr,
++                       int size)
++{
++  char *note_name = "LINUX";
++  return elfcore_write_note (abfd, buf, bufsiz,
++                             note_name, NT_PPC_PPR, ppc_ppr, size);
++}
++
++char *
++elfcore_write_ppc_dscr (bfd *abfd,
++                        char *buf,
++                        int *bufsiz,
++                        const void *ppc_dscr,
++                        int size)
++{
++  char *note_name = "LINUX";
++  return elfcore_write_note (abfd, buf, bufsiz,
++                             note_name, NT_PPC_DSCR, ppc_dscr, size);
++}
++
++char *
++elfcore_write_ppc_ebb (bfd *abfd,
++                       char *buf,
++                       int *bufsiz,
++                       const void *ppc_ebb,
++                       int size)
++{
++  char *note_name = "LINUX";
++  return elfcore_write_note (abfd, buf, bufsiz,
++                             note_name, NT_PPC_EBB, ppc_ebb, size);
++}
++
++char *
++elfcore_write_ppc_pmu (bfd *abfd,
++                       char *buf,
++                       int *bufsiz,
++                       const void *ppc_pmu,
++                       int size)
++{
++  char *note_name = "LINUX";
++  return elfcore_write_note (abfd, buf, bufsiz,
++                             note_name, NT_PPC_PMU, ppc_pmu, size);
++}
++
++char *
++elfcore_write_ppc_tm_cgpr (bfd *abfd,
++                           char *buf,
++                           int *bufsiz,
++                           const void *ppc_tm_cgpr,
++                           int size)
++{
++  char *note_name = "LINUX";
++  return elfcore_write_note (abfd, buf, bufsiz,
++                             note_name, NT_PPC_TM_CGPR, ppc_tm_cgpr, size);
++}
++
++char *
++elfcore_write_ppc_tm_cfpr (bfd *abfd,
++                           char *buf,
++                           int *bufsiz,
++                           const void *ppc_tm_cfpr,
++                           int size)
++{
++  char *note_name = "LINUX";
++  return elfcore_write_note (abfd, buf, bufsiz,
++                             note_name, NT_PPC_TM_CFPR, ppc_tm_cfpr, size);
++}
++
++char *
++elfcore_write_ppc_tm_cvmx (bfd *abfd,
++                           char *buf,
++                           int *bufsiz,
++                           const void *ppc_tm_cvmx,
++                           int size)
++{
++  char *note_name = "LINUX";
++  return elfcore_write_note (abfd, buf, bufsiz,
++                             note_name, NT_PPC_TM_CVMX, ppc_tm_cvmx, size);
++}
++
++char *
++elfcore_write_ppc_tm_cvsx (bfd *abfd,
++                           char *buf,
++                           int *bufsiz,
++                           const void *ppc_tm_cvsx,
++                           int size)
++{
++  char *note_name = "LINUX";
++  return elfcore_write_note (abfd, buf, bufsiz,
++                             note_name, NT_PPC_TM_CVSX, ppc_tm_cvsx, size);
++}
++
++char *
++elfcore_write_ppc_tm_spr (bfd *abfd,
++                          char *buf,
++                          int *bufsiz,
++                          const void *ppc_tm_spr,
++                          int size)
++{
++  char *note_name = "LINUX";
++  return elfcore_write_note (abfd, buf, bufsiz,
++                             note_name, NT_PPC_TM_SPR, ppc_tm_spr, size);
++}
++
++char *
++elfcore_write_ppc_tm_ctar (bfd *abfd,
++                           char *buf,
++                           int *bufsiz,
++                           const void *ppc_tm_ctar,
++                           int size)
++{
++  char *note_name = "LINUX";
++  return elfcore_write_note (abfd, buf, bufsiz,
++                             note_name, NT_PPC_TM_CTAR, ppc_tm_ctar, size);
++}
++
++char *
++elfcore_write_ppc_tm_cppr (bfd *abfd,
++                           char *buf,
++                           int *bufsiz,
++                           const void *ppc_tm_cppr,
++                           int size)
++{
++  char *note_name = "LINUX";
++  return elfcore_write_note (abfd, buf, bufsiz,
++                             note_name, NT_PPC_TM_CPPR, ppc_tm_cppr, size);
++}
++
++char *
++elfcore_write_ppc_tm_cdscr (bfd *abfd,
++                            char *buf,
++                            int *bufsiz,
++                            const void *ppc_tm_cdscr,
++                            int size)
++{
++  char *note_name = "LINUX";
++  return elfcore_write_note (abfd, buf, bufsiz,
++                             note_name, NT_PPC_TM_CDSCR, ppc_tm_cdscr, size);
++}
++
+ static char *
+ elfcore_write_s390_high_gprs (bfd *abfd,
+ 			      char *buf,
+@@ -11070,6 +11395,32 @@ elfcore_write_register_note (bfd *abfd,
+     return elfcore_write_ppc_vmx (abfd, buf, bufsiz, data, size);
+   if (strcmp (section, ".reg-ppc-vsx") == 0)
+     return elfcore_write_ppc_vsx (abfd, buf, bufsiz, data, size);
++  if (strcmp (section, ".reg-ppc-tar") == 0)
++    return elfcore_write_ppc_tar (abfd, buf, bufsiz, data, size);
++  if (strcmp (section, ".reg-ppc-ppr") == 0)
++    return elfcore_write_ppc_ppr (abfd, buf, bufsiz, data, size);
++  if (strcmp (section, ".reg-ppc-dscr") == 0)
++    return elfcore_write_ppc_dscr (abfd, buf, bufsiz, data, size);
++  if (strcmp (section, ".reg-ppc-ebb") == 0)
++    return elfcore_write_ppc_ebb (abfd, buf, bufsiz, data, size);
++  if (strcmp (section, ".reg-ppc-pmu") == 0)
++    return elfcore_write_ppc_pmu (abfd, buf, bufsiz, data, size);
++  if (strcmp (section, ".reg-ppc-tm-cgpr") == 0)
++    return elfcore_write_ppc_tm_cgpr (abfd, buf, bufsiz, data, size);
++  if (strcmp (section, ".reg-ppc-tm-cfpr") == 0)
++    return elfcore_write_ppc_tm_cfpr (abfd, buf, bufsiz, data, size);
++  if (strcmp (section, ".reg-ppc-tm-cvmx") == 0)
++    return elfcore_write_ppc_tm_cvmx (abfd, buf, bufsiz, data, size);
++  if (strcmp (section, ".reg-ppc-tm-cvsx") == 0)
++    return elfcore_write_ppc_tm_cvsx (abfd, buf, bufsiz, data, size);
++  if (strcmp (section, ".reg-ppc-tm-spr") == 0)
++    return elfcore_write_ppc_tm_spr (abfd, buf, bufsiz, data, size);
++  if (strcmp (section, ".reg-ppc-tm-ctar") == 0)
++    return elfcore_write_ppc_tm_ctar (abfd, buf, bufsiz, data, size);
++  if (strcmp (section, ".reg-ppc-tm-cppr") == 0)
++    return elfcore_write_ppc_tm_cppr (abfd, buf, bufsiz, data, size);
++  if (strcmp (section, ".reg-ppc-tm-cdscr") == 0)
++    return elfcore_write_ppc_tm_cdscr (abfd, buf, bufsiz, data, size);
+   if (strcmp (section, ".reg-s390-high-gprs") == 0)
+     return elfcore_write_s390_high_gprs (abfd, buf, bufsiz, data, size);
+   if (strcmp (section, ".reg-s390-timer") == 0)

SOURCES/gdb-rhbz1187581-power8-regs-not-in-8.2-03of15.patch

@@ -0,0 +1,61 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Keith Seitz <keiths@redhat.com>
+Date: Fri, 11 Jan 2019 17:02:13 -0500
+Subject: gdb-rhbz1187581-power8-regs-not-in-8.2-03of15.patch
+
+;; Zero-initialize linux note sections
+;; Pedro Franco de Carvalho, RH BZ 1187581
+
+Zero-initialize linux note sections
+
+This patches changes linux-tdep.c so that the buffer used to write
+note sections when generating a core file is zero-initialized.  This
+way, bytes that are not collected won't contain random
+data (e.g. padding bytes).
+
+gdb/ChangeLog:
+2018-10-26  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>
+
+    * linux-tdep.c (linux_collect_regset_section_cb): Use
+    std::vector<gdb_byte> instead of char * and malloc for buf.
+    Remove xfree.
+
+diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
+--- a/gdb/linux-tdep.c
++++ b/gdb/linux-tdep.c
+@@ -1584,7 +1584,6 @@ linux_collect_regset_section_cb (const char *sect_name, int supply_size,
+ 				 int collect_size, const struct regset *regset,
+ 				 const char *human_name, void *cb_data)
+ {
+-  char *buf;
+   struct linux_collect_regset_section_cb_data *data
+     = (struct linux_collect_regset_section_cb_data *) cb_data;
+   bool variable_size_section = (regset != NULL
+@@ -1598,19 +1597,22 @@ linux_collect_regset_section_cb (const char *sect_name, int supply_size,
+ 
+   gdb_assert (regset && regset->collect_regset);
+ 
+-  buf = (char *) xmalloc (collect_size);
+-  regset->collect_regset (regset, data->regcache, -1, buf, collect_size);
++  /* This is intentionally zero-initialized by using std::vector, so
++     that any padding bytes in the core file will show as 0.  */
++  std::vector<gdb_byte> buf (collect_size);
++
++  regset->collect_regset (regset, data->regcache, -1, buf.data (),
++			  collect_size);
+ 
+   /* PRSTATUS still needs to be treated specially.  */
+   if (strcmp (sect_name, ".reg") == 0)
+     data->note_data = (char *) elfcore_write_prstatus
+       (data->obfd, data->note_data, data->note_size, data->lwp,
+-       gdb_signal_to_host (data->stop_signal), buf);
++       gdb_signal_to_host (data->stop_signal), buf.data ());
+   else
+     data->note_data = (char *) elfcore_write_register_note
+       (data->obfd, data->note_data, data->note_size,
+-       sect_name, buf, collect_size);
+-  xfree (buf);
++       sect_name, buf.data (), collect_size);
+ 
+   if (data->note_data == NULL)
+     data->abort_iteration = 1;