import gcc-toolset-12-gdb-11.2-3.el8

.gcc-toolset-12-gdb.metadata

@@ -0,0 +1,3 @@
+7c72b1d4a38bb6e155aaad29f4c1abf818b4595d SOURCES/gdb-11.2.tar.xz
+1ad1d2c6f0141b37bbe32b8add91b5691ecc6412 SOURCES/gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz
+fc22d7dfb0c4c686d7dfde9da2aa5b41c475899e SOURCES/v2.0.5.tar.gz

.gitignore

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

SOURCES/_gdb.spec.Patch.include

@@ -0,0 +1,365 @@
+# Match the Fedora's version info.
+#=fedora
+Patch001: gdb-6.3-rh-testversion-20041202.patch
+
+# Add a wrapper script to GDB that implements pstack using the
+# --readnever option.
+#=push
+Patch002: gdb-6.3-gstack-20050411.patch
+
+# Test support of multiple destructors just like multiple constructors
+#=fedoratest
+Patch003: gdb-6.3-test-dtorfix-20050121.patch
+
+# Fix to support executable moving
+#=fedoratest
+Patch004: gdb-6.3-test-movedir-20050125.patch
+
+# Test sibling threads to set threaded watchpoints for x86 and x86-64
+#=fedoratest
+Patch005: gdb-6.3-threaded-watchpoints2-20050225.patch
+
+# Verify printing of inherited members test
+#=fedoratest
+Patch006: gdb-6.3-inheritancetest-20050726.patch
+
+# Support TLS symbols (+`errno' suggestion if no pthread is found) (BZ 185337).
+#=push+jan: It should be replaced by Infinity project.
+Patch007: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
+
+# Fix TLS symbols resolving for shared libraries with a relative pathname.
+# The testsuite needs `gdb-6.5-tls-of-separate-debuginfo.patch'.
+#=fedoratest: One should recheck if it is really fixed upstream.
+Patch008: gdb-6.5-sharedlibrary-path.patch
+
+# Improved testsuite results by the testsuite provided by the courtesy of BEA.
+#=fedoratest: For upstream it should be rewritten as a dejagnu test, the test of no "??" was useful.
+Patch009: gdb-6.5-BEA-testsuite.patch
+
+# Testcase for deadlocking on last address space byte; for corrupted backtraces.
+#=fedoratest
+Patch010: gdb-6.5-last-address-space-byte-test.patch
+
+# Fix readline segfault on excessively long hand-typed lines.
+#=fedoratest
+Patch011: gdb-6.5-readline-long-line-crash-test.patch
+
+# Test sideeffects of skipping ppc .so libs trampolines (BZ 218379).
+#=fedoratest
+Patch012: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
+
+# Find symbols properly at their original (included) file (BZ 109921).
+#=fedoratest
+Patch013: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
+
+# Update PPC unwinding patches to their upstream variants (BZ 140532).
+#=fedoratest
+Patch014: gdb-6.3-bz140532-ppc-unwinding-test.patch
+
+# Testcase for exec() from threaded program (BZ 202689).
+#=fedoratest
+Patch015: gdb-6.3-bz202689-exec-from-pthread-test.patch
+
+# Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
+#=fedoratest
+Patch016: gdb-6.6-bz230000-power6-disassembly-test.patch
+
+# Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
+#=fedoratest
+Patch017: gdb-6.6-bz229517-gcore-without-terminal.patch
+
+# Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
+#=fedoratest
+Patch018: gdb-6.6-testsuite-timeouts.patch
+
+# Support for stepping over PPC atomic instruction sequences (BZ 237572).
+#=fedoratest
+Patch019: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
+
+# Test kernel VDSO decoding while attaching to an i386 process.
+#=fedoratest
+Patch020: gdb-6.3-attach-see-vdso-test.patch
+
+# Test leftover zombie process (BZ 243845).
+#=fedoratest
+Patch021: gdb-6.5-bz243845-stale-testing-zombie-test.patch
+
+# New locating of the matching binaries from the pure core file (build-id).
+#=push+jan
+Patch022: gdb-6.6-buildid-locate.patch
+
+# Fix loading of core files without build-ids but with build-ids in executables.
+# Load strictly build-id-checked core files only if no executable is specified
+# (Jan Kratochvil, RH BZ 1339862).
+#=push+jan
+Patch023: gdb-6.6-buildid-locate-solib-missing-ids.patch
+
+#=push+jan
+Patch024: gdb-6.6-buildid-locate-rpm.patch
+
+# Fix displaying of numeric char arrays as strings (BZ 224128).
+#=fedoratest: But it is failing anyway, one should check the behavior more.
+Patch025: gdb-6.7-charsign-test.patch
+
+# Test PPC hiding of call-volatile parameter register.
+#=fedoratest
+Patch026: gdb-6.7-ppc-clobbered-registers-O2-test.patch
+
+# Testsuite fixes for more stable/comparable results.
+#=fedoratest
+Patch027: gdb-6.7-testsuite-stable-results.patch
+
+# Test ia64 memory leaks of the code using libunwind.
+#=fedoratest
+Patch028: gdb-6.5-ia64-libunwind-leak-test.patch
+
+# Test hiding unexpected breakpoints on intentional step commands.
+#=fedoratest
+Patch029: gdb-6.5-missed-trap-on-step-test.patch
+
+# Test gcore memory and time requirements for large inferiors.
+#=fedoratest
+Patch030: gdb-6.5-gcore-buffer-limit-test.patch
+
+# Test GCORE for shmid 0 shared memory mappings.
+#=fedoratest: But it is broken anyway, sometimes the case being tested is not reproducible.
+Patch031: gdb-6.3-mapping-zero-inode-test.patch
+
+# Test a crash on `focus cmd', `focus prev' commands.
+#=fedoratest
+Patch032: gdb-6.3-focus-cmd-prev-test.patch
+
+# Test various forms of threads tracking across exec() (BZ 442765).
+#=fedoratest
+Patch033: gdb-6.8-bz442765-threaded-exec-test.patch
+
+# Test a crash on libraries missing the .text section.
+#=fedoratest
+Patch034: gdb-6.5-section-num-fixup-test.patch
+
+# Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
+#=fedoratest
+Patch035: gdb-6.8-bz466901-backtrace-full-prelinked.patch
+
+# New test for step-resume breakpoint placed in multiple threads at once.
+#=fedoratest
+Patch036: gdb-simultaneous-step-resume-breakpoint-test.patch
+
+# Fix GNU/Linux core open: Can't read pathname for load map: Input/output error.
+# Fix regression of undisplayed missing shared libraries caused by a fix for.
+#=fedoratest: It should be in glibc: libc-alpha: <20091004161706.GA27450@.*>
+Patch037: gdb-core-open-vdso-warning.patch
+
+# Workaround ccache making lineno non-zero for command-line definitions.
+#=fedoratest: ccache is rarely used and it is even fixed now.
+Patch038: gdb-ccache-workaround.patch
+
+# Testcase for "Do not make up line information" fix by Daniel Jacobowitz.
+#=fedoratest
+Patch039: gdb-lineno-makeup-test.patch
+
+# Test power7 ppc disassembly.
+#=fedoratest
+Patch040: gdb-ppc-power7-test.patch
+
+# Fix follow-exec for C++ programs (bugreported by Martin Stransky).
+#=fedoratest
+Patch041: gdb-archer-next-over-throw-cxx-exec.patch
+
+# Backport DWARF-4 support (BZ 601887, Tom Tromey).
+#=fedoratest
+Patch042: gdb-bz601887-dwarf4-rh-test.patch
+
+# Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
+#=push+jan
+Patch043: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+
+# [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
+#=fedoratest
+Patch044: gdb-test-bt-cfi-without-die.patch
+
+# Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
+#=fedoratest
+Patch045: gdb-bz634108-solib_address.patch
+
+# New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435).
+#=fedoratest
+Patch046: gdb-test-pid0-core.patch
+
+# [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
+#=fedoratest
+Patch047: gdb-test-dw2-aranges.patch
+
+# [archer-keiths-expr-cumulative+upstream] Import C++ testcases.
+#=fedoratest
+Patch048: gdb-test-expr-cumulative-archer.patch
+
+# Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
+#=fedoratest
+Patch049: gdb-physname-pr11734-test.patch
+
+# Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
+#=fedoratest
+Patch050: gdb-physname-pr12273-test.patch
+
+# Test GDB opcodes/ disassembly of Intel Ivy Bridge instructions (BZ 696890).
+#=fedoratest
+Patch051: gdb-test-ivy-bridge.patch
+
+# Hack for proper PIE run of the testsuite.
+#=fedoratest
+Patch052: gdb-runtest-pie-override.patch
+
+# Workaround PR libc/14166 for inferior calls of strstr.
+#=fedoratest: Compatibility with RHELs (unchecked which ones).
+Patch053: gdb-glibc-strstr-workaround.patch
+
+# Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789).
+#=fedoratest
+Patch054: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
+
+# Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
+#=fedoratest
+Patch055: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+
+# Import regression test for `gdb/findvar.c:417: internal-error:
+# read_var_value: Assertion `frame' failed.' (RH BZ 947564) from RHEL 6.5.
+#=fedoratest
+Patch056: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+
+# Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
+#=fedoratest
+Patch057: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+
+# Fix 'gdb gives highly misleading error when debuginfo pkg is present,
+# but not corresponding binary pkg' (RH BZ 981154).
+#=push+jan
+Patch058: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+
+# Display Fortran strings in backtraces.
+#=fedoratest
+Patch059: gdb-fortran-frame-string.patch
+
+# Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
+# crash.' (RH BZ 1156192).
+#=fedoratest
+Patch060: gdb-rhbz1156192-recursive-dlopen-test.patch
+
+# Fix '`catch syscall' doesn't work for parent after `fork' is called'
+# (Philippe Waroquiers, RH BZ 1149205).
+#=fedoratest
+Patch061: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+
+# Fix 'backport GDB 7.4 fix to RHEL 6.6 GDB' [Original Sourceware bug
+# description: 'C++ (and objc): Internal error on unqualified name
+# re-set', PR 11657] (RH BZ 1186476).
+#=fedoratest
+Patch062: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+
+# Test 'info type-printers' Python error (RH BZ 1350436).
+#=fedoratest
+Patch063: gdb-rhbz1350436-type-printers-error.patch
+
+# Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
+# Kratochvil, RH BZ 1084404).
+#=fedoratest
+Patch064: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+
+# Force libncursesw over libncurses to match the includes (RH BZ 1270534).
+#=push+jan
+Patch065: gdb-fedora-libncursesw.patch
+
+# Test clflushopt instruction decode (for RH BZ 1262471).
+#=fedoratest
+Patch066: gdb-opcodes-clflushopt-test.patch
+
+# [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
+#=push+jan
+Patch067: gdb-6.6-buildid-locate-rpm-scl.patch
+
+# [aarch64] Fix hardware watchpoints (RH BZ 1261564).
+#=fedoratest
+Patch068: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+
+# Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
+#=fedora
+Patch069: gdb-container-rh-pkg.patch
+
+# New test for Python "Cannot locate object file for block" (for RH BZ 1325795).
+#=fedoratest
+Patch070: gdb-rhbz1325795-framefilters-test.patch
+
+# [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
+#=fedora
+Patch071: gdb-linux_perf-bundle.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
+Patch072: gdb-libexec-add-index.patch
+
+# New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
+#=fedoratest
+Patch073: gdb-rhbz1398387-tab-crash-test.patch
+
+# [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
+# =fedoratest
+Patch074: gdb-rhbz1553104-s390x-arch12-test.patch
+
+#Backport upstream patch which fixes internal-error: Unexpected
+#type field location kind (RHBZ 1976887).
+Patch075: gdb-rhbz1976887-field-location-kind.patch
+
+# Backport test for RHBZ 1976887 (Kevin Buettner).
+Patch076: gdb-test-for-rhbz1976887.patch
+
+# Backport gdb.fortran testsuite changes in order to avoid Fortran
+# lexical analyzer bug.
+Patch077: gdb-rhbz2012976-paper-over-fortran-lex-problems.patch
+
+# Backport manpage update
+Patch078: gdb-rhbz-853071-update-manpages.patch
+
+# Backport fix for dprintf bug (RH BZ 2022177).
+Patch079: gdb-rhbz2022177-dprintf-1.patch
+
+# Backport test case for dprintf bug (RH BZ 2022177).
+Patch080: gdb-rhbz2022177-dprintf-2.patch
+
+#Backport upstream commit from Aaron Merey
+#3ea44f21299 gdb.texinfo: Expand documentation for debuginfod
+Patch081: gdb-rhbz2024875-expand-documentation-for-debuginfod.patch
+
+#Backport upstream commit from Aaron Merey
+#7811fa5995f gdb: add set/show commands for managing debuginfo
+Patch082: gdb-rhbz2024875-set_show-for-managing-debuginfod.patch
+
+#Backport upstream commit from Tom Tromey
+#2a8f1f47446 Fix unittest.exp failure due to 'set debuginfod' addition
+Patch083: gdb-rhbz2024875-fix-unittest-failure.patch
+
+#Backport upstream commit from  Simon Marchi
+#333f35b6315 gdb: pass/return setting setter/getter
+#scalar values by value
+Patch084: gdb-rhbz202487-rework-set-debuginfod.patch
+
+#Backport upstream commit from Aaron Merey
+#b9db26b4c44 [PR gdb/27026] CTRL-C is ignored when debug info is downloaded
+Patch085: gdb-rhbz2024875-pr27026.patch
+
+# Fix build problems.
+# (RHBZ 2042257, Keith Seitz, Andrew Burgess)
+Patch086: gdb-rhbz2042257-ftbs-updates.patch
+
+# Backport fix which fixes internal error due to libcc_s lacking a
+# .data section.
+Patch087: gdb-rhbz2042664-fix-sect_index_data-internal-error.patch
+
+# Backport upstream patch from Aaron Merey which suppresses debuginfod
+# progress messages when size is zero.  (RH BZ 2068280).
+Patch088: gdb-rhbz2068280-debuginfod-unavailable-size.patch
+

SOURCES/_gdb.spec.patch.include

@@ -0,0 +1,88 @@
+%patch001 -p1
+%patch002 -p1
+%patch003 -p1
+%patch004 -p1
+%patch005 -p1
+%patch006 -p1
+%patch007 -p1
+%patch008 -p1
+%patch009 -p1
+%patch010 -p1
+%patch011 -p1
+%patch012 -p1
+%patch013 -p1
+%patch014 -p1
+%patch015 -p1
+%patch016 -p1
+%patch017 -p1
+%patch018 -p1
+%patch019 -p1
+%patch020 -p1
+%patch021 -p1
+%patch022 -p1
+%patch023 -p1
+%patch024 -p1
+%patch025 -p1
+%patch026 -p1
+%patch027 -p1
+%patch028 -p1
+%patch029 -p1
+%patch030 -p1
+%patch031 -p1
+%patch032 -p1
+%patch033 -p1
+%patch034 -p1
+%patch035 -p1
+%patch036 -p1
+%patch037 -p1
+%patch038 -p1
+%patch039 -p1
+%patch040 -p1
+%patch041 -p1
+%patch042 -p1
+%patch043 -p1
+%patch044 -p1
+%patch045 -p1
+%patch046 -p1
+%patch047 -p1
+%patch048 -p1
+%patch049 -p1
+%patch050 -p1
+%patch051 -p1
+%patch052 -p1
+%patch053 -p1
+%patch054 -p1
+%patch055 -p1
+%patch056 -p1
+%patch057 -p1
+%patch058 -p1
+%patch059 -p1
+%patch060 -p1
+%patch061 -p1
+%patch062 -p1
+%patch063 -p1
+%patch064 -p1
+%patch065 -p1
+%patch066 -p1
+%patch067 -p1
+%patch068 -p1
+%patch069 -p1
+%patch070 -p1
+%patch071 -p1
+%patch072 -p1
+%patch073 -p1
+%patch074 -p1
+%patch075 -p1
+%patch076 -p1
+%patch077 -p1
+%patch078 -p1
+%patch079 -p1
+%patch080 -p1
+%patch081 -p1
+%patch082 -p1
+%patch083 -p1
+%patch084 -p1
+%patch085 -p1
+%patch086 -p1
+%patch087 -p1
+%patch088 -p1

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

@@ -0,0 +1,120 @@
+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.3-attach-see-vdso-test.patch
+
+;; Test kernel VDSO decoding while attaching to an i386 process.
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.base/attach-see-vdso.c b/gdb/testsuite/gdb.base/attach-see-vdso.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/attach-see-vdso.c
+@@ -0,0 +1,25 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   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. */
++
++#include <unistd.h>
++
++int main ()
++{
++  pause ();
++  return 1;
++}
+diff --git a/gdb/testsuite/gdb.base/attach-see-vdso.exp b/gdb/testsuite/gdb.base/attach-see-vdso.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/attach-see-vdso.exp
+@@ -0,0 +1,77 @@
++# 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.
++
++# This file was created by Jan Kratochvil <jan.kratochvil@redhat.com>.
++
++# This test only works on Linux
++if { ![istarget "*-*-linux-gnu*"] } {
++    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}]
++set escapedbinfile  [string_to_regexp [standard_output_file ${testfile}]]
++
++# The kernel VDSO is used for the syscalls returns only on i386 (not x86_64).
++#
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-m32}] != "" } {
++    gdb_suppress_entire_file "Testcase nonthraded compile failed, so all tests in this file will automatically fail."
++}
++
++if [get_compiler_info ${binfile}] {
++    return -1
++}
++
++# Start the program running and then wait for a bit, to be sure
++# that it can be attached to.
++
++set testpid [eval exec $binfile &]
++
++# Avoid some race:
++sleep 2
++
++# Start with clean gdb
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++# Never call: gdb_load ${binfile}
++# as the former problem would not reproduce otherwise.
++
++set test "attach"
++gdb_test_multiple "attach $testpid" "$test" {
++    -re "Attaching to process $testpid\r?\n.*$gdb_prompt $" {
++	pass "$test"
++    }
++}
++
++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

@@ -0,0 +1,320 @@
+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.3-bz140532-ppc-unwinding-test.patch
+
+;; Update PPC unwinding patches to their upstream variants (BZ 140532).
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.arch/powerpc-bcl-prologue-asm32.S b/gdb/testsuite/gdb.arch/powerpc-bcl-prologue-asm32.S
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/powerpc-bcl-prologue-asm32.S
+@@ -0,0 +1,78 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   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. */
++
++	.section	".text"
++	.align 2
++	.globl func0
++	.type	func0, @function
++func0:
++	stwu 1,-16(1)
++	mflr 0
++	stw 31,12(1)
++	stw 0,20(1)
++	mr 31,1
++	bl abort
++	.size	func0, .-func0
++	.align 2
++	.globl func1
++	.type	func1, @function
++func1:
++	stwu 1,-16(1)
++	mflr 0
++/* 20 = BO = branch always
++   31 = BI = CR bit (ignored)  */
++	bcl 20,31,.Lpie
++.Lpie:	stw 31,12(1)
++	stw 0,20(1)
++	mr 31,1
++	bl func0
++	mr 0,3
++	lis 9,var@ha
++	lwz 9,var@l(9)
++	add 0,0,9
++	mr 3,0
++	lwz 11,0(1)
++	lwz 0,4(11)
++	mtlr 0
++	lwz 31,-4(11)
++	mr 1,11
++	blr
++	.size	func1, .-func1
++	.section	.note.GNU-stack,"",@progbits
++	.ident	"GCC: (GNU) 3.4.6 20060404 (Red Hat 3.4.6-8)"
++
++/* Original source file:
++
++#include <stdlib.h>
++
++extern volatile int var;
++
++int func0 (void) __attribute__((__noinline__));
++int func0 (void)
++{
++  abort ();
++  return var;
++}
++
++int func1 (void) __attribute__((__noinline__));
++int func1 (void)
++{
++  return func0 () + var;
++}
++
++*/
+diff --git a/gdb/testsuite/gdb.arch/powerpc-bcl-prologue-asm64.S b/gdb/testsuite/gdb.arch/powerpc-bcl-prologue-asm64.S
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/powerpc-bcl-prologue-asm64.S
+@@ -0,0 +1,98 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   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. */
++
++	.section	".toc","aw"
++	.section	".text"
++	.align 2
++	.globl func0
++	.section	".opd","aw"
++	.align 3
++func0:
++	.quad	.L.func0,.TOC.@tocbase
++	.previous
++	.type	func0, @function
++.L.func0:
++	mflr 0
++	std 31,-8(1)
++	std 0,16(1)
++	stdu 1,-128(1)
++	mr 31,1
++	bl abort
++	nop
++	.long 0
++	.byte 0,0,0,1,128,1,0,1
++	.size	func0,.-.L.func0
++	.section	".toc","aw"
++.LC1:
++	.tc var[TC],var
++	.section	".text"
++	.align 2
++	.globl func1
++	.section	".opd","aw"
++	.align 3
++func1:
++	.quad	.L.func1,.TOC.@tocbase
++	.previous
++	.type	func1, @function
++.L.func1:
++	mflr 0
++/* 20 = BO = branch always
++   31 = BI = CR bit (ignored)  */
++	bcl 20,31,.Lpie
++.Lpie:	std 31,-8(1)
++	std 0,16(1)
++	stdu 1,-128(1)
++	mr 31,1
++	bl func0
++	mr 11,3
++	ld 9,.LC1@toc(2)
++	lwz 0,0(9)
++	add 0,11,0
++	extsw 0,0
++	mr 3,0
++	ld 1,0(1)
++	ld 0,16(1)
++	mtlr 0
++	ld 31,-8(1)
++	blr
++	.long 0
++	.byte 0,0,0,1,128,1,0,1
++	.size	func1,.-.L.func1
++	.section	.note.GNU-stack,"",@progbits
++	.ident	"GCC: (GNU) 3.4.6 20060404 (Red Hat 3.4.6-8)"
++
++/* Original source file:
++
++#include <stdlib.h>
++
++extern volatile int var;
++
++int func0 (void) __attribute__((__noinline__));
++int func0 (void)
++{
++  abort ();
++  return var;
++}
++
++int func1 (void) __attribute__((__noinline__));
++int func1 (void)
++{
++  return func0 () + var;
++}
++
++*/
+diff --git a/gdb/testsuite/gdb.arch/powerpc-bcl-prologue.c b/gdb/testsuite/gdb.arch/powerpc-bcl-prologue.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/powerpc-bcl-prologue.c
+@@ -0,0 +1,29 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   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. */
++
++/* Force `-fpie' double jump bl->blrl.  */
++/* No longer used.  */
++volatile int var;
++
++extern int func1 (void);
++
++int main (void)
++{
++  func1 ();
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.arch/powerpc-bcl-prologue.exp b/gdb/testsuite/gdb.arch/powerpc-bcl-prologue.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/powerpc-bcl-prologue.exp
+@@ -0,0 +1,72 @@
++#   Copyright 2006, 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.
++
++# Test unwinding fixes of the PPC platform, specifically on the coping with BCL
++# jump of the PIE code.
++
++if ![istarget "powerpc*-*-linux*"] then {
++    verbose "Skipping powerpc-linux prologue tests."
++    return
++}
++
++set testfile "powerpc-bcl-prologue"
++set srcfile1 ${testfile}.c
++set flags "debug"
++if [istarget "powerpc-*"] then {
++    set srcfile2 ${testfile}-asm32.S
++    set flags "$flags additional_flags=-m32"
++} elseif [istarget "powerpc64-*"] then {
++    set srcfile2 ${testfile}-asm64.S
++    set flags "$flags additional_flags=-m64"
++} else {
++   fail "powerpc arch test"
++   return
++}
++set objfile2 [standard_output_file ${testfile}-asm.o]
++set binfile [standard_output_file ${testfile}]
++
++if { [gdb_compile "${srcdir}/${subdir}/${srcfile1} ${srcdir}/${subdir}/${srcfile2}" ${binfile} executable $flags] != ""} {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++# We should stop in abort(3).
++
++gdb_run_cmd
++
++gdb_test_multiple {} "continue to abort()" {
++    -re ".*Program received signal SIGABRT,.*$gdb_prompt $" {
++       pass "continue to abort()"
++    }
++}
++
++# Check backtrace:
++# #3  0x0804835f in func0 ()
++# #4  0x0804836a in func1 ()
++# #5  0x0804838c in main ()
++# (gdb)
++# `\\.?' prefixes are needed for ppc64 without `debug' (another bug).
++
++set test "matching unwind"
++gdb_test_multiple "backtrace" $test {
++    -re "\r\n#\[0-9\]\[^\r\n\]* in \\.?func0 \\(\[^\r\n\]*\r\n#\[0-9\]\[^\r\n\]* in \\.?func1 \\(\[^\r\n\]*\r\n#\[0-9\]\[^\r\n\]* in \\.?main \\(\[^\r\n\]*\r\n$gdb_prompt $" {
++	pass $test
++    }
++}
+diff --git a/gdb/testsuite/gdb.arch/powerpc-prologue.exp b/gdb/testsuite/gdb.arch/powerpc-prologue.exp
+--- a/gdb/testsuite/gdb.arch/powerpc-prologue.exp
++++ b/gdb/testsuite/gdb.arch/powerpc-prologue.exp
+@@ -16,8 +16,9 @@
+ # Test PowerPC prologue analyzer.
+ 
+ # Do not run on AIX (where we won't be able to build the tests without
+-# some surgery) or on PowerPC64 (ditto, dot symbols).
+-if {[istarget *-*-aix*] || ![istarget "powerpc-*-*"]} then {
++# some surgery).  PowerPC64 target would break due to dot symbols but we build
++# there PowerPC32 inferior.
++if {[istarget *-*-aix*] || ![istarget "powerpc*-*-*"]} then {
+     verbose "Skipping PowerPC prologue tests."
+     return
+ }

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

@@ -0,0 +1,109 @@
+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.3-bz202689-exec-from-pthread-test.patch
+
+;; Testcase for exec() from threaded program (BZ 202689).
+;;=fedoratest
+
+2007-01-17  Jan Kratochvil <jan.kratochvil@redhat.com>
+
+	* gdb.threads/threaded-exec.exp, gdb.threads/threaded-exec.c: New files.
+
+diff --git a/gdb/testsuite/gdb.threads/threaded-exec.c b/gdb/testsuite/gdb.threads/threaded-exec.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/threaded-exec.c
+@@ -0,0 +1,46 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   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.  */
++
++#include <stddef.h>
++#include <pthread.h>
++#include <assert.h>
++#include <stdlib.h>
++#include <unistd.h>
++
++
++static void *
++threader (void *arg)
++{
++	return NULL;
++}
++
++int
++main (void)
++{
++	pthread_t t1;
++	int i;
++
++	i = pthread_create (&t1, NULL, threader, (void *) NULL);
++	assert (i == 0);
++	i = pthread_join (t1, NULL);
++	assert (i == 0);
++
++	execl ("/bin/true", "/bin/true", NULL);
++	abort ();
++}
+diff --git a/gdb/testsuite/gdb.threads/threaded-exec.exp b/gdb/testsuite/gdb.threads/threaded-exec.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/threaded-exec.exp
+@@ -0,0 +1,41 @@
++# threaded-exec.exp -- Check reset of the tracked threads on exec*(2)
++# Copyright (C) 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.
++
++# Please email any bugs, comments, and/or additions to this file to:
++# bug-gdb@prep.ai.mit.edu
++
++set testfile threaded-exec
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++
++if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable []] != "" } {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++
++gdb_load ${binfile}
++
++gdb_run_cmd
++
++gdb_test_multiple {} "Program exited" {
++   -re "\r\n\\\[Inferior .* exited normally\\\]\r\n$gdb_prompt $" {
++       pass "Program exited"
++   }
++}

SOURCES/gdb-6.3-focus-cmd-prev-test.patch

@@ -0,0 +1,53 @@
+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.3-focus-cmd-prev-test.patch
+
+;; Test a crash on `focus cmd', `focus prev' commands.
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.base/focus-cmd-prev.exp b/gdb/testsuite/gdb.base/focus-cmd-prev.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/focus-cmd-prev.exp
+@@ -0,0 +1,40 @@
++# 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 $tracelevel then {
++    strace $tracelevel
++}
++
++gdb_exit
++gdb_start
++
++# Do not use gdb_test or \r\n there since:
++# commit d7e747318f4d04af033f16325f9b6d74f67079ec
++#     Eliminate make_cleanup_ui_file_delete / make ui_file a class hierarchy
++
++set test "focus cmd"
++gdb_test_multiple $test $test {
++    -re "$gdb_prompt $" {
++	pass $test
++    }
++}
++
++set test "focus prev"
++gdb_test_multiple $test $test {
++    -re "$gdb_prompt $" {
++	pass $test
++    }
++}

SOURCES/gdb-6.3-gstack-20050411.patch

@@ -0,0 +1,258 @@
+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-gstack-20050411.patch
+
+;; Add a wrapper script to GDB that implements pstack using the
+;; --readnever option.
+;;=push
+
+2004-11-23  Andrew Cagney  <cagney@redhat.com>
+
+	* Makefile.in (uninstall-gstack, install-gstack): New rules, add
+	to install and uninstall.
+	* gstack.sh, gstack.1: New files.
+
+diff --git a/gdb/Makefile.in b/gdb/Makefile.in
+--- a/gdb/Makefile.in
++++ b/gdb/Makefile.in
+@@ -1753,7 +1753,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
+ install: all
+ 	@$(MAKE) $(FLAGS_TO_PASS) install-only
+ 
+-install-only: $(CONFIG_INSTALL)
++install-only: install-gstack $(CONFIG_INSTALL)
+ 	transformed_name=`t='$(program_transform_name)'; \
+ 			  echo gdb | sed -e "$$t"` ; \
+ 		if test "x$$transformed_name" = x; then \
+@@ -1802,7 +1802,25 @@ install-guile:
+ install-python:
+ 	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_DATADIR)/python/gdb
+ 
+-uninstall: force $(CONFIG_UNINSTALL)
++GSTACK=gstack
++.PHONY: install-gstack
++install-gstack:
++	transformed_name=`t='$(program_transform_name)'; \
++			  echo $(GSTACK) | sed -e "$$t"` ; \
++		if test "x$$transformed_name" = x; then \
++		  transformed_name=$(GSTACK) ; \
++		else \
++		  true ; \
++		fi ; \
++		$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) ; \
++		$(INSTALL_PROGRAM) $(srcdir)/$(GSTACK).sh \
++			$(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \
++		: $(SHELL) $(srcdir)/../mkinstalldirs \
++			$(DESTDIR)$(man1dir) ; \
++		: $(INSTALL_DATA) $(srcdir)/gstack.1 \
++			$(DESTDIR)$(man1dir)/$$transformed_name.1
++
++uninstall: force uninstall-gstack $(CONFIG_UNINSTALL)
+ 	transformed_name=`t='$(program_transform_name)'; \
+ 			  echo gdb | sed -e $$t` ; \
+ 		if test "x$$transformed_name" = x; then \
+@@ -1825,6 +1843,18 @@ uninstall: force $(CONFIG_UNINSTALL)
+ 	fi
+ 	@$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
+ 
++.PHONY: uninstall-gstack
++uninstall-gstack:
++	transformed_name=`t='$(program_transform_name)'; \
++			  echo $(GSTACK) | sed -e $$t` ; \
++		if test "x$$transformed_name" = x; then \
++		  transformed_name=$(GSTACK) ; \
++		else \
++		  true ; \
++		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
+diff --git a/gdb/gstack.sh b/gdb/gstack.sh
+new file mode 100644
+--- /dev/null
++++ b/gdb/gstack.sh
+@@ -0,0 +1,43 @@
++#!/bin/sh
++
++if test $# -ne 1; then
++    echo "Usage: `basename $0 .sh` <process-id>" 1>&2
++    exit 1
++fi
++
++if test ! -r /proc/$1; then
++    echo "Process $1 not found." 1>&2
++    exit 1
++fi
++
++# GDB doesn't allow "thread apply all bt" when the process isn't
++# threaded; need to peek at the process to determine if that or the
++# simpler "bt" should be used.
++
++backtrace="bt"
++if test -d /proc/$1/task ; then
++    # Newer kernel; has a task/ directory.
++    if test `/bin/ls /proc/$1/task | /usr/bin/wc -l` -gt 1 2>/dev/null ; then
++	backtrace="thread apply all bt"
++    fi
++elif test -f /proc/$1/maps ; then
++    # Older kernel; go by it loading libpthread.
++    if /bin/grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
++	backtrace="thread apply all bt"
++    fi
++fi
++
++GDB=${GDB:-gdb}
++
++# 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 |
++set width 0
++set height 0
++set pagination no
++$backtrace
++EOF
++/bin/sed -n \
++    -e 's/^\((gdb) \)*//' \
++    -e '/^#/p' \
++    -e '/^Thread/p'
+diff --git a/gdb/testsuite/gdb.base/gstack.c b/gdb/testsuite/gdb.base/gstack.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gstack.c
+@@ -0,0 +1,43 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2005, 2007, 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/>.  */
++
++#include <stdio.h>
++#include <unistd.h>
++#include <string.h>
++
++void
++func (void)
++{
++  const char msg[] = "looping\n";
++
++  /* Use the most simple notification not to get caught by attach on exiting
++     the function.  */
++  write (1, msg, strlen (msg));
++
++  for (;;);
++}
++
++int
++main (void)
++{
++  alarm (60);
++  nice (100);
++
++  func ();
++
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/gstack.exp b/gdb/testsuite/gdb.base/gstack.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gstack.exp
+@@ -0,0 +1,84 @@
++# Copyright (C) 2012 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 gstack
++set executable ${testfile}
++set binfile [standard_output_file $executable]
++if {[build_executable ${testfile} ${executable} "" {debug}] == -1} {
++    return -1
++}
++
++set test "spawn inferior"
++set command "${binfile}"
++set res [remote_spawn host $command];
++if { $res < 0 || $res == "" } {
++    perror "Spawning $command failed."
++    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 {
++    -re "looping\r\n" {
++	pass $test
++    }
++    eof {
++	fail "$test (eof)"
++	return
++    }
++    timeout {
++	fail "$test (timeout)"
++	return
++    }
++}
++
++# 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.
++
++set test "spawn gstack"
++set command "sh -c GDB=$GDB\\ GDBARGS=-data-directory\\\\\\ $BUILD_DATA_DIRECTORY\\ sh\\ ${srcdir}/../gstack.sh\\ $pid\\;echo\\ GSTACK-END"
++set res [remote_spawn host $command];
++if { $res < 0 || $res == "" } {
++    perror "Spawning $command failed."
++    fail $test
++}
++
++set gdb_spawn_id $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_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

SOURCES/gdb-6.3-inheritancetest-20050726.patch

@@ -0,0 +1,160 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Jeff Johnston <jjohnstn@redhat.com>
+Date: Fri, 27 Oct 2017 21:07:50 +0200
+Subject: gdb-6.3-inheritancetest-20050726.patch
+
+;; Verify printing of inherited members test
+;;=fedoratest
+
+2005-07-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* gdb.cp/b146835.exp: New testcase.
+	* gdb.cp/b146835.cc: Ditto.
+	* gdb.cp/b146835b.cc: Ditto.
+	* gdb.cp/b146835.h: Ditto.
+
+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 @@
++#include "b146835.h"
++#include <iostream>
++
++class F : public C {
++
++protected:
++
++   virtual void funcA (unsigned long a, B *b);
++   virtual void funcB (E *e);
++   virtual void funcC (unsigned long x, bool y);
++
++   char *s1, *s2;
++   bool b1;
++   int k;
++
++public:
++   void foo() {
++       std::cout << "foo" << std::endl;
++   }
++};
++
++
++void F::funcA (unsigned long a, B *b) {}
++void F::funcB (E *e) {}
++void F::funcC (unsigned long x, bool y) {}
++
++int  main()
++{
++   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
++++ b/gdb/testsuite/gdb.cp/b146835.exp
+@@ -0,0 +1,47 @@
++# This testcase is part of GDB, the GNU debugger.
++
++# 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.
++
++# Check that GDB can properly print an inherited member variable
++# (Bugzilla 146835)
++
++set testfile "b146835"
++set srcfile ${testfile}.cc
++set srcfile2 ${testfile}b.cc
++set binfile [standard_output_file ${testfile}]
++if {[gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcdir}/${subdir}/${srcfile2}" "${binfile}" executable {debug c++}] != "" } {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++#
++# Run to `main' where we begin our tests.
++#
++
++if ![runto_main] then {
++    gdb_suppress_tests
++}
++
++gdb_test "break 'F::foo()'" ""
++gdb_continue_to_breakpoint "First line foo"
++
++# Verify that we can access the inherited member d
++gdb_test "p d" " = \\(D \\*\\) *0x0" "Verify inherited member d accessible"
+diff --git a/gdb/testsuite/gdb.cp/b146835.h b/gdb/testsuite/gdb.cp/b146835.h
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/b146835.h
+@@ -0,0 +1,36 @@
++
++class A {
++
++protected:
++
++   virtual void funcA (unsigned long a, class B *b) = 0;
++   virtual void funcB (class E *e) = 0;
++   virtual void funcC (unsigned long x, bool y) = 0;
++
++   void funcD (class E *e, class D* d);
++   virtual void funcE (E *e, D *d);
++   virtual void funcF (unsigned long x, D *d);
++};
++
++
++class C : public A {
++
++protected:
++
++   int x;
++   class K *k;
++   class H *h;
++
++   D *d;
++
++   class W *w;
++   class N *n;
++   class L *l;
++   unsigned long *r;
++
++public:
++
++   C();
++   int z (char *s);
++   virtual ~C();
++};
+diff --git a/gdb/testsuite/gdb.cp/b146835b.cc b/gdb/testsuite/gdb.cp/b146835b.cc
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/b146835b.cc
+@@ -0,0 +1,11 @@
++#include "b146835.h"
++
++C::C() { d = 0; x = 3; }
++
++int C::z (char *s) { return 0; }
++
++C::~C() {}
++
++void A::funcD (class E *e, class D *d) {}
++void A::funcE (E *e, D *d) {}
++void A::funcF (unsigned long x, D *d) {}

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

@@ -0,0 +1,247 @@
+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.3-mapping-zero-inode-test.patch
+
+;; Test GCORE for shmid 0 shared memory mappings.
+;;=fedoratest: But it is broken anyway, sometimes the case being tested is not reproducible.
+
+diff --git a/gdb/testsuite/gdb.base/gcore-shmid0.c b/gdb/testsuite/gdb.base/gcore-shmid0.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gcore-shmid0.c
+@@ -0,0 +1,128 @@
++/* Copyright 2007, 2009 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 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.  */
++
++/*
++ * Test GDB's handling of gcore for mapping with a name but zero inode.
++ */
++
++#include <sys/ipc.h>
++#include <sys/shm.h>
++#include <stdio.h>
++#include <errno.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <assert.h>
++#include <time.h>
++
++/* The same test running in a parallel testsuite may steal us the zero SID,
++   even if we never get any EEXIST.  Just try a while.  */
++
++#define TIMEOUT_SEC 10
++
++static volatile int v;
++
++static void
++initialized (void)
++{
++  v++;
++}
++
++static void
++unresolved (void)
++{
++  v++;
++}
++
++int
++main (void)
++{
++  int sid;
++  unsigned int *addr = (void *) -1L;
++  int attempt, round = 0;
++  time_t ts_start, ts;
++
++  if (time (&ts_start) == (time_t) -1)
++    {
++      printf ("time (): %m\n");
++      exit (1);
++    }
++
++  /* The generated SID will cycle with an increment of 32768, attempt until it
++   * wraps to 0.  */
++
++  for (attempt = 0; addr == (void *) -1L; attempt++)
++    {
++      /* kernel-2.6.25-8.fc9.x86_64 just never returns the value 0 by
++	 shmget(2).  shmget returns SID range 0..1<<31 in steps of 32768,
++	 0x1000 should be enough but wrap the range it to be sure.  */
++
++      if (attempt > 0x21000)
++        {
++	  if (time (&ts) == (time_t) -1)
++	    {
++	      printf ("time (): %m\n");
++	      exit (1);
++	    }
++
++	  if (ts >= ts_start && ts < ts_start + TIMEOUT_SEC)
++	    {
++	      attempt = 0;
++	      round++;
++	      continue;
++	    }
++
++	  printf ("Problem is not reproducible on this kernel (attempt %d, "
++		  "round %d)\n", attempt, round);
++	  unresolved ();
++	  exit (1);
++	}
++
++      sid = shmget ((key_t) rand (), 0x1000, IPC_CREAT | IPC_EXCL | 0777);
++      if (sid == -1)
++	{
++	  if (errno == EEXIST)
++	    continue;
++
++	  printf ("shmget (%d, 0x1000, IPC_CREAT): errno %d\n", 0, errno);
++	  exit (1);
++	}
++
++      /* Use SID only if it is 0, retry it otherwise.  */
++
++      if (sid == 0)
++	{
++	  addr = shmat (sid, NULL, SHM_RND);
++	  if (addr == (void *) -1L)
++	    {
++	      printf ("shmat (%d, NULL, SHM_RND): errno %d\n", sid,
++		      errno);
++	      exit (1);
++	    }
++	}
++      if (shmctl (sid, IPC_RMID, NULL) != 0)
++	{
++	  printf ("shmctl (%d, IPC_RMID, NULL): errno %d\n", sid, errno);
++	  exit (1);
++	}
++    }
++
++  initialized ();
++
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/gcore-shmid0.exp b/gdb/testsuite/gdb.base/gcore-shmid0.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gcore-shmid0.exp
+@@ -0,0 +1,101 @@
++# Copyright 2007, 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 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.
++
++# Test GDB's handling of gcore for mapping with a name but zero inode.
++
++if { [prepare_for_testing gcore-shmid0.exp gcore-shmid0] } {
++    return -1
++}
++
++# Does this gdb support gcore?
++set test "help gcore"
++gdb_test_multiple $test $test {
++    -re "Undefined command: .gcore.*$gdb_prompt $" {
++	# gcore command not supported -- nothing to test here.
++	unsupported "gdb does not support gcore on this target"
++	return -1;
++    }
++    -re "Save a core file .*$gdb_prompt $" {
++	pass $test
++    }
++}
++
++if { ! [ runto_main ] } then {
++    untested gcore-shmid0.exp
++    return -1
++}
++
++gdb_breakpoint "initialized"
++gdb_breakpoint "unresolved"
++
++set oldtimeout $timeout
++set timeout [expr $oldtimeout + 120]
++
++set test "Continue to initialized."
++gdb_test_multiple "continue" $test {
++    -re "Breakpoint .*, initialized .* at .*\r\n$gdb_prompt $" {
++	pass $test
++    }
++    -re "Breakpoint .*, unresolved .* at .*\r\n$gdb_prompt $" {
++	set timeout $oldtimeout
++	unsupported $test
++	return -1
++    }
++}
++set timeout $oldtimeout
++
++set escapedfilename [string_to_regexp [standard_output_file gcore-shmid0.test]]
++
++set test "save a corefile"
++gdb_test_multiple "gcore [standard_output_file gcore-shmid0.test]" $test {
++    -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
++	pass $test
++    }
++    -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" {
++	unsupported $test
++    }
++}
++
++# Be sure to remove the handle first.
++# But it would get removed even on a kill by GDB as the handle is already
++# deleted, just it is still attached.
++gdb_continue_to_end "finish"
++
++set test "core-file command"
++gdb_test_multiple "core-file [standard_output_file gcore-shmid0.test]" $test {
++    -re ".* program is being debugged already.*y or n. $" {
++	# gdb_load may connect us to a gdbserver.
++	send_gdb "y\n"
++	exp_continue;
++    }
++    -re "Core was generated by .*\r\n\#0  .*\\\(\\\).*\r\n$gdb_prompt $" {
++	# The filename does not fit there anyway so do not check it.
++	pass $test
++    }
++    -re ".*registers from core file: File in wrong format.* $" {
++	fail "core-file command (could not read registers from core file)"
++    }
++}
++
++set test "backtrace"
++gdb_test_multiple "bt" $test {
++    -re "#0 *initialized \\\(\\\) at .*#1 .* main \\\(.*$gdb_prompt $" {
++	pass $test
++    }
++    -re "#0 *initialized \\\(\\\) at .*Cannot access memory at address .*$gdb_prompt $" {
++	fail $test
++    }
++}

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

@@ -0,0 +1,38 @@
+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-rh-testversion-20041202.patch
+
+;; Match the Fedora's version info.
+;;=fedora
+
+2003-02-24  Elena Zannoni  <ezannoni@redhat.com>
+
+        * gdb.gdb/selftest.exp: Add matching on specific Red Hat only version
+        string.
+
+diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
+--- a/gdb/testsuite/gdb.gdb/selftest.exp
++++ b/gdb/testsuite/gdb.gdb/selftest.exp
+@@ -53,6 +53,9 @@ proc test_with_self { } {
+ 	-re ".\[0-9\]+ = +.+ +0x.*\[0-9.\]+.*$gdb_prompt $" {
+ 	    pass "printed version with cast"
+ 	}
++	-re ".\[0-9\]+ = .(Fedora|Red Hat Enterprise Linux) \[\\(\\)0-9.a-z\\-\]+.*$gdb_prompt $" {
++	    pass "printed version Fedora or Red Hat Enterprise Linux only"
++	}
+     }
+ 
+     # start the "xgdb" process
+diff --git a/gdb/top.c b/gdb/top.c
+--- a/gdb/top.c
++++ b/gdb/top.c
+@@ -2195,7 +2195,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, "Fedora %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

@@ -0,0 +1,247 @@
+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.3-test-dtorfix-20050121.patch
+
+;; Test support of multiple destructors just like multiple constructors
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.cp/constructortest.cc b/gdb/testsuite/gdb.cp/constructortest.cc
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/constructortest.cc
+@@ -0,0 +1,99 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   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.  */
++
++class A
++{
++  public:
++    A();
++    ~A();
++    int  k;
++  private:
++    int  x;
++};
++
++class B: public A
++{
++  public:
++    B();
++  private:
++    int  y;
++};
++
++/* C and D are for the $delete destructor.  */
++
++class C
++{
++  public:
++    C();
++    virtual ~C();
++  private:
++    int  x;
++};
++
++class D: public C
++{
++  public:
++    D();
++  private:
++    int  y;
++};
++
++int main(int argc, char *argv[])
++{
++  A* a = new A;
++  B* b = new B;
++  D* d = new D;
++  delete a;
++  delete b;
++  delete d;
++  return 0;
++}
++
++A::A() /* Constructor A */
++{
++   x = 1; /* First line A */
++   k = 4; /* Second line A */
++}
++
++A::~A() /* Destructor A */
++{
++   x = 3; /* First line ~A */
++   k = 6; /* Second line ~A */
++}
++
++B::B()
++{
++   y = 2; /* First line B */
++   k = 5;
++}
++
++C::C() /* Constructor C */
++{
++   x = 1; /* First line C */
++}
++
++C::~C() /* Destructor C */
++{
++   x = 3; /* First line ~C */
++}
++
++D::D()
++{
++   y = 2; /* First line D */
++}
+diff --git a/gdb/testsuite/gdb.cp/constructortest.exp b/gdb/testsuite/gdb.cp/constructortest.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/constructortest.exp
+@@ -0,0 +1,130 @@
++# This testcase is part of GDB, the GNU debugger.
++
++# Copyright 2005, 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.
++
++# Check that GDB can break at multiple forms of constructors.
++
++set testfile "constructortest"
++set srcfile ${testfile}.cc
++set binfile [standard_output_file ${testfile}]
++# PIE is required for testing proper BREAKPOINT_RE_SET of the multiple-PC
++# breakpoints.
++if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++ "additional_flags=-fpie -pie"}] != "" } {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++#
++# Run to `main' where we begin our tests.
++#
++
++if ![runto_main] then {
++    gdb_suppress_tests
++}
++
++# 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"
++gdb_test "bt" "#0.*A.*#1.*main.*" "Verify in in-charge A::A"
++gdb_continue_to_breakpoint "First line A"
++gdb_test "bt" "#0.*A.*#1.*B.*#2.*main.*" "Verify in not-in-charge A::A"
++
++# Now do the same for destructors
++gdb_test "break 'A::~A()'" ""
++
++# Verify that we break for the A destructor two times
++# Once for delete a and once for delete b
++gdb_continue_to_breakpoint "First line ~A"
++gdb_test "bt" "#0.*~A.*#1.*main.*" "Verify in in-charge A::~A"
++gdb_continue_to_breakpoint "First line ~A"
++gdb_test "bt" "#0.*~A.*#1.*~B.*#2.*main.*" "Verify in not-in-charge A::~A"
++
++
++# Verify that we can break by line number in a constructor and find
++# both occurrences
++runto_main
++gdb_test "break 'A::A()'" "" "break in constructor A 2"
++gdb_continue_to_breakpoint "First line A"
++set second_line [gdb_get_line_number "Second line A"]
++# " (2 locations)" is displayed depending on G++ version.
++gdb_test "break $second_line" "Breakpoint .*, line $second_line\\..*" "break by line in constructor"
++gdb_continue_to_breakpoint "Second line A"
++gdb_test "bt" "#0.*A.*#1.*main.*" "Verify in in-charge A::A second line"
++gdb_continue_to_breakpoint "Second line A"
++gdb_test "bt" "#0.*A.*#1.*B.*#2.*main.*" "Verify in not-in-charge A::A second line"
++
++# Verify that we can break by line number in a destructor and find
++# both occurrences
++gdb_test "break 'A::~A()'" "" "break in constructor ~A 2"
++gdb_continue_to_breakpoint "First line ~A"
++set second_line_dtor [gdb_get_line_number "Second line ~A"]
++# " (2 locations)" is displayed depending on G++ version.
++gdb_test "break $second_line_dtor" "Breakpoint .*, line $second_line_dtor\\..*" "break by line in destructor"
++gdb_continue_to_breakpoint "Second line ~A"
++gdb_test "bt" "#0.*A.*#1.*main.*" "Verify in in-charge A::~A second line"
++# FIXME: Analyse this case better.
++gdb_continue_to_breakpoint "Second line ~A"
++gdb_test "bt" "#0.*A.*#1.*main.*" "Verify in A::~A second line #2"
++gdb_continue_to_breakpoint "Second line ~A"
++gdb_test "bt" "#0.*A.*#1.*B.*#2.*main.*" "Verify in not-in-charge A::~A second line"
++
++
++# Test now the $delete destructors.
++
++gdb_load ${binfile}
++runto_main
++
++set first_line_dtor [gdb_get_line_number "First line ~C"]
++set define_line_dtor [gdb_get_line_number "Destructor C"]
++# Break on the various forms of the C::~C destructor
++# " ([23] locations)" is displayed depending on G++ version.
++gdb_test "break C\:\:~C" "Breakpoint .*: C::~C\\. \\(2 locations\\)" "breaking on C::~C"
++gdb_continue_to_breakpoint "First line ~C"
++
++# Verify that we can break by line number in a destructor and find
++# the $delete occurence
++
++gdb_load ${binfile}
++delete_breakpoints
++
++# " (3 locations)" is displayed depending on G++ version.
++gdb_test "break $first_line_dtor" "Breakpoint .*, line $first_line_dtor\\..*" "break by line in destructor"
++
++# Run to `main' where we begin our tests.
++# Set the breakpoints first to test PIE multiple-PC BREAKPOINT_RE_SET.
++# RUNTO_MAIN or RUNTO MAIN are not usable here as it runs DELETE_BREAKPOINTS.
++
++if ![gdb_breakpoint main] {
++    gdb_suppress_tests
++}
++gdb_run_cmd
++set test "running to main"
++gdb_test_multiple "" $test {
++    -re "Breakpoint \[0-9\]*, main .*$gdb_prompt $" {
++	pass $test
++    }
++}
++
++gdb_continue_to_breakpoint "First line ~C"

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

@@ -0,0 +1,101 @@
+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-movedir-20050125.patch
+
+;; Fix to support executable moving
+;;=fedoratest
+
+2005-01-25  Elena Zannoni  <ezannoni@redhat.com>
+
+        * gdb.base/move-dir.exp: New test.
+        * gdb.base/move-dir.c: Ditto.
+        * gdb.base/move-dir.h: Ditto.
+
+diff --git a/gdb/testsuite/gdb.base/move-dir.c b/gdb/testsuite/gdb.base/move-dir.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/move-dir.c
+@@ -0,0 +1,9 @@
++#include <stdio.h>
++#include <stdlib.h>
++#include "move-dir.h"
++
++int main() {
++   const char* hw = "hello world.";
++   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
++++ b/gdb/testsuite/gdb.base/move-dir.exp
+@@ -0,0 +1,57 @@
++#   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.
++
++set testfile "move-dir"
++set srcfile ${testfile}.c
++set incfile ${testfile}.h
++set binfile [standard_output_file ${testfile}]
++
++set testdir [standard_output_file incdir]
++
++remote_exec build "mkdir $testdir"
++remote_exec build "cp ${srcdir}/${subdir}/${srcfile} [standard_output_file ${srcfile}]"
++remote_exec build "cp ${srcdir}/${subdir}/${incfile} [standard_output_file ${incfile}]"
++
++set additional_flags "additional_flags=-I${subdir}/incdir"
++
++if  { [gdb_compile [standard_output_file ${srcfile}] "${binfile}" executable [list debug $additional_flags]] != "" } {
++    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
++}
++
++# Create and source the file that provides information about the compiler
++# used to compile the test case.
++
++if [get_compiler_info ${binfile}] {
++    return -1;
++}
++
++
++set oldtimeout $timeout
++set timeout [expr "$timeout + 60"]
++
++# Start with a fresh gdb.
++
++gdb_exit
++gdb_start
++gdb_test "cd ../.." "" ""
++gdb_load ${binfile}
++gdb_test "list main" ".*hw.*other.*" "found main"
++gdb_test "list other" ".*ostring.*" "found include file"
++
++
++set timeout $oldtimeout
++return 0
+diff --git a/gdb/testsuite/gdb.base/move-dir.h b/gdb/testsuite/gdb.base/move-dir.h
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/move-dir.h
+@@ -0,0 +1,6 @@
++#include <stdlib.h>
++
++void other() {
++  const char* ostring = "other";
++  printf ("%s\n", ostring);;
++}

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

@@ -0,0 +1,253 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Jeff Johnston <jjohnstn@redhat.com>
+Date: Fri, 27 Oct 2017 21:07:50 +0200
+Subject: gdb-6.3-threaded-watchpoints2-20050225.patch
+
+;; Test sibling threads to set threaded watchpoints for x86 and x86-64
+;;=fedoratest
+
+2005-02-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* config/i386/nm-linux.h: Change dr register routines to
+	accept a ptid_t first argument.  Change all calling macros
+	to default the inferior_ptid for the first argument.
+	(i386_linux_insert_watchpoint): New prototype.
+	(i386_linux_remove_watchpoint, i386_linux_insert_hw_breakpoint): Ditto.
+	(i386_linux_remove_hw_breakpoint): Ditto.
+	(target_insert_watchpoint, target_remove_watchpoint): Undef and
+	override.
+	(target_insert_hw_breakpoint, target_remove_hw_breakpoint): Ditto.
+	* config/i386/nm-linux64.h: Ditto except add amd64 versions of
+	the watchpoint/hw-breakpoint insert/remove routines.
+	* i386-nat.c: Include "inferior.h" to define inferior_ptid.
+	* i386-linux-nat.c: Change all dr get/set routines to accept
+	ptid_t as first argument and to use this argument to determine
+	the tid for PTRACE.
+	(i386_linux_set_debug_regs_for_thread): New function.
+	(i386_linux_sync_debug_registers_callback): Ditto.
+	(i386_linux_sync_debug_registers_across_threads): Ditto.
+	(i386_linux_insert_watchpoint, i386_linux_remove_watchpoint): Ditto.
+	(i386_linux_hw_breakpoint, i386_linux_remove_hw_breakpoint): Ditto.
+	(i386_linux_new_thread): Ditto.
+	(_initialize_i386_linux_nat): Ditto.
+	* amd64-linux-nat.c: Change all dr get/set routines to accept
+	ptid_t as first argument and to use this argument to determine
+	the tid for PTRACE.
+	(amd64_linux_set_debug_regs_for_thread): New function.
+	(amd64_linux_sync_debug_registers_callback): Ditto.
+	(amd64_linux_sync_debug_registers_across_threads): Ditto.
+	(amd64_linux_insert_watchpoint, amd64_linux_remove_watchpoint): Ditto.
+	(amd64_linux_hw_breakpoint, amd64_linux_remove_hw_breakpoint): Ditto.
+	(amd64_linux_new_thread): Ditto.
+	(_initialize_amd64_linux_nat): Register linux new thread observer.
+	* testsuite/gdb.threads/watchthreads-threaded.c: New test case.
+	* testsuite/gdb.threads/watchthreads-threaded.exp: Ditto.
+
+[ With recent upstream GDB (6.8) reduced only to the testcase.  ]
+
+[ It was called watchthreads2.{exp,c} before but it conflicted with FSF GDB new
+  testcase of the same name.  ]
+
+FIXME: The testcase does not expects multiple watchpoints hits per one stop.
+
+diff --git a/gdb/testsuite/gdb.threads/watchthreads-threaded.c b/gdb/testsuite/gdb.threads/watchthreads-threaded.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/watchthreads-threaded.c
+@@ -0,0 +1,65 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2002, 2003, 2004, 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.
++
++   This file is copied from schedlock.c.  */
++
++#include <stdio.h>
++#include <unistd.h>
++#include <stdlib.h>
++#include <pthread.h>
++
++void *thread_function(void *arg); /* Pointer to function executed by each thread */
++
++#define NUM 5
++
++unsigned int args[NUM+1];
++
++int main() {
++    int res;
++    pthread_t threads[NUM];
++    void *thread_result;
++    long i;
++
++    for (i = 0; i < NUM; i++)
++      {
++	args[i] = 1; /* Init value.  */
++	res = pthread_create(&threads[i],
++		             NULL,
++			     thread_function,
++			     (void *) i);
++      }
++
++    args[i] = 1;
++    thread_function ((void *) i);
++
++    exit(EXIT_SUCCESS);
++}
++
++void *thread_function(void *arg) {
++    int my_number =  (long) arg;
++    int *myp = (int *) &args[my_number];
++
++    /* Don't run forever.  Run just short of it :)  */
++    while (*myp > 0)
++      {
++	(*myp) ++; usleep (1); /* Loop increment.  */
++      }
++
++    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
++++ b/gdb/testsuite/gdb.threads/watchthreads-threaded.exp
+@@ -0,0 +1,126 @@
++# This testcase is part of GDB, the GNU debugger.
++
++# 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.
++
++# Check that GDB can support multiple watchpoints across threads.
++
++# This test verifies that a watchpoint is detected in the proper thread
++# so the test is only meaningful on a system with hardware watchpoints.
++if [target_info exists gdb,no_hardware_watchpoints] {
++    return 0;
++}
++
++set testfile "watchthreads-threaded"
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++gdb_test "set can-use-hw-watchpoints 1" "" ""
++
++#
++# Run to `main' where we begin our tests.
++#
++
++if ![runto_main] then {
++    gdb_suppress_tests
++}
++
++set args_2 0
++set args_3 0
++
++gdb_breakpoint "thread_function"
++gdb_continue_to_breakpoint "thread_function"
++gdb_test "disable 2" ""
++
++gdb_test_multiple "p args\[2\]" "get initial args2" {
++  -re "\\\$\[0-9\]* = (.*)$gdb_prompt $" {
++    set init_args_2 $expect_out(1,string)
++    pass "get initial args2"
++  }
++}
++
++gdb_test_multiple "p args\[3\]" "get initial args3" {
++  -re "\\\$\[0-9\]* = (.*)$gdb_prompt $" {
++    set init_args_3 $expect_out(1,string)
++    pass "get initial args3"
++  }
++}
++
++set args_2 $init_args_2
++set args_3 $init_args_3
++
++# Watch values that will be modified by distinct threads.
++gdb_test "watch args\[2\]" "Hardware watchpoint 3: args\\\[2\\\]"
++gdb_test "watch args\[3\]" "Hardware watchpoint 4: args\\\[3\\\]"
++
++set init_line [expr [gdb_get_line_number "Init value"]+1]
++set inc_line [gdb_get_line_number "Loop increment"]
++
++# Loop and continue to allow both watchpoints to be triggered.
++for {set i 0} {$i < 30} {incr i} {
++  set test_flag 0
++  gdb_test_multiple "continue" "threaded watch loop" {
++    -re "Hardware watchpoint 3: args\\\[2\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads-threaded.c:$init_line.*$gdb_prompt $"
++       { 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 $"
++       { 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 $"
++       { set args_3 [expr $args_3+1]; set test_flag 1 }
++  }
++  # If we fail above, don't bother continuing loop
++  if { $test_flag == 0 } {
++    set i 30;
++  }
++}
++
++# Print success message if loop succeeded.
++if { $test_flag == 1 } {
++  pass "threaded watch loop"
++}
++
++# Verify that we hit first watchpoint in child thread.
++set message "watchpoint on args\[2\] hit in thread"
++if { $args_2 > 1 } {
++  pass $message
++} else {
++  fail $message
++}
++
++# Verify that we hit second watchpoint in child thread.
++set message "watchpoint on args\[3\] hit in thread"
++if { $args_3 > 1 } {
++  pass $message
++} else {
++  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
++} else {
++  fail $message
++}

SOURCES/gdb-6.5-BEA-testsuite.patch

@@ -0,0 +1,938 @@
+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-BEA-testsuite.patch
+
+;; Improved testsuite results by the testsuite provided by the courtesy of BEA.
+;;=fedoratest: For upstream it should be rewritten as a dejagnu test, the test of no "??" was useful.
+
+diff --git a/gdb/testsuite/gdb.threads/threadcrash.c b/gdb/testsuite/gdb.threads/threadcrash.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/threadcrash.c
+@@ -0,0 +1,301 @@
++/*
++ * The point of this program is to crash in a multi-threaded app.
++ * There are seven threads, doing the following things:
++ * * Spinning
++ * * Spinning inside a signal handler
++ * * Spinning inside a signal handler executing on the altstack
++ * * In a syscall
++ * * In a syscall inside a signal handler
++ * * In a syscall inside a signal handler executing on the altstack
++ * * Finally, the main thread crashes in main, with no frills.
++ *
++ * These are the things threads in JRockit tend to be doing.  If gdb
++ * can handle those things, both in core files and during live
++ * debugging, that will help (at least) JRockit development.
++ *
++ * Let the program create a core file, then load the core file into
++ * 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
++ * #2  0x0804898f in syscallingSighandler (signo=10, info=0xb6be76f0, context=0xb6be7770)
++ *     at threadcrash.c:168
++ * #3  <signal handler called>
++ * #4  0x006adf5e in pthread_kill () from /lib/tls/libpthread.so.0
++ * #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
++ * #2  0x08048936 in syscallingAltSighandler (signo=3, info=0x959cd70, context=0x959cdf0)
++ *     at threadcrash.c:144
++ * #3  <signal handler called>
++ * #4  0x006adf5e in pthread_kill () from /lib/tls/libpthread.so.0
++ * #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>
++ * #2  0x006adf5e in pthread_kill () from /lib/tls/libpthread.so.0
++ * #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>
++ * #2  0x006adf5e in pthread_kill () from /lib/tls/libpthread.so.0
++ * #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)
++ */
++
++#include <pthread.h>
++#include <signal.h>
++#include <assert.h>
++#include <unistd.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#define SIGSYSCALL_ALT SIGQUIT
++#define SIGSYSCALL SIGUSR1
++#define SIGSPIN_ALT SIGALRM
++#define SIGSPIN SIGUSR2
++
++typedef void (*sigaction_t)(int, siginfo_t *, void *);
++
++static void installHandler(int signo, sigaction_t handler, int onAltstack) {
++   struct sigaction action;
++   sigset_t sigset;
++   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);
++      altstack.ss_size = SIGSTKSZ;
++      altstack.ss_flags = 0;
++      result = sigaltstack(&altstack, &oldaltstack);
++      assert(result == 0);
++      assert(oldaltstack.ss_flags == SS_DISABLE);
++   }
++
++   sigemptyset(&sigset);
++
++   action.sa_handler = NULL;
++   action.sa_sigaction = handler;
++   action.sa_mask = sigset;
++   action.sa_flags = SA_SIGINFO;
++   if (onAltstack) {
++      action.sa_flags |= SA_ONSTACK;
++   }
++
++   result = sigaction(signo, &action, NULL);
++   assert(result == 0);
++}
++
++static void installNormalHandler(int signo, sigaction_t handler) {
++   installHandler(signo, handler, 0);
++}
++
++static void installAlthandler(int signo, sigaction_t handler) {
++   installHandler(signo, handler, 1);
++}
++
++static void *makeSyscall(void *ignored) {
++   (void)ignored;
++
++   sleep(42);
++
++   fprintf(stderr, "%s: returning\n", __FUNCTION__);
++   return NULL;
++}
++
++/* Return true if we're currently executing on the altstack */
++static int onAltstack(void) {
++   stack_t stack;
++   int result;
++
++   result = sigaltstack(NULL, &stack);
++   assert(result == 0);
++
++   return stack.ss_flags & SS_ONSTACK;
++}
++
++static void syscallingAltSighandler(int signo, siginfo_t *info, void *context) {
++   (void)signo;
++   (void)info;
++   (void)context;
++
++   if (!onAltstack()) {
++      printf("%s() not running on altstack!\n", __FUNCTION__);
++   }
++
++   sleep(42);
++}
++
++static void spinningAltSighandler(int signo, siginfo_t *info, void *context) {
++   (void)signo;
++   (void)info;
++   (void)context;
++
++   if (!onAltstack()) {
++      printf("%s() not running on altstack!\n", __FUNCTION__);
++   }
++
++   while (1);
++}
++
++static void syscallingSighandler(int signo, siginfo_t *info, void *context) {
++   (void)signo;
++   (void)info;
++   (void)context;
++
++   if (onAltstack()) {
++      printf("%s() running on altstack!\n", __FUNCTION__);
++   }
++
++   sleep(42);
++}
++
++static void spinningSighandler(int signo, siginfo_t *info, void *context) {
++   (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__);
++   return NULL;
++}
++
++int main(int argc, char *argv[]) {
++   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);
++   assert(result == 0);
++   result = pthread_create(&thread, NULL, makeSyscallFromAltSighandler, NULL);
++   assert(result == 0);
++   result = pthread_create(&thread, NULL, spin, NULL);
++   assert(result == 0);
++   result = pthread_create(&thread, NULL, spinFromSighandler, NULL);
++   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;
++
++   /* Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29628
++      Simulate use to ensure `DW_AT_location' for them:
++      readelf -a --debug threadcrash|grep -A5 -w argc
++      --> DW_AT_location    : 2 byte block: 71 0     (DW_OP_breg1: 0)
++      This case verified on: gcc-4.1.1-30.i386
++      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
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/threadcrash.exp
+@@ -0,0 +1,37 @@
++# threadcrash.exp - The point of this program is to crash in a multi-threaded app.
++
++
++set testfile threadcrash
++set srcfile ${testfile}.c
++set shellfile ${srcdir}/${subdir}/${testfile}.sh
++set binfile [standard_output_file ${testfile}]
++
++set GDB_abs ${GDB}
++if [regexp "^\[^/\]" ${GDB_abs}] {
++    set GDB_abs $env(PWD)/${GDB_abs}
++}
++
++if [istarget "*-*-linux"] then {
++    set target_cflags "-D_MIT_POSIX_THREADS"
++} else {
++    set target_cflags ""
++}
++
++if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
++    return -1
++}
++
++# ${shellfile} argument must not contain any directories.
++set fd [open "|bash ${shellfile} ${binfile} $GDB $INTERNAL_GDBFLAGS $GDBFLAGS [host_info gdb_opts]" r]
++while { [gets $fd line] >= 0 } {
++    if [regexp " PASS: (.*)$" $line trash message] {
++	pass $message
++    } elseif [regexp " FAIL: (.*)$" $line trash message] {
++	fail $message
++    }
++}
++catch {
++    close $fd
++}
++
++return 0
+diff --git a/gdb/testsuite/gdb.threads/threadcrash.sh b/gdb/testsuite/gdb.threads/threadcrash.sh
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/threadcrash.sh
+@@ -0,0 +1,324 @@
++#! /bin/bash
++
++# NOTE: threadcrash.c *must* be built with debugging symbols
++#
++# The point of this shell script is to crash treadcrash.c, load the
++# resulting core file into gdb and verify that gdb can extract enough
++# information from the core file.
++#
++# The return code from this script is the number of failed tests.
++
++LOG=gdbresult.log
++
++if [ $# = 0 ] ; then
++    echo >&2 Syntax: $0 \<name of threadcrash binary\> [\<gdb binary\> \<args...\>]
++    exit 1
++fi
++RUNME="$1"
++shift
++GDB="${*:-gdb}"
++
++
++pf_prefix=""
++function pf_prefix() {
++	pf_prefix="$*"
++}
++
++set_test=""
++function set_test() {
++	if [ -n "$set_test" ] ; then
++		echo >&2 "DEJAGNU-BASH ERROR: set_test already set"
++		exit 1
++	fi
++	set_test="$*"
++	if [ -n "$pf_prefix" ] ; then
++		set_test="$pf_prefix: $set_test"
++	fi
++}
++
++# INTERNAL
++function record_test {
++	if [ -z "$set_test" ] ; then
++		echo >&2 "DEJAGNU-BASH ERROR: set_test not set"
++		exit 1
++	fi
++	# Provide the leading whitespace delimiter:
++	echo " $1: $set_test"
++	set_test=""
++}
++
++function pass() {
++	record_test PASS
++}
++function fail() {
++	record_test FAIL
++}
++
++
++# Verify that the gdb output doesn't contain $1.
++function mustNotHave() {
++    local BADWORD=$1
++    set_test gdb output contains "$BADWORD"
++    if grep -q "$BADWORD" $LOG ; then
++        fail
++        return 1
++    fi
++    pass
++    return 0
++}
++
++# Verify that the gdb output contains exactly $1 $2s.
++function mustHaveCorrectAmount() {
++    local WANTEDNUMBER=$1
++    local GOODWORD=$2
++    local ACTUALNUMBER=$(grep "$GOODWORD" $LOG | wc -l)
++    set_test gdb output contained $ACTUALNUMBER \""$GOODWORD"\", not $WANTEDNUMBER as expected
++    if [ $ACTUALNUMBER != $WANTEDNUMBER ] ; then
++        fail
++        return 1
++    fi
++    pass
++    return 0
++}
++
++# Verify that the gdb output contains seven threads
++function mustHaveSevenThreads() {
++    NTHREADS=$(egrep "^Thread [1-7] \(" $LOG | wc -l)
++    set_test gdb output contains $NTHREADS threads, not 7 as expected
++    if [ $NTHREADS != 7 ] ; then
++        fail
++        return 1
++    fi
++    pass
++    return 0
++}
++
++# Verify that the gdb output has all parameters on consecutive lines
++function mustHaveSequence() {
++    SEQUENCE="$*"
++    NPARTS=$#
++    grep "$1" -A$((NPARTS - 1)) $LOG > matches.log
++
++    while [ $# -gt 1 ] ; do
++        shift
++        ((NPARTS--))
++        grep "$1" -A$((NPARTS - 1)) matches.log > temp.log
++        mv temp.log matches.log
++    done
++    LASTPART=$1
++
++    set_test gdb output does not contain the sequence: $SEQUENCE
++    if ! grep -q "$LASTPART" matches.log ; then
++        fail
++        return 1
++    fi
++    pass
++    return 0
++}
++
++# 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
++}
++
++# Put result of debugging a core file in $LOG
++function getLogFromCore() {
++    # Make sure we get a core file
++    set_test Make sure we get a core file
++    if ! ulimit -c unlimited ; then
++        fail
++        exit 1
++    fi
++    pass
++
++    # Run the crasher
++    ./$(basename "$RUNME")
++    EXITCODE=$?
++
++    # Verify that we actually crashed
++    set_test $RUNME should have been killed by a signal, got non-signal exit code $EXITCODE
++    if [ $EXITCODE -lt 128 ] ; then
++        fail
++        exit 1
++    fi
++    pass
++
++    # Verify that we got a core file
++    set_test $RUNME did not create a core file
++    if [ ! -r core* ] ; then
++        fail
++        exit 1
++    fi
++    pass
++
++    # Run gdb
++    cat > gdbscript.gdb <<EOF
++set width 0
++t a a bt 100
++quit
++EOF
++    cat gdbscript.gdb /dev/zero | $GDB -nx "./$(basename "$RUNME")" core* > $LOG
++    EXITCODE=$?
++
++    set_test gdb exited with error code
++    if [ $EXITCODE != 0 ] ; then
++        ((FAILURES++))
++        echo >&2 gdb exited with error code $EXITCODE
++	fail
++    fi
++    pass
++}
++
++# Put result of debugging a gcore file in $LOG
++function getLogFromGcore() {
++    # Create the core file
++    rm -f core*
++    cat > gdbscript.gdb <<EOF
++handle SIGQUIT pass noprint nostop
++handle SIGUSR1 pass noprint nostop
++handle SIGUSR2 pass noprint nostop
++handle SIGALRM pass noprint nostop
++run
++gcore
++quit
++EOF
++    cat gdbscript.gdb /dev/zero | $GDB -nx "./$(basename "$RUNME")" > /dev/null
++    EXITCODE=$?
++
++    set_test gdb exited with error code when creating gcore file
++    if [ $EXITCODE != 0 ] ; then
++        ((FAILURES++))
++        echo >&2 gdb exited with error code $EXITCODE when creating gcore file
++	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
++        fail
++        exit 1
++    fi
++    pass
++
++    # Run gdb on the gcore file
++    cat > gdbscript.gdb <<EOF
++set width 0
++t a a bt 100
++quit
++EOF
++    cat gdbscript.gdb /dev/zero | $GDB -nx "./$(basename "$RUNME")" core* > $LOG
++    EXITCODE=$?
++
++    set_test gdb exited with error code when examining gcore file
++    if [ $EXITCODE != 0 ] ; then
++        ((FAILURES++))
++        echo >&2 gdb exited with error code $EXITCODE when examining gcore file
++	fail
++    fi
++    pass
++}
++
++# Put result of debugging a core file in $LOG
++function getLogFromLiveProcess() {
++    # Run gdb
++    cat > gdbscript.gdb <<EOF
++handle SIGQUIT pass noprint nostop
++handle SIGUSR1 pass noprint nostop
++handle SIGUSR2 pass noprint nostop
++handle SIGALRM pass noprint nostop
++set width 0
++run
++t a a bt 100
++quit
++EOF
++    cat gdbscript.gdb /dev/zero | $GDB -nx "./$(basename "$RUNME")" > $LOG
++    EXITCODE=$?
++
++    set_test gdb exited with error code
++    if [ $EXITCODE != 0 ] ; then
++        ((FAILURES++))
++        echo >&2 gdb exited with error code $EXITCODE
++	fail
++    fi
++    pass
++}
++
++####### Main program follows #####################
++
++# Make sure we don't clobber anybody else's (core) file(s)
++WORKDIR=/tmp/$PPID
++mkdir -p $WORKDIR
++cp "$RUNME" $WORKDIR
++cd $WORKDIR
++
++# Count problems
++FAILURES=0
++
++echo === Testing gdb vs core file...
++pf_prefix core file
++getLogFromCore
++verifyLog
++((FAILURES+=$?))
++pf_prefix
++echo === Core file tests done.
++
++echo
++
++echo === Testing gdb vs gcore file...
++pf_prefix gcore file
++getLogFromGcore
++verifyLog
++((FAILURES+=$?))
++pf_prefix
++echo === Gcore file tests done.
++
++echo
++
++echo === Testing gdb vs live process...
++pf_prefix live process
++getLogFromLiveProcess
++verifyLog
++((FAILURES+=$?))
++pf_prefix
++echo === Live process tests done.
++
++# Executive summary
++echo
++if [ $FAILURES == 0 ] ; then
++    echo All tests passed!
++else
++    echo $FAILURES tests failed!
++    echo
++    echo Make sure the threadcrash binary contains debugging information \(build with \"gcc -g\"\).
++fi
++
++# Clean up
++cd /
++rm -rf $WORKDIR
++
++exit $FAILURES
+diff --git a/gdb/testsuite/gdb.threads/threadcrash.sh-orig b/gdb/testsuite/gdb.threads/threadcrash.sh-orig
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/threadcrash.sh-orig
+@@ -0,0 +1,248 @@
++#! /bin/bash
++
++# NOTE: threadcrash.c *must* be built with debugging symbols
++#
++# The point of this shell script is to crash treadcrash.c, load the
++# resulting core file into gdb and verify that gdb can extract enough
++# information from the core file.
++#
++# The return code from this script is the number of failed tests.
++
++LOG=gdbresult.log
++
++if [ $# != 1 ] ; then
++    echo > /dev/stderr Syntax: $0 \<name of threadcrash binary\>
++    exit 1
++fi
++RUNME="$1"
++
++# Verify that the gdb output doesn't contain $1.
++function mustNotHave() {
++    local BADWORD=$1
++    if grep -q "$BADWORD" $LOG ; then
++        echo >> /dev/stderr WARNING: gdb output contains "$BADWORD"
++        return 1
++    fi
++    return 0
++}
++
++# Verify that the gdb output contains exactly $1 $2s.
++function mustHaveCorrectAmount() {
++    local WANTEDNUMBER=$1
++    local GOODWORD=$2
++    local ACTUALNUMBER=$(grep "$GOODWORD" $LOG | wc -l)
++    if [ $ACTUALNUMBER != $WANTEDNUMBER ] ; then
++        echo >> /dev/stderr WARNING: gdb output contained $ACTUALNUMBER \""$GOODWORD"\", not $WANTEDNUMBER as expected
++        return 1
++    fi
++    return 0
++}
++
++# Verify that the gdb output contains seven threads
++function mustHaveSevenThreads() {
++    NTHREADS=$(egrep "^Thread [1-7] \(" $LOG | wc -l)
++    if [ $NTHREADS != 7 ] ; then
++        echo >> /dev/stderr WARNING: gdb output contains $NTHREADS threads, not 7 as expected
++        return 1
++    fi
++    return 0
++}
++
++# Verify that the gdb output has all parameters on consecutive lines
++function mustHaveSequence() {
++    SEQUENCE="$*"
++    NPARTS=$#
++    grep "$1" -A$((NPARTS - 1)) $LOG > matches.log
++
++    while [ $# -gt 1 ] ; do
++        shift
++        ((NPARTS--))
++        grep "$1" -A$((NPARTS - 1)) matches.log > temp.log
++        mv temp.log matches.log
++    done
++    LASTPART=$1
++
++    if ! grep -q "$LASTPART" matches.log ; then
++        echo >> /dev/stderr WARNING: gdb output does not contain the sequence: $SEQUENCE
++        return 1
++    fi
++    return 0
++}
++
++# 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
++}
++
++# Put result of debugging a core file in $LOG
++function getLogFromCore() {
++    # Make sure we get a core file
++    ulimit -c unlimited || exit 1
++
++    # Run the crasher
++    ./$(basename "$RUNME")
++    EXITCODE=$?
++
++    # Verify that we actually crashed
++    if [ $EXITCODE -lt 128 ] ; then
++        echo >> /dev/stderr ERROR: $RUNME should have been killed by a signal, got non-signal exit code $EXITCODE
++        exit 1
++    fi
++
++    # Verify that we got a core file
++    if [ ! -r core* ] ; then
++        echo >> /dev/stderr ERROR: $RUNME did not create a core file
++        exit 1
++    fi
++
++    # Run gdb
++    cat > gdbscript.gdb <<EOF
++set width 0
++t a a bt 100
++quit
++EOF
++    cat gdbscript.gdb /dev/zero | gdb -nx "./$(basename "$RUNME")" core* > $LOG
++    EXITCODE=$?
++
++    if [ $EXITCODE != 0 ] ; then
++        ((FAILURES++))
++        echo >> /dev/stderr WARNING: gdb exited with error code $EXITCODE
++    fi
++}
++
++# Put result of debugging a gcore file in $LOG
++function getLogFromGcore() {
++    # Create the core file
++    rm -f core*
++    cat > gdbscript.gdb <<EOF
++handle SIGQUIT pass noprint nostop
++handle SIGUSR1 pass noprint nostop
++handle SIGUSR2 pass noprint nostop
++handle SIGALRM pass noprint nostop
++run
++gcore
++quit
++EOF
++    cat gdbscript.gdb /dev/zero | gdb -nx "./$(basename "$RUNME")" > /dev/null
++    EXITCODE=$?
++
++    if [ $EXITCODE != 0 ] ; then
++        ((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
++        exit 1
++    fi
++
++    # Run gdb on the gcore file
++    cat > gdbscript.gdb <<EOF
++set width 0
++t a a bt 100
++quit
++EOF
++    cat gdbscript.gdb /dev/zero | gdb -nx "./$(basename "$RUNME")" core* > $LOG
++    EXITCODE=$?
++
++    if [ $EXITCODE != 0 ] ; then
++        ((FAILURES++))
++        echo >> /dev/stderr WARNING: gdb exited with error code $EXITCODE when examining gcore file
++    fi
++}
++
++# Put result of debugging a core file in $LOG
++function getLogFromLiveProcess() {
++    # Run gdb
++    cat > gdbscript.gdb <<EOF
++handle SIGQUIT pass noprint nostop
++handle SIGUSR1 pass noprint nostop
++handle SIGUSR2 pass noprint nostop
++handle SIGALRM pass noprint nostop
++set width 0
++run
++t a a bt 100
++quit
++EOF
++    cat gdbscript.gdb /dev/zero | gdb -nx "./$(basename "$RUNME")" > $LOG
++    EXITCODE=$?
++
++    if [ $EXITCODE != 0 ] ; then
++        ((FAILURES++))
++        echo >> /dev/stderr WARNING: gdb exited with error code $EXITCODE
++    fi
++}
++
++####### Main program follows #####################
++
++# Make sure we don't clobber anybody else's (core) file(s)
++WORKDIR=/tmp/$PPID
++mkdir -p $WORKDIR
++cp "$RUNME" $WORKDIR
++cd $WORKDIR
++
++# Count problems
++FAILURES=0
++
++echo === Testing gdb vs core file...
++getLogFromCore
++verifyLog
++((FAILURES+=$?))
++echo === Core file tests done.
++
++echo
++
++echo === Testing gdb vs gcore file...
++getLogFromGcore
++verifyLog
++((FAILURES+=$?))
++echo === Gcore file tests done.
++
++echo
++
++echo === Testing gdb vs live process...
++getLogFromLiveProcess
++verifyLog
++((FAILURES+=$?))
++echo === Live process tests done.
++
++# Executive summary
++echo
++if [ $FAILURES == 0 ] ; then
++    echo All tests passed!
++else
++    echo $FAILURES tests failed!
++    echo
++    echo Make sure the threadcrash binary contains debugging information \(build with \"gcc -g\"\).
++fi
++
++# Clean up
++cd /
++rm -rf $WORKDIR
++
++exit $FAILURES

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

@@ -0,0 +1,134 @@
+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-bz109921-DW_AT_decl_file-test.patch
+
+;; Find symbols properly at their original (included) file (BZ 109921).
+;;=fedoratest
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=109921
+
+It is duplicite to its upstream variant:
+http://sourceware.org/ml/gdb-cvs/2007-01/msg00157.html
+http://sourceware.org/ml/gdb-patches/2007-01/msg00434.html
+2007-01-21  Jan Kratochvil  <jan.kratochvil@redhat.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.base/included.c, gdb.base/included.exp,
+	gdb.base/included.h: New files.
+
+------------------------------------------------------------------------------
+
+2007-01-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.dwarf2/dw2-included.exp, gdb.dwarf2/dw2-included.c,
+	gdb.dwarf2/dw2-included.h: New files.
+
+diff --git a/gdb/testsuite/gdb.dwarf2/dw2-included.c b/gdb/testsuite/gdb.dwarf2/dw2-included.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/dw2-included.c
+@@ -0,0 +1,26 @@
++/* 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.  */
++
++#include "dw2-included.h"
++
++int
++main()
++{
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.dwarf2/dw2-included.exp b/gdb/testsuite/gdb.dwarf2/dw2-included.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/dw2-included.exp
+@@ -0,0 +1,47 @@
++# 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.
++
++# Minimal DWARF-2 unit test
++
++# This test can only be run on targets which support DWARF-2.
++# For now pick a sampling of likely targets.
++if {![istarget *-*-linux*]
++    && ![istarget *-*-gnu*]
++    && ![istarget *-*-elf*]
++    && ![istarget *-*-openbsd*]
++    && ![istarget arm-*-eabi*]
++    && ![istarget powerpc-*-eabi*]} {
++    return 0
++}
++
++set testfile "dw2-included"
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++gdb_test "set listsize 1" ""
++gdb_test "list integer" "int integer;\r"
++gdb_test "ptype integer" "type = int\r"
++# Path varies depending on the build location.
++gdb_test "info variables integer" "\r\nFile \[^\r\n\]*/gdb.dwarf2/dw2-included.h:\r\n${decimal}:.*int integer;\r"
+diff --git a/gdb/testsuite/gdb.dwarf2/dw2-included.h b/gdb/testsuite/gdb.dwarf2/dw2-included.h
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/dw2-included.h
+@@ -0,0 +1,20 @@
++/* 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.  */
++
++int integer;

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

@@ -0,0 +1,264 @@
+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-bz185337-resolve-tls-without-debuginfo-v2.patch
+
+;; Support TLS symbols (+`errno' suggestion if no pthread is found) (BZ 185337).
+;;=push+jan: It should be replaced by Infinity project.
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=185337
+
+2008-02-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.8pre.
+
+currently for trivial nonthreaded helloworld with no debug info up to -ggdb2 you
+will get:
+        (gdb) p errno
+        [some error]
+
+* with -ggdb2 and less "errno" in fact does not exist anywhere as it was
+  compiled to "(*__errno_location ())" and the macro definition is not present.
+  Unfortunately gdb will find the TLS symbol and it will try to access it but
+  as the program has been compiled without -lpthread the TLS base register
+  (%gs on i386) is not setup and it will result in:
+        Cannot access memory at address 0x8
+
+Attached suggestion patch how to deal with the most common "errno" symbol
+for the most common under-ggdb3 compiled programs.
+
+Original patch hooked into target_translate_tls_address.  But its inferior
+call invalidates `struct frame *' in the callers - RH BZ 690908.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1166549
+
+2007-11-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* ./gdb/dwarf2read.c (read_partial_die, dwarf2_linkage_name): Prefer
+	DW_AT_MIPS_linkage_name over DW_AT_name now only for non-C.
+
+glibc-debuginfo-2.7-2.x86_64: /usr/lib/debug/lib64/libc.so.6.debug:
+  <81a2>     DW_AT_name        : (indirect string, offset: 0x280e): __errno_location
+  <81a8>     DW_AT_MIPS_linkage_name: (indirect string, offset: 0x2808): *__GI___errno_location
+
+diff --git a/gdb/printcmd.c b/gdb/printcmd.c
+--- a/gdb/printcmd.c
++++ b/gdb/printcmd.c
+@@ -1306,6 +1306,10 @@ process_print_command_args (const char *args, value_print_options *print_opts,
+ 
+   if (exp != nullptr && *exp)
+     {
++      /* '*((int *(*) (void)) __errno_location) ()' is incompatible with
++	 function descriptors.  */
++      if (target_has_execution () && strcmp (exp, "errno") == 0)
++	exp = "*(*(int *(*)(void)) __errno_location) ()";
+       /* VOIDPRINT is true to indicate that we do want to print a void
+ 	 value, so invert it for parse_expression.  */
+       expression_up expr = parse_expression (exp, nullptr, !voidprint);
+diff --git a/gdb/testsuite/gdb.dwarf2/dw2-errno.c b/gdb/testsuite/gdb.dwarf2/dw2-errno.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/dw2-errno.c
+@@ -0,0 +1,28 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2005, 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 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  */
++
++#include <errno.h>
++
++int main()
++{
++  errno = 42;
++
++  return 0;	/* breakpoint */
++}
+diff --git a/gdb/testsuite/gdb.dwarf2/dw2-errno.exp b/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
+@@ -0,0 +1,60 @@
++# 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 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 dw2-errno
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++
++proc prep {} {
++    global srcdir subdir binfile
++    gdb_exit
++    gdb_start
++    gdb_reinitialize_dir $srcdir/$subdir
++    gdb_load ${binfile}
++
++    runto_main
++
++    gdb_breakpoint [gdb_get_line_number "breakpoint"]
++    gdb_continue_to_breakpoint "breakpoint"
++}
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "additional_flags=-g2"] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++prep
++gdb_test "print errno" ".* = 42" "errno with macros=N threads=N"
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "additional_flags=-g3"] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++prep
++gdb_test "print errno" ".* = 42" "errno with macros=Y threads=N"
++
++if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "additional_flags=-g2"] != "" } {
++    return -1
++}
++prep
++gdb_test "print errno" ".* = 42" "errno with macros=N threads=Y"
++
++if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "additional_flags=-g3"] != "" } {
++    return -1
++}
++prep
++gdb_test "print errno" ".* = 42" "errno with macros=Y threads=Y"
++
++# TODO: Test the error on resolving ERRNO with only libc loaded.
++# Just how to find the current libc filename?
+diff --git a/gdb/testsuite/gdb.dwarf2/dw2-errno2.c b/gdb/testsuite/gdb.dwarf2/dw2-errno2.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/dw2-errno2.c
+@@ -0,0 +1,28 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2005, 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 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  */
++
++#include <errno.h>
++
++int main()
++{
++  errno = 42;
++
++  return 0;	/* breakpoint */
++}
+diff --git a/gdb/testsuite/gdb.dwarf2/dw2-errno2.exp b/gdb/testsuite/gdb.dwarf2/dw2-errno2.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/dw2-errno2.exp
+@@ -0,0 +1,71 @@
++# 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 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 dw2-errno2
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++
++proc prep { message {do_xfail 0} } { with_test_prefix $message {
++    global srcdir subdir binfile variant
++    gdb_exit
++    gdb_start
++    gdb_reinitialize_dir $srcdir/$subdir
++    gdb_load ${binfile}${variant}
++
++    runto_main
++
++    gdb_breakpoint [gdb_get_line_number "breakpoint"]
++    gdb_continue_to_breakpoint "breakpoint"
++
++    gdb_test "gcore ${binfile}${variant}.core" "\r\nSaved corefile .*" "gcore $variant"
++
++    gdb_test "print errno" ".* = 42"
++
++    gdb_test "kill" ".*" "kill" {Kill the program being debugged\? \(y or n\) } "y"
++    gdb_test "core-file ${binfile}${variant}.core" "\r\nCore was generated by .*" "core-file"
++    if $do_xfail {
++	setup_xfail "*-*-*"
++    }
++    gdb_test "print (int) errno" ".* = 42" "print errno for core"
++}}
++
++set variant g2thrN
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}${variant}" executable "additional_flags=-g2"] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++prep "macros=N threads=N" 1
++
++set variant g3thrN
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}${variant}" executable "additional_flags=-g3"] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++prep "macros=Y threads=N" 1
++
++set variant g2thrY
++if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}${variant}" executable "additional_flags=-g2"] != "" } {
++    return -1
++}
++prep "macros=N threads=Y"
++
++set variant g3thrY
++if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}${variant}" executable "additional_flags=-g3"] != "" } {
++    return -1
++}
++prep "macros=Y threads=Y" 1
++
++# TODO: Test the error on resolving ERRNO with only libc loaded.
++# Just how to find the current libc filename?

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

@@ -0,0 +1,107 @@
+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,59 @@
++# 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 {[use_gdb_stub]} {
++    untested "skipping test because of use_gdb_stub"
++    return -1
++}
++
++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-bz243845-stale-testing-zombie-test.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-6.5-bz243845-stale-testing-zombie-test.patch
+
+;; Test leftover zombie process (BZ 243845).
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.base/tracefork-zombie.exp b/gdb/testsuite/gdb.base/tracefork-zombie.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/tracefork-zombie.exp
+@@ -0,0 +1,76 @@
++# 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
++}
++
++# Start the program running and then wait for a bit, to be sure
++# that it can be attached to.
++
++gdb_exit
++gdb_start
++gdb_load sleep
++
++set gdb_pid [exp_pid -i [board_info host fileid]]
++set test "identified the child GDB"
++if {$gdb_pid != "" && $gdb_pid > 0} {
++    pass $test
++    verbose -log "Child GDB PID $gdb_pid"
++} else {
++    fail $test
++}
++
++set testpid [eval exec sleep 10 &]
++exec sleep 2
++
++set test "attach"
++gdb_test_multiple "attach $testpid" "$test" {
++    -re "Attaching to program.*`?.*'?, process $testpid..*$gdb_prompt $" {
++	pass "$test"
++    }
++    -re "Attaching to program.*`?.*\.exe'?, process $testpid.*\[Switching to thread $testpid\..*\].*$gdb_prompt $" {
++	# Response expected on Cygwin
++	pass "$test"
++    }
++}
++
++# Some time to let GDB spawn its testing child.
++exec sleep 2
++
++set found none
++foreach procpid [glob -directory /proc -type d {[0-9]*}] {
++    if {[catch {open $procpid/status} statusfi]} {
++	continue
++    }
++    set status [read $statusfi]
++    close $statusfi
++    if {1
++         && [regexp -line {^Name:\tgdb$} $status]
++         && [regexp -line {^PPid:\t1$} $status]
++         && [regexp -line "^TracerPid:\t$gdb_pid$" $status]} {
++	set found $procpid
++	verbose -log "Found linux_test_for_tracefork zombie PID $procpid"
++    }
++}
++set test "linux_test_for_tracefork leaves no zombie"
++if {$found eq {none}} {
++    pass $test
++} else {
++    fail $test
++}

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

@@ -0,0 +1,154 @@
+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-gcore-buffer-limit-test.patch
+
+;; Test gcore memory and time requirements for large inferiors.
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.base/gcore-excessive-memory.c b/gdb/testsuite/gdb.base/gcore-excessive-memory.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gcore-excessive-memory.c
+@@ -0,0 +1,37 @@
++/* 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 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 <unistd.h>
++#include <stdlib.h>
++
++#define MEGS 64
++
++int main()
++{
++  void *mem;
++
++  mem = malloc (MEGS * 1024ULL * 1024ULL);
++
++  for (;;)
++    sleep (1);
++
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/gcore-excessive-memory.exp b/gdb/testsuite/gdb.base/gcore-excessive-memory.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gcore-excessive-memory.exp
+@@ -0,0 +1,99 @@
++# 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
++}
++
++set testfile gcore-excessive-memory
++set srcfile ${testfile}.c
++set shfile [standard_output_file ${testfile}-gdb.sh]
++set corefile [standard_output_file ${testfile}.core]
++set binfile [standard_output_file ${testfile}]
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++
++set f [open "|getconf PAGESIZE" "r"]
++gets $f pagesize
++close $f
++
++set pid_of_bin [eval exec $binfile &]
++sleep 2
++
++# Get things started.
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++set pid_of_gdb [exp_pid -i [board_info host fileid]]
++
++gdb_test "attach $pid_of_bin" "Attaching to .*" "attach"
++gdb_test "up 99" "in main .*" "verify we can get to main"
++
++proc memory_v_pages_get {} {
++    global pid_of_gdb pagesize
++    set fd [open "/proc/$pid_of_gdb/statm"]
++    gets $fd line
++    close $fd
++    # number of pages of virtual memory
++    scan $line "%d" drs
++    return $drs
++}
++
++set pages_found [memory_v_pages_get]
++
++# It must be definitely less than `MEGS' of `gcore-excessive-memory.c'.
++set mb_gcore_reserve 4
++verbose -log "pages_found = $pages_found, mb_gcore_reserve = $mb_gcore_reserve"
++set kb_found [expr $pages_found * $pagesize / 1024]
++set kb_permit [expr $kb_found + 1 * 1024 + $mb_gcore_reserve * 1024]
++verbose -log "kb_found = $kb_found, kb_permit = $kb_permit"
++
++# Create the ulimit wrapper.
++set f [open $shfile "w"]
++puts $f "#! /bin/sh"
++puts $f "ulimit -v $kb_permit"
++puts $f "exec $GDB \"\$@\""
++close $f
++remote_exec host "chmod +x $shfile"
++
++gdb_exit
++set GDBold $GDB
++set GDB "$shfile"
++gdb_start
++set GDB $GDBold
++
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++set pid_of_gdb [exp_pid -i [board_info host fileid]]
++
++gdb_test "attach $pid_of_bin" "Attaching to .*" "attach"
++gdb_test "up 99" "in main .*" "verify we can get to main"
++
++verbose -log "kb_found before gcore = [expr [memory_v_pages_get] * $pagesize / 1024]"
++
++gdb_test "gcore $corefile" "Saved corefile \[^\n\r\]*" "Save the core file"
++
++verbose -log "kb_found after gcore = [expr [memory_v_pages_get] * $pagesize / 1024]"
++
++# Cleanup.
++exec kill -9 $pid_of_bin

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

@@ -0,0 +1,135 @@
+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-ia64-libunwind-leak-test.patch
+
+;; Test ia64 memory leaks of the code using libunwind.
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.base/unwind-leak.c b/gdb/testsuite/gdb.base/unwind-leak.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/unwind-leak.c
+@@ -0,0 +1,29 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   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.
++
++   Please email any bugs, comments, and/or additions to this file to:
++   bug-gdb@prep.ai.mit.edu  */
++
++#include <unistd.h>
++
++int main()
++{
++  for (;;)
++    alarm (0);
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/unwind-leak.exp b/gdb/testsuite/gdb.base/unwind-leak.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/unwind-leak.exp
+@@ -0,0 +1,88 @@
++# 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
++}
++
++set testfile unwind-leak
++set srcfile ${testfile}.c
++set shfile [standard_output_file ${testfile}-gdb.sh]
++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}
++
++set pid [exp_pid -i [board_info host fileid]]
++
++# For C programs, "start" should stop in main().
++
++gdb_test "start" \
++         "main \\(\\) at .*$srcfile.*" \
++         "start"
++
++set loc [gdb_get_line_number "alarm"]
++gdb_breakpoint $loc
++
++proc memory_get {} {
++    global pid
++    set fd [open "/proc/$pid/statm"]
++    gets $fd line
++    close $fd
++    # number of pages of data/stack
++    scan $line "%*d%*d%*d%*d%*d%d" drs
++    return $drs
++}
++
++set cycles 100
++# For 100 cycles it was 1308: from = 363 KB, to = 1671 KB
++set permit_kb 100
++verbose -log "cycles = $cycles, permit_kb = $permit_kb"
++
++set fail 0
++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} $" {
++	}
++	-re "Segmentation fault" {
++	    fail $test
++	    set i 0
++	    set fail 1
++	}
++    }
++    if ![info exists from] {
++	set from [memory_get]
++    }
++}
++set to [memory_get]
++if {!$fail} {
++    verbose -log "from = $from KB, to = $to KB"
++    if {$from > 0 && $to > 10 && $to < $from + $permit_kb} {
++	pass $test
++    } else {
++	fail $test
++    }
++}

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

@@ -0,0 +1,62 @@
+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-last-address-space-byte-test.patch
+
+;; Testcase for deadlocking on last address space byte; for corrupted backtraces.
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.base/largecore-last-address-lock.exp b/gdb/testsuite/gdb.base/largecore-last-address-lock.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/largecore-last-address-lock.exp
+@@ -0,0 +1,49 @@
++# 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
++}
++
++# Get things started.
++
++gdb_exit
++gdb_start
++
++# i386 (32-bit) only: gdb with Red Hat largecore patch did lock up:
++# https://enterprise.redhat.com/issue-tracker/?module=issues&action=view&tid=103263
++# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=210614
++
++# i386: Bug exists when the `target_xfer_memory' condition
++# `(memaddr + len < region->hi)' operates on 64-bit operands on
++# largecore-patched with 32-bit addresses and so it can get `false' with
++# arbitrary `len'.
++
++# x86_64: The bug is not present as the operands and calculations have the same
++# bit size.  Would would still need to pass there the highest address
++# (`memaddr == 0xffffffffffffffff') but we would need to pass `len == 0'
++# to make the condition `(memaddr + len < region->hi)' false.
++# `len == 0' would get caught eariler.
++
++# Error in the success case is immediate.
++set timeoutold ${timeout}
++set timeout 10
++
++gdb_test "x/xb 0xffffffff" \
++         "Cannot access memory at address 0xffffffff" \
++         "Read the last address space byte"
++
++set timeout ${timeoutold}

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

@@ -0,0 +1,95 @@
+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-missed-trap-on-step-test.patch
+
+;; Test hiding unexpected breakpoints on intentional step commands.
+;;=fedoratest
+
+Fix has been committed to:
+	gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch
+
+diff --git a/gdb/testsuite/gdb.base/watchpoint-during-step.c b/gdb/testsuite/gdb.base/watchpoint-during-step.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/watchpoint-during-step.c
+@@ -0,0 +1,30 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   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.
++
++   Please email any bugs, comments, and/or additions to this file to:
++   bug-gdb@prep.ai.mit.edu  */
++
++static int var;
++
++int main()
++{
++  var = 1;
++  var = 2;
++  var = 3;
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/watchpoint-during-step.exp b/gdb/testsuite/gdb.base/watchpoint-during-step.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/watchpoint-during-step.exp
+@@ -0,0 +1,44 @@
++# 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.
++
++set testfile watchpoint-during-step
++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}
++
++runto_main
++
++gdb_breakpoint [gdb_get_line_number "var = 2"]
++gdb_continue_to_breakpoint "Find the first var set"
++
++gdb_test "step" ".*var = 3;" "Step to the next var set"
++
++gdb_test "watch var" "atchpoint .*: var" "Set the watchpoint"
++
++# Here is the target point.  Be careful to not have breakpoint set on the line
++# we step from as in this case it is a valid upstream KFAIL gdb/38
++
++gdb_test "step" ".*Old value = 2.*New value = 3.*" "Catch the watchpoint"

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

@@ -0,0 +1,111 @@
+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-readline-long-line-crash-test.patch
+
+;; Fix readline segfault on excessively long hand-typed lines.
+;;=fedoratest
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=214196
+
+diff --git a/gdb/testsuite/gdb.base/readline-overflow.exp b/gdb/testsuite/gdb.base/readline-overflow.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/readline-overflow.exp
+@@ -0,0 +1,96 @@
++# 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
++
++# This file was written by Jan Kratochvil <jan.kratochvil@redhat.com>
++
++# This file is part of the gdb testsuite.
++
++#
++# Tests for readline buffer overflow.
++#
++
++if $tracelevel {
++  strace $tracelevel
++}
++
++global env
++
++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 timeout 600
++
++    set env(GDBHISTFILE) "${srcdir}/${subdir}/gdb_history"
++    set env(HISTSIZE) "10"
++
++    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 {
++	-re X {
++	    incr i
++	    if {$i <= $total} {
++		send_gdb "X"
++		exp_continue
++	    }
++	}
++	-re "\[ \b\r\n\]" {
++	    exp_continue
++	}
++	eof {
++	    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
++	}
++	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
++	}
++    }
++    send_gdb "\r"
++    gdb_test "" \
++	"No executable file specified..*" \
++	"All the characters transferred"
++}

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

@@ -0,0 +1,127 @@
+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-section-num-fixup-test.patch
+
+;; Test a crash on libraries missing the .text section.
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.base/datalib-lib.c b/gdb/testsuite/gdb.base/datalib-lib.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/datalib-lib.c
+@@ -0,0 +1,22 @@
++/* 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 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  */
++
++int var;
+diff --git a/gdb/testsuite/gdb.base/datalib-main.c b/gdb/testsuite/gdb.base/datalib-main.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/datalib-main.c
+@@ -0,0 +1,26 @@
++/* 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 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  */
++
++int
++main (void)
++{
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/datalib.exp b/gdb/testsuite/gdb.base/datalib.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/datalib.exp
+@@ -0,0 +1,56 @@
++# 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
++}
++
++set testfile datalib
++set srcfilemain ${testfile}-main.c
++set srcfilelib ${testfile}-lib.c
++set libfile [standard_output_file ${testfile}-lib.so]
++set binfile [standard_output_file ${testfile}-main]
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfilelib}" "${libfile}" executable [list debug {additional_flags=-shared -nostdlib}]] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfilemain}" "${binfile} ${libfile}" 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}
++
++# We must use a separate library as the main executable is compiled to the
++# address 0 by default and it would get fixed up already at the end of
++# INIT_OBJFILE_SECT_INDICES.  We also cannot PRELINK it as PRELINK is missing
++# on ia64.  The library must be NOSTDLIB as otherwise some stub code would
++# create the `.text' section there.  Also DEBUG option is useful as some of
++# the crashes occur in dwarf2read.c.
++
++# FAIL case:
++# ../../gdb/ia64-tdep.c:2838: internal-error: sect_index_text not initialized
++# A problem internal to GDB has been detected,
++
++gdb_test "start" \
++         "main \\(\\) at .*${srcfilemain}.*" \
++         "start"

SOURCES/gdb-6.5-sharedlibrary-path.patch

@@ -0,0 +1,193 @@
+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-sharedlibrary-path.patch
+
+;; Fix TLS symbols resolving for shared libraries with a relative pathname.
+;; The testsuite needs `gdb-6.5-tls-of-separate-debuginfo.patch'.
+;;=fedoratest: One should recheck if it is really fixed upstream.
+
+If you provided some relative path to the shared library, such as with
+	export LD_LIBRARY_PATH=.
+then gdb would fail to match the shared library name during the TLS lookup.
+
+Dropped the workaround/fix for gdb-6.8.50.20081128 - is it still needed?
+
+The testsuite needs `gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch'.
+The testsuite needs `gdb-6.5-tls-of-separate-debuginfo.patch'.
+
+2006-09-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* solib-svr4.c (svr4_fetch_objfile_link_map): Match even absolute
+	requested pathnames to the internal loaded relative pathnames.
+
+2007-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7.
+
+2008-02-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to gdb-6.7.50.20080227.
+
+diff --git a/gdb/testsuite/gdb.threads/tls-sepdebug-main.c b/gdb/testsuite/gdb.threads/tls-sepdebug-main.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/tls-sepdebug-main.c
+@@ -0,0 +1,31 @@
++/* 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 <pthread.h>
++
++extern __thread int var;
++
++int main()
++{
++  /* Ensure we link against pthreads even with --as-needed.  */
++  pthread_testcancel();
++  return var;
++}
+diff --git a/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c b/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c
+@@ -0,0 +1,22 @@
++/* 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  */
++
++__thread int var = 42;
+diff --git a/gdb/testsuite/gdb.threads/tls-sepdebug.exp b/gdb/testsuite/gdb.threads/tls-sepdebug.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/tls-sepdebug.exp
+@@ -0,0 +1,94 @@
++# 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
++}
++
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set testfile tls-sepdebug
++set srcmainfile   ${testfile}-main.c
++set srcsharedfile ${testfile}-shared.c
++
++set binmainfile        [standard_output_file ${testfile}-main]
++set binsharedbase      ${testfile}-shared.so
++set binsharedfile      [standard_output_file ${binsharedbase}]
++set binshareddebugfile [standard_output_file ${binsharedbase}.debug]
++
++# Use explicit -soname as otherwise the full path to the library would get
++# encoded into ${binmainfile} making LD_LIBRARY_PATH tests useless.
++
++# FIXME: gcc dependency (-Wl,-soname).
++
++if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srcsharedfile}" "${binsharedfile}" [list debug additional_flags=-Wl,-soname=${binsharedbase}]] != "" } {
++    untested "Couldn't compile test library"
++    return -1
++}
++
++# eu-strip(1) works fine but it is a part of `elfutils', not `binutils'.
++if 0 then {
++    remote_exec build "eu-strip -f ${binshareddebugfile} ${binsharedfile}"
++} else {
++    remote_exec build "objcopy --only-keep-debug ${binsharedfile} ${binshareddebugfile}"
++    remote_exec build "objcopy --strip-debug ${binsharedfile}"
++    remote_exec build "objcopy --add-gnu-debuglink=${binshareddebugfile} ${binsharedfile}"
++}
++
++# Do not use `shlib=' as it will automatically add also -rpath for gcc.
++
++if  { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcmainfile} ${binsharedfile}" "${binmainfile}" executable {debug}] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++
++# Get things started.
++
++# Test also the proper resolving of relative library names to absolute ones.
++# \$PWD is easy - it is the absolute way
++# ${subdir} would fail on "print var"
++
++set absdir [file dirname [standard_output_file ${binsharedbase}]]
++foreach ld_library_path [list $absdir [relative_filename [pwd] $absdir]] name { absolute relative }  {
++
++    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-misleading-warning-missing-debuginfo-rhbz981154.patch

@@ -0,0 +1,129 @@
+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-misleading-warning-missing-debuginfo-rhbz981154.patch
+
+;; Fix 'gdb gives highly misleading error when debuginfo pkg is present,
+;; but not corresponding binary pkg' (RH BZ 981154).
+;;=push+jan
+
+Comments by Sergio Durigan Junior <sergiodj@redhat.com>:
+
+  This is the fix for RH BZ #981154
+
+  It is mainly a testcase addition, but a minor fix in the gdb/build-id.c
+  file was also needed.
+
+  gdb/build-id.c was added by:
+
+  commit dc294be54c96414035eed7d53dafdea0a6f31a72
+  Author: Tom Tromey <tromey@redhat.com>
+  Date:   Tue Oct 8 19:56:15 2013 +0000
+
+  and had a little thinko there.  The variable 'filename' needs to be set to
+  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/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
++++ b/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp
+@@ -0,0 +1,97 @@
++#   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 "normal.c"
++
++if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
++    return -1
++}
++
++# Get the build-id of the file
++set build_id_debug_file [build_id_debug_filename_get $binfile]
++regsub -all ".debug$" $build_id_debug_file "" build_id_without_debug
++
++# Run to main
++if { ![runto_main] } {
++    return -1
++}
++
++# We first need to generate a corefile
++set escapedfilename [string_to_regexp [standard_output_file gcore.test]]
++set core_supported 0
++gdb_test_multiple "gcore [standard_output_file gcore.test]" \
++	"save a corefile" \
++{
++  -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
++    pass "save a corefile"
++    global core_supported
++    set core_supported 1
++  }
++  -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" {
++    unsupported "save a corefile"
++    global core_supported
++    set core_supported 0
++  }
++}
++
++if {!$core_supported} {
++  return -1
++}
++
++# Move the binfile to a temporary name
++remote_exec build "mv $binfile ${binfile}.old"
++
++# Reinitialize GDB and see if we get a yum/dnf warning
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++
++with_test_prefix "first run:" {
++    gdb_test "set build-id-verbose 1" "" \
++	"set build-id-verbose"
++
++    gdb_test "set debug-file-directory [file dirname [standard_output_file gcore.test]]" "" \
++	"set debug-file-directory"
++
++    gdb_test "core-file [standard_output_file gcore.test]" \
++	"Missing separate debuginfo for the main executable file\r\nTry: (yum|dnf) --enablerepo='\\*debug\\*' install [standard_output_file $build_id_without_debug]\r\n.*" \
++	"test first yum/dnf warning"
++}
++
++# Now we define and create our .build-id
++file mkdir [file dirname [standard_output_file ${build_id_without_debug}]]
++# Cannot use "file link" (from TCL) because it requires the target file to
++# exist.
++remote_exec build "ln -s $binfile [standard_output_file ${build_id_without_debug}]"
++
++# Reinitialize GDB to get the second yum/dnf warning
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++
++with_test_prefix "second run:" {
++    gdb_test "set build-id-verbose 1" "" \
++	"set build-id-verbose"
++
++    gdb_test "set debug-file-directory [file dirname [standard_output_file gcore.test]]" "" \
++	"set debug-file-directory"
++
++    gdb_test "core-file [standard_output_file gcore.test]" \
++	"Missing separate debuginfo for the main executable file\r\nTry: (yum|dnf) --enablerepo='\\*debug\\*' install $binfile\r\n.*" \
++	"test second yum/dnf warning"
++}
++
++# Leaving the link there will cause breakage in the next run.
++remote_exec build "rm -f [standard_output_file ${build_id_without_debug}]"

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

@@ -0,0 +1,42 @@
+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-rpm-librpm-workaround.patch
+
+;; Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
+;;=push+jan
+
+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)
+ #include <dlfcn.h>
+ #endif
+ 
++/* Workarodun https://bugzilla.redhat.com/show_bug.cgi?id=643031
++   librpm must not exit() an application on SIGINT
++
++   Enable or disable a signal handler.  SIGNUM: signal to enable (or disable
++   if negative).  HANDLER: sa_sigaction handler (or NULL to use
++   rpmsqHandler()).  Returns: no. of refs, -1 on error.  */
++extern int rpmsqEnable (int signum, /* rpmsqAction_t handler */ void *handler);
++int
++rpmsqEnable (int signum, /* rpmsqAction_t handler */ void *handler)
++{
++  return 0;
++}
++
+ /* This MISSING_RPM_HASH tracker is used to collect all the missing rpm files
+    and avoid their duplicities during a single inferior run.  */
+ 
+diff --git a/gdb/proc-service.list b/gdb/proc-service.list
+--- a/gdb/proc-service.list
++++ b/gdb/proc-service.list
+@@ -37,4 +37,7 @@
+   ps_pstop;
+   ps_ptread;
+   ps_ptwrite;
++
++  /* gdb-6.6-buildid-locate-rpm.patch */
++  rpmsqEnable;
+ };

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

@@ -0,0 +1,128 @@
+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-rpm-scl.patch
+
+;; [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
+;;=push+jan
+
+warning: Skipping deprecated .gdb_index section
+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;
+ /* Returns the count of newly added rpms.  */
+ 
+ static int
++#ifndef GDB_INDEX_VERIFY_VENDOR
+ missing_rpm_enlist (const char *filename)
++#else
++missing_rpm_enlist_1 (const char *filename, int verify_vendor)
++#endif
+ {
+   static int rpm_init_done = 0;
+   rpmts ts;
+@@ -849,7 +853,11 @@ missing_rpm_enlist (const char *filename)
+   mi = rpmtsInitIterator_p (ts, RPMTAG_BASENAMES, filename, 0);
+   if (mi != NULL)
+     {
++#ifndef GDB_INDEX_VERIFY_VENDOR
+       for (;;)
++#else
++      if (!verify_vendor) for (;;)
++#endif
+ 	{
+ 	  Header h;
+ 	  char *debuginfo, **slot, *s, *s2;
+@@ -967,6 +975,37 @@ missing_rpm_enlist (const char *filename)
+ 	    xfree (debuginfo);
+ 	  count++;
+ 	}
++#ifdef GDB_INDEX_VERIFY_VENDOR
++      else /* verify_vendor */
++	{
++	  int vendor_pass = 0, vendor_fail = 0;
++
++	  for (;;)
++	    {
++	      Header h;
++	      errmsg_t err;
++	      char *vendor;
++
++	      h = rpmdbNextIterator_p (mi);
++	      if (h == NULL)
++		break;
++
++	      vendor = headerFormat_p (h, "%{vendor}", &err);
++	      if (!vendor)
++		{
++		  warning (_("Error querying the rpm file `%s': %s"), filename,
++			   err);
++		  continue;
++		}
++	      if (strcmp (vendor, "Red Hat, Inc.") == 0)
++		vendor_pass = 1;
++	      else
++		vendor_fail = 1;
++	      xfree (vendor);
++	    }
++	  count = vendor_pass != 0 && vendor_fail == 0;
++	}
++#endif
+ 
+       rpmdbFreeIterator_p (mi);
+     }
+@@ -976,6 +1015,20 @@ missing_rpm_enlist (const char *filename)
+   return count;
+ }
+ 
++#ifdef GDB_INDEX_VERIFY_VENDOR
++missing_rpm_enlist (const char *filename)
++{
++  return missing_rpm_enlist_1 (filename, 0);
++}
++
++extern int rpm_verify_vendor (const char *filename);
++int
++rpm_verify_vendor (const char *filename)
++{
++  return missing_rpm_enlist_1 (filename, 1);
++}
++#endif
++
+ static bool
+ missing_rpm_list_compar (const char *ap, const char *bp)
+ {
+diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
+--- a/gdb/dwarf2/read.c
++++ b/gdb/dwarf2/read.c
+@@ -2801,6 +2801,16 @@ read_gdb_index_from_buffer (const char *filename,
+      "set use-deprecated-index-sections on".  */
+   if (version < 6 && !deprecated_ok)
+     {
++#ifdef GDB_INDEX_VERIFY_VENDOR
++      extern int rpm_verify_vendor (const char *filename);
++
++      /* Red Hat Developer Toolset exception.  */
++      if (rpm_verify_vendor (filename))
++	{}
++      else
++      {
++
++#endif
+       static int warning_printed = 0;
+       if (!warning_printed)
+ 	{
+@@ -2812,6 +2822,10 @@ to use the section anyway."),
+ 	  warning_printed = 1;
+ 	}
+       return 0;
++#ifdef GDB_INDEX_VERIFY_VENDOR
++
++      }
++#endif
+     }
+   /* Version 7 indices generated by gold refer to the CU for a symbol instead
+      of the TU (for symbols coming from TUs),

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

@@ -0,0 +1,238 @@
+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-solib-missing-ids.patch
+
+;; Fix loading of core files without build-ids but with build-ids in executables.
+;; Load strictly build-id-checked core files only if no executable is specified
+;; (Jan Kratochvil, RH BZ 1339862).
+;;=push+jan
+
+gdb returns an incorrect back trace when applying a debuginfo
+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
+@@ -1350,14 +1350,28 @@ svr4_read_so_list (svr4_info *info, CORE_ADDR lm, CORE_ADDR prev_lm,
+ 	}
+ 
+       {
+-	struct bfd_build_id *build_id;
++	struct bfd_build_id *build_id = NULL;
+ 
+ 	strncpy (newobj->so_original_name, buffer.get (), SO_NAME_MAX_PATH_SIZE - 1);
+ 	newobj->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
+ 	/* May get overwritten below.  */
+ 	strcpy (newobj->so_name, newobj->so_original_name);
+ 
+-	build_id = build_id_addr_get (((lm_info_svr4 *) newobj->lm_info)->l_ld);
++	/* In the case the main executable was found according to its build-id
++	   (from a core file) prevent loading a different build of a library
++	   with accidentally the same SO_NAME.
++
++	   It suppresses bogus backtraces (and prints "??" there instead) if
++	   the on-disk files no longer match the running program version.
++
++	   If the main executable was not loaded according to its build-id do
++	   not do any build-id checking of the libraries.  There may be missing
++	   build-ids dumped in the core file and we would map all the libraries
++	   to the only existing file loaded that time - the executable.  */
++	if (current_program_space->symfile_object_file != NULL
++	    && (current_program_space->symfile_object_file->flags
++	         & OBJF_BUILD_ID_CORE_LOADED) != 0)
++	  build_id = build_id_addr_get (li->l_ld);
+ 	if (build_id != NULL)
+ 	  {
+ 	    char *name, *build_id_filename;
+@@ -1372,23 +1386,7 @@ svr4_read_so_list (svr4_info *info, CORE_ADDR lm, CORE_ADDR prev_lm,
+ 		xfree (name);
+ 	      }
+ 	    else
+-	      {
+-		debug_print_missing (newobj->so_name, build_id_filename);
+-
+-		/* In the case the main executable was found according to
+-		   its build-id (from a core file) prevent loading
+-		   a different build of a library with accidentally the
+-		   same SO_NAME.
+-
+-		   It suppresses bogus backtraces (and prints "??" there
+-		   instead) if the on-disk files no longer match the
+-		   running program version.  */
+-
+-		if (current_program_space->symfile_object_file != NULL
+-		    && (current_program_space->symfile_object_file->flags
+-			& OBJF_BUILD_ID_CORE_LOADED) != 0)
+-		  newobj->so_name[0] = 0;
+-	      }
++	      debug_print_missing (newobj->so_name, build_id_filename);
+ 
+ 	    xfree (build_id_filename);
+ 	    xfree (build_id);
+diff --git a/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-lib.c b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-lib.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-lib.c
+@@ -0,0 +1,21 @@
++/* 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/>.  */
++
++void
++lib (void)
++{
++}
+diff --git a/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-main.c b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-main.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-main.c
+@@ -0,0 +1,25 @@
++/* 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/>.  */
++
++extern void lib (void);
++
++int
++main (void)
++{
++  lib ();
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp
+@@ -0,0 +1,105 @@
++# Copyright 2016 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 {[skip_shlib_tests]} {
++    return 0
++}
++
++set testfile "gcore-buildid-exec-but-not-solib"
++set srcmainfile ${testfile}-main.c
++set srclibfile ${testfile}-lib.c
++set libfile [standard_output_file ${testfile}-lib.so]
++set objfile [standard_output_file ${testfile}-main.o]
++set executable ${testfile}-main
++set binfile [standard_output_file ${executable}]
++set gcorefile [standard_output_file ${executable}.gcore]
++set outdir [file dirname $binfile]
++
++if { [gdb_compile_shlib ${srcdir}/${subdir}/${srclibfile} ${libfile} "debug additional_flags=-Wl,--build-id"] != ""
++     || [gdb_compile ${srcdir}/${subdir}/${srcmainfile} ${objfile} object {debug}] != "" } {
++     unsupported "-Wl,--build-id compilation failed"
++     return -1
++}
++set opts [list debug shlib=${libfile} "additional_flags=-Wl,--build-id"]
++if { [gdb_compile ${objfile} ${binfile} executable $opts] != "" } {
++     unsupported "-Wl,--build-id compilation failed"
++     return -1
++}
++
++clean_restart $executable
++gdb_load_shlib $libfile
++
++# Does this gdb support gcore?
++set test "help gcore"
++gdb_test_multiple $test $test {
++    -re "Undefined command: .gcore.*\r\n$gdb_prompt $" {
++	# gcore command not supported -- nothing to test here.
++	unsupported "gdb does not support gcore on this target"
++	return -1;
++    }
++    -re "Save a core file .*\r\n$gdb_prompt $" {
++	pass $test
++    }
++}
++
++if { ![runto lib] } then {
++    return -1
++}
++
++set escapedfilename [string_to_regexp ${gcorefile}]
++
++set test "save a corefile"
++gdb_test_multiple "gcore ${gcorefile}" $test {
++    -re "Saved corefile ${escapedfilename}\r\n$gdb_prompt $" {
++	pass $test
++    }
++    -re "Can't create a corefile\r\n$gdb_prompt $" {
++	unsupported $test
++	return -1
++    }
++}
++
++# Now restart gdb and load the corefile.
++
++clean_restart $executable
++gdb_load_shlib $libfile
++
++set buildid [build_id_debug_filename_get $libfile]
++
++regsub {\.debug$} $buildid {} buildid
++
++set debugdir [standard_output_file ${testfile}-debugdir]
++file delete -force -- $debugdir
++
++file mkdir $debugdir/[file dirname $libfile]
++file copy $libfile $debugdir/${libfile}
++
++file mkdir $debugdir/[file dirname $buildid]
++file copy $libfile $debugdir/${buildid}
++
++remote_exec build "ln -s /lib       ${debugdir}/"
++remote_exec build "ln -s /lib64     ${debugdir}/"
++# /usr is not needed, all the libs are in /lib64: libm.so.6 libc.so.6 ld-linux-x86-64.so.2
++
++gdb_test "set solib-absolute-prefix $debugdir"
++
++gdb_test_no_output "set debug-file-directory $debugdir" "set debug-file-directory"
++
++gdb_test "core ${gcorefile}" "Core was generated by .*" "re-load generated corefile"
++
++gdb_test "frame" "#0 \[^\r\n\]* lib .*" "library got loaded"
++
++gdb_test "bt"
++gdb_test "info shared"

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

@@ -0,0 +1,188 @@
+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.6-bz229517-gcore-without-terminal.patch
+
+;; Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
+;;=fedoratest
+
+2007-04-22  Jan Kratochvil <jan.kratochvil@redhat.com>
+
+	* gdb_gcore.sh: Redirect GDB from `</dev/null'.
+
+2007-04-22  Jan Kratochvil <jan.kratochvil@redhat.com>
+
+	* gdb.base/gcorebg.exp, gdb.base/gcorebg.c: New files.
+
+diff --git a/gdb/testsuite/gdb.base/gcorebg.c b/gdb/testsuite/gdb.base/gcorebg.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gcorebg.c
+@@ -0,0 +1,49 @@
++#include <stdio.h>
++#include <sys/types.h>
++#include <unistd.h>
++#include <stdlib.h>
++#include <signal.h>
++#include <string.h>
++#include <assert.h>
++
++int main (int argc, char **argv)
++{
++  pid_t pid = 0;
++  pid_t ppid;
++  char buf[1024*2 + 500];
++  int gotint;
++
++  if (argc != 4)
++    {
++      fprintf (stderr, "Syntax: %s {standard|detached} <gcore command> <core output file>\n",
++	       argv[0]);
++      exit (1);
++    }
++
++  pid = fork ();
++
++  switch (pid)
++    {
++      case 0:
++        if (strcmp (argv[1], "detached") == 0)
++	  setpgrp ();
++	ppid = getppid ();
++	gotint = snprintf (buf, sizeof (buf), "sh %s -o %s %d", argv[2], argv[3], (int) ppid);
++	assert (gotint < sizeof (buf));
++	system (buf);
++	fprintf (stderr, "Killing parent PID %d\n", ppid);
++	kill (ppid, SIGTERM);
++	break;
++
++      case -1:
++	perror ("fork err\n");
++	exit (1);
++	break;
++
++      default:
++	fprintf (stderr,"Sleeping as PID %d\n", getpid ());
++	sleep (60);
++    }
++
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/gcorebg.exp b/gdb/testsuite/gdb.base/gcorebg.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gcorebg.exp
+@@ -0,0 +1,113 @@
++# 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.
++
++# Please email any bugs, comments, and/or additions to this file to:
++# bug-gdb@prep.ai.mit.edu
++
++# This file was written by Jan Kratochvil <jan.kratochvil@redhat.com>.
++# This is a test for `gdb_gcore.sh' functionality.
++# It also tests a regression with `gdb_gcore.sh' being run without its
++# accessible terminal.
++
++if ![info exists GCORE] {
++    set GCORE "[standard_output_file ../../../../gcore]"
++}
++verbose "using GCORE = $GCORE" 2
++
++set testfile "gcorebg"
++set srcfile  ${testfile}.c
++set binfile  [standard_output_file ${testfile}]
++set corefile [standard_output_file ${testfile}.test]
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
++     untested gcorebg.exp
++     return -1
++}
++
++# Cleanup.
++
++proc core_clean {} {
++    global corefile
++
++    foreach file [glob -nocomplain [join [list $corefile *] ""]] {
++	verbose "Delete file $file" 1
++	remote_file target delete $file
++    }
++}
++core_clean
++remote_file target delete "./gdb"
++
++# Generate the core file.
++
++# Provide `./gdb' for `gdb_gcore.sh' running it as a bare `gdb' command.
++# Setup also `$PATH' appropriately.
++# If GDB was not found let `gdb_gcore.sh' to find the system GDB by `$PATH'.
++if {$GDB != "gdb"} {
++    file link ./gdb $GDB
++}
++global env
++set oldpath $env(PATH)
++set env(PATH) [join [list . $env(PATH)] ":"]
++verbose "PATH = $env(PATH)" 2
++
++# Test file body.
++# $detached == "standard" || $detached == "detached"
++
++proc test_body { detached } {
++    global binfile
++    global GCORE
++    global corefile
++
++    set res [remote_spawn target "$binfile $detached $GCORE $corefile"]
++    if { $res < 0 || $res == "" } {
++	fail "Spawning $detached gcore"
++	return 1
++    }
++    pass "Spawning $detached gcore"
++    remote_expect target 20 {
++	timeout {
++	    fail "Spawned $detached gcore finished (timeout)"
++	    remote_exec target "kill -9 -[exp_pid -i $res]"
++	    return 1
++	}
++	"Saved corefile .*\r\nKilling parent PID " {
++	    pass "Spawned $detached gcore finished"
++	    remote_wait target 20
++	}
++    }
++
++    if {1 == [llength [glob -nocomplain [join [list $corefile *] ""]]]} {
++	pass "Core file generated by $detached gcore"
++    } else {
++	fail "Core file generated by $detached gcore"
++    }
++    core_clean
++}
++
++# First a general `gdb_gcore.sh' spawn with its controlling terminal available.
++
++test_body standard
++
++# And now `gdb_gcore.sh' spawn without its controlling terminal available.
++# It is spawned through `gcorebg.c' using setpgrp ().
++
++test_body detached
++
++
++# Cleanup.
++
++set env(PATH) $oldpath
++remote_file target delete "./gdb"

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

@@ -0,0 +1,94 @@
+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-bz230000-power6-disassembly-test.patch
+
+;; Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
+;;=fedoratest
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=230000
+
+The original testcase
+	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=230000#c1
+requires too recent GCC.
+
+diff --git a/gdb/testsuite/gdb.arch/powerpc-power6.exp b/gdb/testsuite/gdb.arch/powerpc-power6.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/powerpc-power6.exp
+@@ -0,0 +1,54 @@
++# 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.
++
++# Test PowerPC Power6 instructions disassembly.
++
++if {![istarget "powerpc*-*-*"]} then {
++    verbose "Skipping PowerPC Power6 instructions disassembly."
++    return
++}
++
++set testfile "powerpc-power6"
++set srcfile ${testfile}.s
++set objfile [standard_output_file ${testfile}.o]
++
++if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug}] != "" } {
++    untested "PowerPC prologue tests"
++    return -1
++}
++
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${objfile}
++
++# Disassemble the function.
++
++gdb_test "disass func" ":\tblr\r\n.*" "Basic disassembly"
++
++gdb_test "disass func" ":\tdcbzl  *r8,r9\r\n.*" "Power5 disassembly dcbzl"
++gdb_test "disass func" ":\tfrsqrtes  *f10,f11\r\n.*" "Power5 disassembly frsqrtes"
++gdb_test "disass func" ":\tdadd  *f1,f2,f1\r\n.*" "Power6 disassembly dadd"
++gdb_test "disass func" ":\tdaddq  *f0,f2,f0\r\n.*" "Power6 disassembly daddq"
++gdb_test "disass func" ":\tdsub  *f1,f2,f1\r\n.*" "Power6 disassembly dsub"
++gdb_test "disass func" ":\tdsubq  *f0,f2,f0\r\n.*" "Power6 disassembly dsubq"
++gdb_test "disass func" ":\tdmul  *f1,f2,f1\r\n.*" "Power6 disassembly dmul"
++gdb_test "disass func" ":\tdmulq  *f0,f2,f0\r\n.*" "Power6 disassembly dmulq"
++gdb_test "disass func" ":\tddiv  *f1,f2,f1\r\n.*" "Power6 disassembly ddiv"
++gdb_test "disass func" ":\tddivq  *f0,f2,f0\r\n.*" "Power6 disassembly ddivq"
++gdb_test "disass func" ":\tdcmpu  *cr1,f2,f1\r\n.*" "Power6 disassembly dcmpu"
++gdb_test "disass func" ":\tdcmpuq  *cr1,f2,f0\r\n.*" "Power6 disassembly dcmpuq"
+diff --git a/gdb/testsuite/gdb.arch/powerpc-power6.s b/gdb/testsuite/gdb.arch/powerpc-power6.s
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/powerpc-power6.s
+@@ -0,0 +1,16 @@
++	.text
++	.globl	func
++func:
++	blr
++	.long	0x7c284fec	/* dcbzl	r8,r9		*/
++	.long	0xed405834	/* frsqrtes	f10,f11		*/
++	.long	0xec220804	/* dadd		f1,f2,f1	*/
++	.long	0xfc020004	/* daddq	f0,f2,f0	*/
++	.long	0xec220c04	/* dsub		f1,f2,f1	*/
++	.long	0xfc020404	/* dsubq	f0,f2,f0	*/
++	.long	0xec220844	/* dmul		f1,f2,f1	*/
++	.long	0xfc020044	/* dmulq	f0,f2,f0	*/
++	.long	0xec220c44	/* ddiv		f1,f2,f1	*/
++	.long	0xfc020444	/* ddivq	f0,f2,f0	*/
++	.long	0xec820d04	/* dcmpu	cr1,f2,f1	*/
++	.long	0xfc820504	/* dcmpuq	cr1,f2,f0	*/

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

@@ -0,0 +1,278 @@
+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.6-bz237572-ppc-atomic-sequence-test.patch
+
+;; Support for stepping over PPC atomic instruction sequences (BZ 237572).
+;;=fedoratest
+
+2007-06-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.threads/atomic-seq-threaded.c,
+	gdb.threads/atomic-seq-threaded.exp: New files.
+
+diff --git a/gdb/testsuite/gdb.threads/atomic-seq-threaded.c b/gdb/testsuite/gdb.threads/atomic-seq-threaded.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/atomic-seq-threaded.c
+@@ -0,0 +1,171 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   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., 51 Franklin Street, Fifth Floor, Boston,
++   MA 02110-1301, USA.  */
++
++/* Test stepping over RISC atomic sequences.
++   This variant testcases the code for stepping another thread while skipping
++   over the atomic sequence in the former thread
++   (STEPPING_PAST_SINGLESTEP_BREAKPOINT).
++   Code comes from gcc/testsuite/gcc.dg/sync-2.c  */
++
++/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
++/* { dg-options "-mcpu=v9" { target sparc*-*-* } } */
++
++/* Test functionality of the intrinsics for 'short' and 'char'.  */
++
++#include <stdlib.h>
++#include <string.h>
++#include <pthread.h>
++#include <assert.h>
++#include <unistd.h>
++
++#define LOOPS 2
++
++static int unused;
++
++static char AI[18];
++static char init_qi[18] = { 3,5,7,9,0,0,0,0,-1,0,0,0,0,0,-1,0,0,0 };
++static char test_qi[18] = { 3,5,7,9,1,4,22,-12,7,8,9,7,1,-12,7,8,9,7 };
++
++static void
++do_qi (void)
++{
++  if (__sync_fetch_and_add(AI+4, 1) != 0)
++    abort ();
++  if (__sync_fetch_and_add(AI+5, 4) != 0)
++    abort ();
++  if (__sync_fetch_and_add(AI+6, 22) != 0)
++    abort ();
++  if (__sync_fetch_and_sub(AI+7, 12) != 0)
++    abort ();
++  if (__sync_fetch_and_and(AI+8, 7) != (char)-1)
++    abort ();
++  if (__sync_fetch_and_or(AI+9, 8) != 0)
++    abort ();
++  if (__sync_fetch_and_xor(AI+10, 9) != 0)
++    abort ();
++  if (__sync_fetch_and_nand(AI+11, 7) != 0)
++    abort ();
++
++  if (__sync_add_and_fetch(AI+12, 1) != 1)
++    abort ();
++  if (__sync_sub_and_fetch(AI+13, 12) != (char)-12)
++    abort ();
++  if (__sync_and_and_fetch(AI+14, 7) != 7)
++    abort ();
++  if (__sync_or_and_fetch(AI+15, 8) != 8)
++    abort ();
++  if (__sync_xor_and_fetch(AI+16, 9) != 9)
++    abort ();
++  if (__sync_nand_and_fetch(AI+17, 7) != 7)
++    abort ();
++}
++
++static short AL[18];
++static short init_hi[18] = { 3,5,7,9,0,0,0,0,-1,0,0,0,0,0,-1,0,0,0 };
++static short test_hi[18] = { 3,5,7,9,1,4,22,-12,7,8,9,7,1,-12,7,8,9,7 };
++
++static void
++do_hi (void)
++{
++  if (__sync_fetch_and_add(AL+4, 1) != 0)
++    abort ();
++  if (__sync_fetch_and_add(AL+5, 4) != 0)
++    abort ();
++  if (__sync_fetch_and_add(AL+6, 22) != 0)
++    abort ();
++  if (__sync_fetch_and_sub(AL+7, 12) != 0)
++    abort ();
++  if (__sync_fetch_and_and(AL+8, 7) != -1)
++    abort ();
++  if (__sync_fetch_and_or(AL+9, 8) != 0)
++    abort ();
++  if (__sync_fetch_and_xor(AL+10, 9) != 0)
++    abort ();
++  if (__sync_fetch_and_nand(AL+11, 7) != 0)
++    abort ();
++
++  if (__sync_add_and_fetch(AL+12, 1) != 1)
++    abort ();
++  if (__sync_sub_and_fetch(AL+13, 12) != -12)
++    abort ();
++  if (__sync_and_and_fetch(AL+14, 7) != 7)
++    abort ();
++  if (__sync_or_and_fetch(AL+15, 8) != 8)
++    abort ();
++  if (__sync_xor_and_fetch(AL+16, 9) != 9)
++    abort ();
++  if (__sync_nand_and_fetch(AL+17, 7) != 7)
++    abort ();
++}
++
++static void *
++start1 (void *arg)
++{
++  unsigned loop;
++  sleep(1);
++
++  for (loop = 0; loop < LOOPS; loop++)
++    {
++      memcpy(AI, init_qi, sizeof(init_qi));
++
++      do_qi ();
++
++      if (memcmp (AI, test_qi, sizeof(test_qi)))
++	abort ();
++    }
++
++  return arg;						/* _delete1_ */
++}
++
++static void *
++start2 (void *arg)
++{
++  unsigned loop;
++
++  for (loop = 0; loop < LOOPS; loop++)
++    {
++      memcpy(AL, init_hi, sizeof(init_hi));
++
++      do_hi ();
++
++      if (memcmp (AL, test_hi, sizeof(test_hi)))
++	abort ();
++    }
++
++  return arg;						/* _delete2_ */
++}
++
++int
++main (int argc, char **argv)
++{
++  pthread_t thread;
++  int i;
++
++  i = pthread_create (&thread, NULL, start1, NULL);	/* _create_ */
++  assert (i == 0);					/* _create_after_ */
++
++  sleep (1);
++
++  start2 (NULL);
++
++  i = pthread_join (thread, NULL);			/* _delete_ */
++  assert (i == 0);
++
++  return 0;						/* _exit_ */
++}
+diff --git a/gdb/testsuite/gdb.threads/atomic-seq-threaded.exp b/gdb/testsuite/gdb.threads/atomic-seq-threaded.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/atomic-seq-threaded.exp
+@@ -0,0 +1,84 @@
++# atomic-seq-threaded.exp -- Test case for stepping over RISC atomic code seqs.
++# This variant testcases the code for stepping another thread while skipping
++# over the atomic sequence in the former thread
++# (STEPPING_PAST_SINGLESTEP_BREAKPOINT).
++# Copyright (C) 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.  */
++
++# Please email any bugs, comments, and/or additions to this file to:
++# bug-gdb@prep.ai.mit.edu
++
++set testfile atomic-seq-threaded
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++
++foreach opts {{} {compiler=gcc4} {FAIL}} {
++    if {$opts eq "FAIL"} {
++	return -1
++    }
++    if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $opts]] eq "" } {
++	break
++    }
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++
++gdb_load ${binfile}
++if ![runto_main] then {
++   fail "Can't run to main"
++   return 0
++}
++
++# pthread_create () will not pass even on x86_64 with software watchpoint.
++# Pass after pthread_create () without any watchpoint active.
++set line [gdb_get_line_number "_create_after_"]
++gdb_test "tbreak $line" \
++	 "reakpoint (\[0-9\]+) at .*$srcfile, line $line\..*" \
++	 "set breakpoint after pthread_create ()"
++gdb_test "c" \
++	 ".*/\\* _create_after_ \\*/.*" \
++	 "run till after pthread_create ()"
++
++# Without a watchpoint being software no single-stepping would be used.
++set test "Start (software) watchpoint"
++gdb_test_multiple "watch unused" $test {
++    -re "Watchpoint \[0-9\]+: unused.*$gdb_prompt $" {
++	pass $test
++    }
++    -re "Hardware watchpoint \[0-9\]+: unused.*$gdb_prompt $" {
++	# We do not test the goal but still the whole testcase should pass.
++	unsupported $test
++    }
++}
++
++# More thorough testing of the scheduling logic.
++gdb_test "set scheduler-locking step" ""
++
++# Critical code path is stepped through at this point.
++set line [gdb_get_line_number "_exit_"]
++gdb_test "tbreak $line" \
++	 "reakpoint \[0-9\]+ at .*$srcfile, line $line\..*" \
++	 "set breakpoint at _exit_"
++gdb_test "c" \
++	 ".*/\\* _exit_ \\*/.*" \
++	 "run till _exit_"
++
++# Just a nonproblematic program exit.
++gdb_test "c" \
++	 ".*Program exited normally\\..*" \
++	 "run till program exit"

SOURCES/gdb-6.6-testsuite-timeouts.patch

@@ -0,0 +1,32 @@
+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-testsuite-timeouts.patch
+
+;; Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
+--- a/gdb/testsuite/gdb.base/annota1.exp
++++ b/gdb/testsuite/gdb.base/annota1.exp
+@@ -39,6 +39,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
+ 
+ clean_restart ${binfile}
+ 
++gdb_test "set breakpoint pending off" "" "Avoid lockup on nonexisting functions"
++
+ # The commands we test here produce many lines of output; disable "press 
+ # <return> to continue" prompts.
+ gdb_test_no_output "set height 0"
+diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
+--- a/gdb/testsuite/gdb.base/annota3.exp
++++ b/gdb/testsuite/gdb.base/annota3.exp
+@@ -38,6 +38,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
+ 
+ clean_restart ${binfile}
+ 
++gdb_test "set breakpoint pending off" "" "Avoid lockup on nonexisting functions"
++
+ # The commands we test here produce many lines of output; disable "press 
+ # <return> to continue" prompts.
+ gdb_test_no_output "set height 0"

SOURCES/gdb-6.7-charsign-test.patch

@@ -0,0 +1,130 @@
+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.7-charsign-test.patch
+
+;; Fix displaying of numeric char arrays as strings (BZ 224128).
+;;=fedoratest: But it is failing anyway, one should check the behavior more.
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=224128
+
+2007-01-25  Jan Kratochvil <jan.kratochvil@redhat.com>
+
+	* gdb.base/charsign.exp, gdb.base/charsign.c: New files.
+	[ stripped ]
+
+2007-10-19  Jan Kratochvil <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7 - only the testcase left, patch has been reverted,
+	char-vectors restricted.
+
+diff --git a/gdb/testsuite/gdb.base/charsign.c b/gdb/testsuite/gdb.base/charsign.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/charsign.c
+@@ -0,0 +1,37 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   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.
++
++   Please email any bugs, comments, and/or additions to this file to:
++   bug-gdb@prep.ai.mit.edu  */
++
++int main()
++{
++  return 0;
++}
++
++char n[]="A";
++signed char s[]="A";
++unsigned char u[]="A";
++
++typedef char char_n;
++typedef signed char char_s;
++typedef unsigned char char_u;
++
++char_n n_typed[]="A";
++char_s s_typed[]="A";
++char_u u_typed[]="A";
+diff --git a/gdb/testsuite/gdb.base/charsign.exp b/gdb/testsuite/gdb.base/charsign.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/charsign.exp
+@@ -0,0 +1,63 @@
++# 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.
++
++set testfile charsign
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++
++proc do_test { cflags } {
++    global srcdir
++    global binfile
++    global subdir
++    global srcfile
++    global gdb_prompt
++
++    if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug additional_flags=$cflags]] != "" } {
++	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 "p n" \
++	     "= \"A\""
++    gdb_test "p s" \
++	     "= \\{65 'A', 0 '\\\\0'\\}"
++    gdb_test "p u" \
++	     "= \\{65 'A', 0 '\\\\0'\\}"
++    gdb_test "p n_typed" \
++	     "= \"A\""
++    gdb_test "p s_typed" \
++	     "= \\{65 'A', 0 '\\\\0'\\}"
++    gdb_test "p u_typed" \
++	     "= \\{65 'A', 0 '\\\\0'\\}"
++}
++
++# The string identification works despite the compiler flags below due to
++# gdbtypes.c:
++#   if (name && strcmp (name, "char") == 0)
++#     TYPE_FLAGS (type) |= TYPE_FLAG_NOSIGN;
++
++do_test {}
++do_test {-fsigned-char}
++do_test {-funsigned-char}

SOURCES/gdb-6.7-ppc-clobbered-registers-O2-test.patch

@@ -0,0 +1,108 @@
+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.7-ppc-clobbered-registers-O2-test.patch
+
+;; Test PPC hiding of call-volatile parameter register.
+;;=fedoratest
+
+2007-11-04  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.arch/ppc-clobbered-registers-O2.exp: `powerpc64' changed to
+	`powerpc*'.
+
+Testcase for:
+
+http://sourceware.org/ml/gdb-patches/2007-09/msg00228.html
+
+2007-10-21  Luis Machado  <luisgpm@br.ibm.com>
+
+	* rs6000-tdep.c (ppc_dwarf2_frame_init_reg): New function.
+	* (rs6000_gdbarch_init): Install ppc_dwarf2_frame_init_reg as
+	default dwarf2_frame_set_init_reg function.
+
+diff --git a/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.c b/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.c
+@@ -0,0 +1,21 @@
++
++unsigned * __attribute__((noinline))
++start_sequence (unsigned * x, unsigned * y)
++{
++	return (unsigned *)0xdeadbeef;
++};
++
++unsigned __attribute__((noinline))
++gen_movsd (unsigned * operand0, unsigned * operand1)
++{
++	return *start_sequence(operand0, operand1);
++}
++
++int main(void)
++{
++  unsigned x, y;
++
++  x = 13;
++  y = 14;
++  return (int)gen_movsd (&x, &y);
++}
+diff --git a/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.exp b/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.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.
++#
++# This file is part of the gdb testsuite.
++
++# Test displaying call clobbered registers in optimized binaries for ppc.
++# GDB should not show incorrect values.
++
++if ![istarget "powerpc*-*"] then {
++    verbose "Skipping powerpc* call clobbered registers testing."
++    return
++}
++
++set testfile "ppc-clobbered-registers-O2"
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++set compile_flags "debug additional_flags=-O2"
++
++if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ${compile_flags}] != "" } {
++    unsupported "Testcase compile failed."
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++if ![runto_main] then {
++    perror "Couldn't run to breakpoint"
++    continue
++}
++
++gdb_test "b start_sequence" ".*Breakpoint 2 at.*line 6.*" \
++  "Insert breakpoint at problematic function"
++
++gdb_test continue ".*Breakpoint 2.*in start_sequence.*" \
++  "Run until problematic function"
++
++gdb_test backtrace ".*operand0=<value optimized out>.*operand1=<value optimized out>.*" \
++  "Check value of call clobbered registers"

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

@@ -0,0 +1,104 @@
+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.7-testsuite-stable-results.patch
+
+;; Testsuite fixes for more stable/comparable results.
+;;=fedoratest
+
+gdb/testsuite/gdb.base/fileio.c:
+gdb/testsuite/gdb.base/fileio.exp:
+2007-12-08  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.base/fileio.c (ROOTSUBDIR): New macro.
+	(main): CHDIR into ROOTSUBDIR.  CHOWN ROOTSUBDIR and CHDIR into
+	ROOTSUBDIR if we are being run as root.
+	* gdb.base/fileio.exp: Change the startup and finish cleanup.
+	Change the test file reference to be into the `fileio.dir' directory.
+
+sources/gdb/testsuite/gdb.base/dump.exp:
+Found on RHEL-5.s390x.
+
+gdb-6.8.50.20090209/gdb/testsuite/gdb.base/auxv.exp:
+random FAIL: gdb.base/auxv.exp: matching auxv data from live and gcore
+
+gdb-6.8.50.20090209/gdb/testsuite/gdb.base/annota1.exp:
+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)
+ int
+ main ()
+ {
++  /* These tests
++       Open for write but no write permission returns EACCES
++       Unlinking a file in a directory w/o write access returns EACCES
++     fail if we are being run as root - drop the privileges here.  */
++
++  if (geteuid () == 0)
++    {
++      uid_t uid = 99;
++
++      if (chown (OUTDIR, uid, uid) != 0)
++	{
++	  printf ("chown %d.%d %s: %s\n", (int) uid, (int) uid,
++		  OUTDIR, strerror (errno));
++	  exit (1);
++	}
++      if (setuid (uid) || geteuid () == 0)
++	{
++	  printf ("setuid %d: %s\n", (int) uid, strerror (errno));
++	  exit (1);
++	}
++    }
++
+   /* Don't change the order of the calls.  They partly depend on each other */
+   test_open ();
+   test_write ();
+diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
+--- a/gdb/testsuite/gdb.base/fileio.exp
++++ b/gdb/testsuite/gdb.base/fileio.exp
+@@ -24,9 +24,9 @@ if [target_info exists gdb,nofileio] {
+ standard_testfile
+ 
+ if {[is_remote host]} {
+-    set outdir .
++    set outdir "fileio.dir"
+ } else {
+-    set outdir [standard_output_file {}]
++    set outdir [standard_output_file "fileio.dir"]
+ }
+ 
+ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
+@@ -47,7 +47,8 @@ set dir2 [standard_output_file dir2.fileio.test]
+ if {[file exists $dir2] && ![file writable $dir2]} {
+     system "chmod +w $dir2"
+ }
+-system "rm -rf [standard_output_file *.fileio.test]"
++system "rm -rf [standard_output_file fileio.dir]"
++system "mkdir -m777 [standard_output_file fileio.dir]"
+ 
+ set oldtimeout $timeout
+ set timeout [expr "$timeout + 60"]
+@@ -89,7 +90,7 @@ gdb_test continue \
+ 
+ gdb_test "continue" ".*" ""
+ 
+-catch "system \"chmod -f -w [standard_output_file nowrt.fileio.test]\""
++catch "system \"chmod -f -w [standard_output_file fileio.dir/nowrt.fileio.test]\""
+ 
+ gdb_test continue \
+ "Continuing\\..*open 5:.*EACCES$stop_msg" \
+@@ -276,9 +277,7 @@ gdb_test continue \
+ gdb_exit
+ 
+ # Make dir2 writable again so rm -rf of a build tree Just Works.
+-if {[file exists $dir2] && ![file writable $dir2]} {
+-    system "chmod +w $dir2"
+-}
++system "chmod -R +w $outdir"
+ 
+ set timeout $oldtimeout
+ return 0

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

@@ -0,0 +1,181 @@
+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-bz442765-threaded-exec-test.patch
+
+;; Test various forms of threads tracking across exec() (BZ 442765).
+;;=fedoratest
+
+Test various forms of threads tracking across exec(2).
+
+diff --git a/gdb/testsuite/gdb.threads/threaded-exec.c b/gdb/testsuite/gdb.threads/threaded-exec.c
+--- a/gdb/testsuite/gdb.threads/threaded-exec.c
++++ b/gdb/testsuite/gdb.threads/threaded-exec.c
+@@ -18,21 +18,95 @@
+    Boston, MA 02111-1307, USA.  */
+ 
+ #include <stddef.h>
+-#include <pthread.h>
+ #include <assert.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <stdio.h>
+ 
++#ifdef THREADS
++
++# include <pthread.h>
+ 
+ static void *
+ threader (void *arg)
+ {
+-	return NULL;
++  return NULL;
+ }
+ 
++#endif
++
+ int
+-main (void)
++main (int argc, char **argv)
+ {
++  char *exec_nothreads, *exec_threads, *cmd;
++  int phase;
++  char phase_s[8];
++
++  setbuf (stdout, NULL);
++
++  if (argc != 4)
++    {
++      fprintf (stderr, "%s <non-threaded> <threaded> <phase>\n", argv[0]);
++      return 1;
++    }
++
++#ifdef THREADS
++  puts ("THREADS: Y");
++#else
++  puts ("THREADS: N");
++#endif
++  exec_nothreads = argv[1];
++  printf ("exec_nothreads: %s\n", exec_nothreads);
++  exec_threads = argv[2];
++  printf ("exec_threads: %s\n", exec_threads);
++  phase = atoi (argv[3]);
++  printf ("phase: %d\n", phase);
++
++  /* Phases: threading
++     0: N -> N
++     1: N -> Y
++     2: Y -> Y
++     3: Y -> N
++     4: N -> exit  */
++
++  cmd = NULL;
++
++#ifndef THREADS
++  switch (phase)
++    {
++    case 0:
++      cmd = exec_nothreads;
++      break;
++    case 1:
++      cmd = exec_threads;
++      break;
++    case 2:
++      fprintf (stderr, "%s: We should have threads for phase %d!\n", argv[0],
++	       phase);
++      return 1;
++    case 3:
++      fprintf (stderr, "%s: We should have threads for phase %d!\n", argv[0],
++	       phase);
++      return 1;
++    case 4:
++      return 0;
++    default:
++      assert (0);
++    }
++#else	/* THREADS */
++  switch (phase)
++    {
++    case 0:
++      fprintf (stderr, "%s: We should not have threads for phase %d!\n",
++	       argv[0], phase);
++      return 1;
++    case 1:
++      fprintf (stderr, "%s: We should not have threads for phase %d!\n",
++	       argv[0], phase);
++      return 1;
++    case 2:
++      cmd = exec_threads;
++      {
+ 	pthread_t t1;
+ 	int i;
+ 
+@@ -40,7 +114,34 @@ main (void)
+ 	assert (i == 0);
+ 	i = pthread_join (t1, NULL);
+ 	assert (i == 0);
++      }
++      break;
++    case 3:
++      cmd = exec_nothreads;
++      {
++	pthread_t t1;
++	int i;
++
++	i = pthread_create (&t1, NULL, threader, (void *) NULL);
++	assert (i == 0);
++	i = pthread_join (t1, NULL);
++	assert (i == 0);
++      }
++      break;
++    case 4:
++      fprintf (stderr, "%s: We should not have threads for phase %d!\n",
++	       argv[0], phase);
++      return 1;
++    default:
++      assert (0);
++    }
++#endif	/* THREADS */
++
++  assert (cmd != NULL);
++
++  phase++;
++  snprintf (phase_s, sizeof phase_s, "%d", phase);
+ 
+-	execl ("/bin/true", "/bin/true", NULL);
+-	abort ();
++  execl (cmd, cmd, exec_nothreads, exec_threads, phase_s, NULL);
++  assert (0);
+ }
+diff --git a/gdb/testsuite/gdb.threads/threaded-exec.exp b/gdb/testsuite/gdb.threads/threaded-exec.exp
+--- a/gdb/testsuite/gdb.threads/threaded-exec.exp
++++ b/gdb/testsuite/gdb.threads/threaded-exec.exp
+@@ -20,9 +20,14 @@
+ 
+ set testfile threaded-exec
+ set srcfile ${testfile}.c
+-set binfile [standard_output_file ${testfile}]
++set binfile_nothreads [standard_output_file ${testfile}N]
++set binfile_threads [standard_output_file ${testfile}Y]
+ 
+-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable []] != "" } {
++if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile_nothreads}" executable {additional_flags=-UTHREADS}] != "" } {
++    return -1
++}
++
++if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile_threads}" executable {additional_flags=-DTHREADS}] != "" } {
+     return -1
+ }
+ 
+@@ -30,9 +35,9 @@ gdb_exit
+ gdb_start
+ gdb_reinitialize_dir $srcdir/$subdir
+ 
+-gdb_load ${binfile}
++gdb_load ${binfile_nothreads}
+ 
+-gdb_run_cmd
++gdb_run_cmd [list ${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

@@ -0,0 +1,481 @@
+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-bz466901-backtrace-full-prelinked.patch
+
+;; Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
+;;=fedoratest
+
+Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
+
+diff --git a/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S b/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S
+@@ -0,0 +1,328 @@
++/* 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/>.  */
++
++/*
++#include <stdlib.h>
++
++void
++func (void)
++{
++  int i;
++
++  abort ();
++}
++*/
++	.file	"dw2-loclist-prelinked.c"
++	.section	.debug_abbrev,"",@progbits
++.Ldebug_abbrev0:
++	.section	.debug_info,"",@progbits
++.Ldebug_info0:
++	.section	.debug_line,"",@progbits
++.Ldebug_line0:
++	.text
++.Ltext0:
++.globl func
++	.type	func, @function
++func:
++.LFB2:
++	.file 1 "dw2-loclist-prelinked.c"
++	.loc 1 5 0
++	pushl	%ebp
++.LCFI0:
++	movl	%esp, %ebp
++.LCFI1:
++	subl	$24, %esp
++.LCFI2:
++	.loc 1 8 0
++	call	abort
++.LFE2:
++	.size	func, .-func
++	.section	.debug_frame,"",@progbits
++.Lframe0:
++	.long	.LECIE0-.LSCIE0
++.LSCIE0:
++	.long	0xffffffff
++	.byte	0x1
++	.string	""
++	.uleb128 0x1
++	.sleb128 -4
++	.byte	0x8
++	.byte	0xc
++	.uleb128 0x4
++	.uleb128 0x4
++	.byte	0x88
++	.uleb128 0x1
++	.align 4
++.LECIE0:
++.LSFDE0:
++	.long	.LEFDE0-.LASFDE0
++.LASFDE0:
++	.long	.Lframe0
++	.long	.LFB2
++	.long	.LFE2-.LFB2
++	.byte	0x4
++	.long	.LCFI0-.LFB2
++	.byte	0xe
++	.uleb128 0x8
++	.byte	0x85
++	.uleb128 0x2
++	.byte	0x4
++	.long	.LCFI1-.LCFI0
++	.byte	0xd
++	.uleb128 0x5
++	.align 4
++.LEFDE0:
++	.text
++.Letext0:
++	.section	.debug_loc,"",@progbits
++.Ldebug_loc0:
++.LLST0:
++	.long	.LFB2-.Ltext0
++	.long	.LCFI0-.Ltext0
++	.value	0x2
++	.byte	0x74
++	.sleb128 4
++	.long	.LCFI0-.Ltext0
++	.long	.LCFI1-.Ltext0
++	.value	0x2
++	.byte	0x74
++	.sleb128 8
++	.long	.LCFI1-.Ltext0
++	.long	.LFE2-.Ltext0
++	.value	0x2
++	.byte	0x75
++	.sleb128 8
++	.long	0x0
++	.long	0x0
++	.section	.debug_info
++	.long	0x94
++	.value	0x2
++	.long	.Ldebug_abbrev0
++	.byte	0x4
++	.uleb128 0x1
++	.long	.LASF10
++	.byte	0x1
++	.long	.LASF11
++	.long	.LASF12
++	.long	.Ltext0
++	.long	.Letext0
++	.long	.Ldebug_line0
++	.uleb128 0x2
++	.byte	0x4
++	.byte	0x7
++	.long	.LASF0
++	.uleb128 0x3
++	.byte	0x4
++	.byte	0x5
++	.string	"int"
++	.uleb128 0x2
++	.byte	0x4
++	.byte	0x5
++	.long	.LASF1
++	.uleb128 0x2
++	.byte	0x1
++	.byte	0x8
++	.long	.LASF2
++	.uleb128 0x2
++	.byte	0x2
++	.byte	0x7
++	.long	.LASF3
++	.uleb128 0x2
++	.byte	0x4
++	.byte	0x7
++	.long	.LASF4
++	.uleb128 0x2
++	.byte	0x1
++	.byte	0x6
++	.long	.LASF5
++	.uleb128 0x2
++	.byte	0x2
++	.byte	0x5
++	.long	.LASF6
++	.uleb128 0x2
++	.byte	0x8
++	.byte	0x5
++	.long	.LASF7
++	.uleb128 0x2
++	.byte	0x8
++	.byte	0x7
++	.long	.LASF8
++	.uleb128 0x4
++	.byte	0x4
++	.byte	0x7
++	.uleb128 0x2
++	.byte	0x1
++	.byte	0x6
++	.long	.LASF9
++	.uleb128 0x5
++	.byte	0x1
++	.long	.LASF13
++	.byte	0x1
++	.byte	0x5
++	.byte	0x1
++	.long	.LFB2
++	.long	.LFE2
++	.long	.LLST0
++	.uleb128 0x6
++	.string	"i"
++	.byte	0x1
++	.byte	0x6
++	.long	0x2c
++	.byte	0x2
++	.byte	0x91
++	.sleb128 -12
++	.byte	0x0
++	.byte	0x0
++	.section	.debug_abbrev
++	.uleb128 0x1
++	.uleb128 0x11
++	.byte	0x1
++	.uleb128 0x25
++	.uleb128 0xe
++	.uleb128 0x13
++	.uleb128 0xb
++	.uleb128 0x3
++	.uleb128 0xe
++	.uleb128 0x1b
++	.uleb128 0xe
++	.uleb128 0x11
++	.uleb128 0x1
++	.uleb128 0x12
++	.uleb128 0x1
++	.uleb128 0x10
++	.uleb128 0x6
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x2
++	.uleb128 0x24
++	.byte	0x0
++	.uleb128 0xb
++	.uleb128 0xb
++	.uleb128 0x3e
++	.uleb128 0xb
++	.uleb128 0x3
++	.uleb128 0xe
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x3
++	.uleb128 0x24
++	.byte	0x0
++	.uleb128 0xb
++	.uleb128 0xb
++	.uleb128 0x3e
++	.uleb128 0xb
++	.uleb128 0x3
++	.uleb128 0x8
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x4
++	.uleb128 0x24
++	.byte	0x0
++	.uleb128 0xb
++	.uleb128 0xb
++	.uleb128 0x3e
++	.uleb128 0xb
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x5
++	.uleb128 0x2e
++	.byte	0x1
++	.uleb128 0x3f
++	.uleb128 0xc
++	.uleb128 0x3
++	.uleb128 0xe
++	.uleb128 0x3a
++	.uleb128 0xb
++	.uleb128 0x3b
++	.uleb128 0xb
++	.uleb128 0x27
++	.uleb128 0xc
++	.uleb128 0x11
++	.uleb128 0x1
++	.uleb128 0x12
++	.uleb128 0x1
++	.uleb128 0x40
++	.uleb128 0x6
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x6
++	.uleb128 0x34
++	.byte	0x0
++	.uleb128 0x3
++	.uleb128 0x8
++	.uleb128 0x3a
++	.uleb128 0xb
++	.uleb128 0x3b
++	.uleb128 0xb
++	.uleb128 0x49
++	.uleb128 0x13
++	.uleb128 0x2
++	.uleb128 0xa
++	.byte	0x0
++	.byte	0x0
++	.byte	0x0
++	.section	.debug_pubnames,"",@progbits
++	.long	0x17
++	.value	0x2
++	.long	.Ldebug_info0
++	.long	0x98
++	.long	0x75
++	.string	"func"
++	.long	0x0
++	.section	.debug_aranges,"",@progbits
++	.long	0x1c
++	.value	0x2
++	.long	.Ldebug_info0
++	.byte	0x4
++	.byte	0x0
++	.value	0x0
++	.value	0x0
++	.long	.Ltext0
++	.long	.Letext0-.Ltext0
++	.long	0x0
++	.long	0x0
++	.section	.debug_str,"MS",@progbits,1
++.LASF7:
++	.string	"long long int"
++.LASF0:
++	.string	"unsigned int"
++.LASF11:
++	.string	"dw2-loclist-prelinked.c"
++.LASF12:
++	.string	"gdb-6.8/gdb/testsuite/gdb.dwarf2"
++.LASF4:
++	.string	"long unsigned int"
++.LASF8:
++	.string	"long long unsigned int"
++.LASF2:
++	.string	"unsigned char"
++.LASF9:
++	.string	"char"
++.LASF1:
++	.string	"long int"
++.LASF3:
++	.string	"short unsigned int"
++.LASF5:
++	.string	"signed char"
++.LASF10:
++	.string	"GNU C 4.3.2 20081007 (Red Hat 4.3.2-6)"
++.LASF13:
++	.string	"func"
++.LASF6:
++	.string	"short int"
++	.ident	"GCC: (GNU) 4.3.2 20081007 (Red Hat 4.3.2-6)"
++	.section	.note.GNU-stack,"",@progbits
+diff --git a/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c b/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c
+@@ -0,0 +1,26 @@
++/* 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/>.  */
++
++/* dw2-loclist-prelinked-func.S */
++extern void func (void);
++
++int
++main (void)
++{
++  func ();
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp b/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp
+@@ -0,0 +1,102 @@
++# 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.
++
++# Minimal DWARF-2 unit test
++
++# This test can only be run on i386/x86_64 targets which support DWARF-2.
++# For now pick a sampling of likely targets.
++if {(![istarget *-*-linux*]
++     && ![istarget *-*-gnu*]
++     && ![istarget *-*-elf*]
++     && ![istarget *-*-openbsd*])
++    || (![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"])} {
++    return 0
++}
++
++set testfile "dw2-loclist-prelinked"
++set srcfuncfile ${testfile}-func.S
++set binsharedfuncfile [standard_output_file ${testfile}.so]
++set srcmainfile ${testfile}-main.c
++set binfile [standard_output_file ${testfile}]
++
++remote_exec build "rm -f ${binfile}"
++
++# get the value of gcc_compiled
++if [get_compiler_info ${binfile}] {
++    return -1
++}
++
++# This test can only be run on gcc as we use additional_flags=FIXME
++if {$gcc_compiled == 0} {
++    return 0
++}
++
++if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfuncfile}" "${binsharedfuncfile}" {debug additional_flags=-m32}] != "" } {
++    untested "Couldn't compile test library"
++    return -1
++}
++
++# The new separate debug info file will be stored in the .debug subdirectory.
++
++if [gdb_gnu_strip_debug ${binsharedfuncfile}] {
++    # check that you have a recent version of strip and objcopy installed
++    unsupported "cannot produce separate debug info files"
++    return -1
++}
++
++if {[catch "system \"/usr/sbin/prelink -qNR --no-exec-shield ${binsharedfuncfile}\""] != 0} {
++    # Maybe we don't have prelink.
++    return -1
++}
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcmainfile}" \
++		   "${binfile}" executable [list debug additional_flags=-m32 shlib=${binsharedfuncfile}]] != "" } {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++gdb_run_cmd
++
++gdb_test "" "Program received signal SIGABRT, Aborted..*" "Enter abort()"
++
++# Incorrect:
++# #0  0x00110430 in __kernel_vsyscall ()
++# No symbol table info available.
++# #1  0x003d44c0 in raise () from /lib/libc.so.6
++# No symbol table info available.
++# #2  0x003d5e88 in abort () from /lib/libc.so.6
++# No symbol table info available.
++# #3  0x44f10437 in func () at dw2-loclist-prelinked.c:8
++# 	i = Could not find the frame base for "func".
++
++# Correct:
++# #0  0x00110430 in __kernel_vsyscall ()
++# No symbol table info available.
++# #1  0x003d44c0 in raise () from /lib/libc.so.6
++# No symbol table info available.
++# #2  0x003d5e88 in abort () from /lib/libc.so.6
++# No symbol table info available.
++# #3  0x4ae36437 in func () at dw2-loclist-prelinked.c:8
++# 	i = 3827288
++# #4  0x0804851a in main () at ../../../gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c:24
++# No locals.
++
++# `abort' can get expressed as `*__GI_abort'.
++gdb_test "bt full" "in \[^ \]*abort \\(.*in func \\(.*\r\n\[\t \]+i = -?\[0-9\].*in main \\(.*" "Backtrace after abort()"

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

@@ -0,0 +1,88 @@
+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-next-over-throw-cxx-exec.patch
+
+;; Fix follow-exec for C++ programs (bugreported by Martin Stransky).
+;;=fedoratest
+
+Archer-upstreamed:
+http://sourceware.org/ml/archer/2010-q2/msg00031.html
+
+diff --git a/gdb/testsuite/gdb.cp/cxxexec.cc b/gdb/testsuite/gdb.cp/cxxexec.cc
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/cxxexec.cc
+@@ -0,0 +1,25 @@
++/* This test script is part of GDB, the GNU debugger.
++
++   Copyright 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/>.  */
++
++#include <unistd.h>
++
++int
++main()
++{
++  execlp ("true", "true", NULL);
++  return 1;
++}
+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 @@
++# Copyright 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/>.
++
++if { [skip_cplus_tests] } { continue }
++
++set testfile cxxexec
++if { [prepare_for_testing ${testfile}.exp ${testfile} ${testfile}.cc {c++ debug}] } {
++    return -1
++}
++
++runto_main
++
++# We could stop after `continue' again at `main'.
++delete_breakpoints
++
++set test "p _Unwind_DebugHook"
++gdb_test_multiple $test $test {
++    -re " = .* 0x\[0-9a-f\].*\r\n$gdb_prompt $" {
++	pass $test
++    }
++    -re "\r\nNo symbol .*\r\n$gdb_prompt $" {
++	xfail $test
++	untested ${testfile}.exp
++	return -1
++    }
++}
++
++# Run to end.  The buggy GDB failed instead with:
++#  Cannot access memory at address ADDR.
++gdb_continue_to_end "" "continue" 1

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

@@ -0,0 +1,254 @@
+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-bz601887-dwarf4-rh-test.patch
+
+;; Backport DWARF-4 support (BZ 601887, Tom Tromey).
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.S b/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.S
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.S
+@@ -0,0 +1,167 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 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/>.  */
++
++	.file	"rh-dwarf4-x86_64.c"
++	.section	.debug_abbrev,"",@progbits
++.Ldebug_abbrev0:
++	.section	.debug_info,"",@progbits
++.Ldebug_info0:
++	.section	.debug_line,"",@progbits
++.Ldebug_line0:
++	.text
++.Ltext0:
++.globl main
++	.type	main, @function
++main:
++.LFB0:
++	.file 1 "gdb.dwarf2/rh-dwarf4-x86_64.c"
++	# gdb.dwarf2/rh-dwarf4-x86_64.c:20
++	.loc 1 20 0
++	.cfi_startproc
++	# basic block 2
++	pushq	%rbp
++	.cfi_def_cfa_offset 16
++	movq	%rsp, %rbp
++	.cfi_offset 6, -16
++	.cfi_def_cfa_register 6
++	# gdb.dwarf2/rh-dwarf4-x86_64.c:21
++	.loc 1 21 0
++	movl	$0, %eax
++	# gdb.dwarf2/rh-dwarf4-x86_64.c:22
++	.loc 1 22 0
++	leave
++	.cfi_def_cfa 7, 8
++	ret
++	.cfi_endproc
++.LFE0:
++	.size	main, .-main
++.Letext0:
++	.section	.debug_info
++	.long	0x4e	# Length of Compilation Unit Info
++	.value	0x4	# DWARF version number
++	.long	.Ldebug_abbrev0	# Offset Into Abbrev. Section
++	.byte	0x8	# Pointer Size (in bytes)
++	.uleb128 0x1	# (DIE (0xb) DW_TAG_compile_unit)
++	.long	.LASF0	# DW_AT_producer: "GNU C 4.4.4 20100503 (Red Hat 4.4.4-2)"
++	.byte	0x1	# DW_AT_language
++	.long	.LASF1	# DW_AT_name: "gdb.dwarf2/rh-dwarf4-x86_64.c"
++	.long	.LASF2	# DW_AT_comp_dir
++	.quad	.Ltext0	# DW_AT_low_pc
++	.quad	.Letext0	# DW_AT_high_pc
++	.long	.Ldebug_line0	# DW_AT_stmt_list
++	.uleb128 0x2	# (DIE (0x2d) DW_TAG_subprogram)
++			# DW_AT_external
++	.long	.LASF3	# DW_AT_name: "main"
++	.byte	0x1	# DW_AT_decl_file (gdb.dwarf2/rh-dwarf4-x86_64.c)
++	.byte	0x13	# DW_AT_decl_line
++			# DW_AT_prototyped
++	.long	0x4a	# DW_AT_type
++	.quad	.LFB0	# DW_AT_low_pc
++	.quad	.LFE0	# DW_AT_high_pc
++	.uleb128 0x1	# DW_AT_frame_base
++	.byte	0x9c	# DW_OP_call_frame_cfa
++	.uleb128 0x3	# (DIE (0x4a) DW_TAG_base_type)
++	.byte	0x4	# DW_AT_byte_size
++	.byte	0x5	# DW_AT_encoding
++	.ascii "int\0"	# DW_AT_name
++	.byte	0x0	# end of children of DIE 0xb
++	.section	.debug_abbrev
++	.uleb128 0x1	# (abbrev code)
++	.uleb128 0x11	# (TAG: DW_TAG_compile_unit)
++	.byte	0x1	# DW_children_yes
++	.uleb128 0x25	# (DW_AT_producer)
++	.uleb128 0xe	# (DW_FORM_strp)
++	.uleb128 0x13	# (DW_AT_language)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x3	# (DW_AT_name)
++	.uleb128 0xe	# (DW_FORM_strp)
++	.uleb128 0x1b	# (DW_AT_comp_dir)
++	.uleb128 0xe	# (DW_FORM_strp)
++	.uleb128 0x11	# (DW_AT_low_pc)
++	.uleb128 0x1	# (DW_FORM_addr)
++	.uleb128 0x12	# (DW_AT_high_pc)
++	.uleb128 0x1	# (DW_FORM_addr)
++	.uleb128 0x10	# (DW_AT_stmt_list)
++	.uleb128 0x17	# (DW_FORM_sec_offset)
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x2	# (abbrev code)
++	.uleb128 0x2e	# (TAG: DW_TAG_subprogram)
++	.byte	0x0	# DW_children_no
++	.uleb128 0x3f	# (DW_AT_external)
++	.uleb128 0x19	# (DW_FORM_flag_present)
++	.uleb128 0x3	# (DW_AT_name)
++	.uleb128 0xe	# (DW_FORM_strp)
++	.uleb128 0x3a	# (DW_AT_decl_file)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x3b	# (DW_AT_decl_line)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x27	# (DW_AT_prototyped)
++	.uleb128 0x19	# (DW_FORM_flag_present)
++	.uleb128 0x49	# (DW_AT_type)
++	.uleb128 0x13	# (DW_FORM_ref4)
++	.uleb128 0x11	# (DW_AT_low_pc)
++	.uleb128 0x1	# (DW_FORM_addr)
++	.uleb128 0x12	# (DW_AT_high_pc)
++	.uleb128 0x1	# (DW_FORM_addr)
++	.uleb128 0x40	# (DW_AT_frame_base)
++	.uleb128 0x18	# (DW_FORM_exprloc)
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x3	# (abbrev code)
++	.uleb128 0x24	# (TAG: DW_TAG_base_type)
++	.byte	0x0	# DW_children_no
++	.uleb128 0xb	# (DW_AT_byte_size)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x3e	# (DW_AT_encoding)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x3	# (DW_AT_name)
++	.uleb128 0x8	# (DW_FORM_string)
++	.byte	0x0
++	.byte	0x0
++	.byte	0x0
++	.section	.debug_pubnames,"",@progbits
++	.long	0x17	# Length of Public Names Info
++	.value	0x2	# DWARF Version
++	.long	.Ldebug_info0	# Offset of Compilation Unit Info
++	.long	0x52	# Compilation Unit Length
++	.long	0x2d	# DIE offset
++	.ascii "main\0"	# external name
++	.long	0x0
++	.section	.debug_aranges,"",@progbits
++	.long	0x2c	# Length of Address Ranges Info
++	.value	0x2	# DWARF Version
++	.long	.Ldebug_info0	# Offset of Compilation Unit Info
++	.byte	0x8	# Size of Address
++	.byte	0x0	# Size of Segment Descriptor
++	.value	0x0	# Pad to 16 byte boundary
++	.value	0x0
++	.quad	.Ltext0	# Address
++	.quad	.Letext0-.Ltext0	# Length
++	.quad	0x0
++	.quad	0x0
++	.section	.debug_str,"MS",@progbits,1
++.LASF2:
++	.string	"."
++.LASF0:
++	.string	"GNU C 4.4.4 20100503 (Red Hat 4.4.4-2)"
++.LASF1:
++	.string	"gdb.dwarf2/rh-dwarf4-x86_64.c"
++.LASF3:
++	.string	"main"
++	.ident	"GCC: (GNU) 4.4.4 20100503 (Red Hat 4.4.4-2)"
++	.section	.note.GNU-stack,"",@progbits
+diff --git a/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.c b/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.c
+@@ -0,0 +1,22 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 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/>.  */
++
++int
++main (void)
++{
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.exp b/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.exp
+@@ -0,0 +1,42 @@
++# Copyright 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/>.
++
++# This test can only be run on targets which support DWARF-2 and use gas.
++# For now pick a sampling of likely targets.
++if {![istarget *-*-linux*]
++    && ![istarget *-*-gnu*]
++    && ![istarget *-*-elf*]
++    && ![istarget *-*-openbsd*]
++    && ![istarget arm-*-eabi*]
++    && ![istarget powerpc-*-eabi*]} {
++    return 0
++}
++
++if {![istarget x86_64-*]} {
++    return 0
++}
++
++set testfile "rh-dwarf4-x86_64"
++set srcfile ${testfile}.S
++set executable ${testfile}.x
++set binfile [standard_output_file ${executable}]
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "" } {
++    return -1
++}
++
++clean_restart $executable
++
++gdb_test "ptype main" {type = int \(void\)}

SOURCES/gdb-bz634108-solib_address.patch

@@ -0,0 +1,41 @@
+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-bz634108-solib_address.patch
+
+;; Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
+;;=fedoratest
+
+Fix gdb.solib_address (fix by Phil Muldoon).
+
+s/solib_address/solib_name/ during upstreaming.
+
+diff --git a/gdb/testsuite/gdb.python/rh634108-solib_address.exp b/gdb/testsuite/gdb.python/rh634108-solib_address.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.python/rh634108-solib_address.exp
+@@ -0,0 +1,24 @@
++# Copyright (C) 2008, 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/>.
++
++# https://bugzilla.redhat.com/show_bug.cgi?id=634108
++
++gdb_exit
++gdb_start
++
++# 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"

SOURCES/gdb-ccache-workaround.patch

@@ -0,0 +1,26 @@
+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-ccache-workaround.patch
+
+;; Workaround ccache making lineno non-zero for command-line definitions.
+;;=fedoratest: ccache is rarely used and it is even fixed now.
+
+diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
+--- a/gdb/testsuite/gdb.base/macscp.exp
++++ b/gdb/testsuite/gdb.base/macscp.exp
+@@ -27,6 +27,14 @@ if { [test_compiler_info "gcc-*"] } {
+     lappend options additional_flags=-fdebug-macro
+ }
+ 
++# Workaround ccache making lineno non-zero for command-line definitions.
++if {[find_gcc] == "gcc" && [file executable "/usr/bin/gcc"]} {
++    set result [catch "exec which gcc" output]
++    if {$result == 0 && [string first "/ccache/" $output] > -1} {
++	lappend options "compiler=/usr/bin/gcc"
++    }
++}
++
+ # Generate the intermediate object file.  This is required by Darwin to
+ # have access to the .debug_macinfo section.
+ if  {[gdb_compile "${srcdir}/${subdir}/macscp1.c" "${objfile}" \

SOURCES/gdb-container-rh-pkg.patch

@@ -0,0 +1,30 @@
+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-container-rh-pkg.patch
+
+;; Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
+;;=fedora
+
+diff --git a/gdb/remote.c b/gdb/remote.c
+--- a/gdb/remote.c
++++ b/gdb/remote.c
+@@ -14291,7 +14291,17 @@ remote_target::pid_to_exec_file (int pid)
+   char *annex = NULL;
+ 
+   if (packet_support (PACKET_qXfer_exec_file) != PACKET_ENABLE)
+-    return NULL;
++    {
++      warning (_("Remote gdbserver does not support determining executable "
++		 "automatically.\n"
++"RHEL <=6.8 and <=7.2 versions of gdbserver do not support such automatic executable detection.\n"
++"The following versions of gdbserver support it:\n"
++"- Upstream version of gdbserver (unsupported) 7.10 or later\n"
++"- Red Hat Developer Toolset (DTS) version of gdbserver from DTS 4.0 or later (only on x86_64)\n"
++"- RHEL-7.3 versions of gdbserver (on any architecture)"
++));
++      return NULL;
++    }
+ 
+   inferior *inf = find_inferior_pid (this, pid);
+   if (inf == NULL)

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

@@ -0,0 +1,58 @@
+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-core-open-vdso-warning.patch
+
+;; Fix GNU/Linux core open: Can't read pathname for load map: Input/output error.
+;; Fix regression of undisplayed missing shared libraries caused by a fix for.
+;;=fedoratest: It should be in glibc: libc-alpha: <20091004161706.GA27450@.*>
+
+http://sourceware.org/ml/gdb-patches/2009-10/msg00142.html
+Subject: [patch] Fix GNU/Linux core open: Can't read pathname for load map:  Input/output error.
+
+[ New patch variant.  ]
+
+commit 7d760051ffb8a23cdc51342d4e6243fbc462f73f
+Author: Ulrich Weigand <uweigand@de.ibm.com>
+Date:   Wed Sep 25 11:52:50 2013 +0000
+
+diff --git a/gdb/testsuite/gdb.base/solib-symbol.exp b/gdb/testsuite/gdb.base/solib-symbol.exp
+--- a/gdb/testsuite/gdb.base/solib-symbol.exp
++++ b/gdb/testsuite/gdb.base/solib-symbol.exp
+@@ -29,6 +29,7 @@ set testfile "solib-symbol-main"
+ set srcfile ${srcdir}/${subdir}/${testfile}.c
+ set binfile [standard_output_file ${testfile}]
+ set bin_flags [list debug shlib=${binfile_lib}]
++set executable ${testfile}
+ 
+ if [get_compiler_info] {
+     return -1
+@@ -71,8 +72,26 @@ gdb_test "br foo2" \
+ 	 "Breakpoint.*: foo2. .2 locations..*" \
+ 	 "foo2 in mdlib"
+ 
+-gdb_exit
++# Test GDB warns for shared libraris which have not been found.
+ 
+-return 0
++gdb_test "info sharedlibrary" "/${libname}.*"
+ 
++clean_restart ${executable}
++gdb_breakpoint "main"
++gdb_run_cmd
++set test "no warning for missing libraries"
++gdb_test_multiple "" $test {
++    -re "warning: Could not load shared library symbols for \[0-9\]+ libraries,.*\r\n$gdb_prompt $" {
++	fail $test
++    }
++    -re "Breakpoint \[0-9\]+, main .*\r\n$gdb_prompt $" {
++	pass $test
++    }
++}
+ 
++clean_restart ${executable}
++gdb_test_no_output "set solib-absolute-prefix /doESnotEXIST"
++gdb_breakpoint "main"
++gdb_run_cmd
++gdb_test "" "warning: Could not load shared library symbols for \[0-9\]+ libraries,.*\r\nBreakpoint \[0-9\]+, main .*" \
++	 "warning for missing libraries"

SOURCES/gdb-fedora-libncursesw.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-fedora-libncursesw.patch
+
+;; Force libncursesw over libncurses to match the includes (RH BZ 1270534).
+;;=push+jan
+
+Fedora: Force libncursesw over libncurses to match the includes.
+https://bugzilla.redhat.com/show_bug.cgi?id=1270534
+
+diff --git a/gdb/configure b/gdb/configure
+--- a/gdb/configure
++++ b/gdb/configure
+@@ -9552,6 +9552,7 @@ if test x"$prefer_curses" = xyes; then
+   # search /usr/local/include, if ncurses is installed in /usr/local.  A
+   # default installation of ncurses on alpha*-dec-osf* will lead to such
+   # a situation.
++  # Fedora: Force libncursesw over libncurses to match the includes.
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing waddstr" >&5
+ $as_echo_n "checking for library containing waddstr... " >&6; }
+ if ${ac_cv_search_waddstr+:} false; then :
+@@ -9576,7 +9577,7 @@ return waddstr ();
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' ncursesw ncurses cursesX curses; do
++for ac_lib in '' ncursesw; do
+   if test -z "$ac_lib"; then
+     ac_res="none required"
+   else
+@@ -9650,6 +9651,7 @@ case $host_os in
+ esac
+ 
+ # These are the libraries checked by Readline.
++# Fedora: Force libncursesw over libncurses to match the includes.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
+ $as_echo_n "checking for library containing tgetent... " >&6; }
+ if ${ac_cv_search_tgetent+:} false; then :
+@@ -9674,7 +9676,7 @@ return tgetent ();
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' termcap tinfow tinfo curses ncursesw ncurses; do
++for ac_lib in '' 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
+@@ -736,7 +736,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.
+-  AC_SEARCH_LIBS(waddstr, [ncursesw ncurses cursesX curses])
++  # Fedora: Force libncursesw over libncurses to match the includes.
++  AC_SEARCH_LIBS(waddstr, [ncursesw])
+ 
+   if test "$ac_cv_search_waddstr" != no; then
+     curses_found=yes
+@@ -778,7 +779,8 @@ case $host_os in
+ esac
+ 
+ # These are the libraries checked by Readline.
+-AC_SEARCH_LIBS(tgetent, [termcap tinfow tinfo curses ncursesw ncurses])
++# Fedora: Force libncursesw over libncurses to match the includes.
++AC_SEARCH_LIBS(tgetent, [ncursesw])
+ 
+ if test "$ac_cv_search_tgetent" = no; then
+   CONFIG_OBS="$CONFIG_OBS stub-termcap.o"

SOURCES/gdb-fortran-frame-string.patch

@@ -0,0 +1,104 @@
+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-fortran-frame-string.patch
+
+;; Display Fortran strings in backtraces.
+;;=fedoratest
+
+http://sourceware.org/ml/gdb-patches/2014-07/msg00709.html
+
+Hi,
+
+for Fortran it fixes displaying normal strings also in frames/backtraces:
+
+(gdb) frame
+->
+
+The patch is simple and I do not see why it should not be this way.
+
+For C/C++ TYPE_CODE_STRING is not used.  I am not aware of Pascal but that
+language is currently not really much supported in GDB anyway.
+
+This was a part of my archer/jankratochvil/vla branch but it is not a part of
+the Intel VLA patchset as it in fact is completely unrelated to "VLA".
+
+No regressions on {x86_64,x86_64-m32,i686}-fedora22pre-linux-gnu.
+
+Thanks,
+Jan
+
+diff --git a/gdb/testsuite/gdb.fortran/fortran-frame-string.exp b/gdb/testsuite/gdb.fortran/fortran-frame-string.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.fortran/fortran-frame-string.exp
+@@ -0,0 +1,36 @@
++# Copyright 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 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.
++
++standard_testfile .f90
++if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}] } {
++    return -1
++}
++
++if ![runto MAIN__] then {
++    perror "couldn't run to breakpoint MAIN__"
++    continue
++}
++
++gdb_breakpoint [gdb_get_line_number "s = s"]
++gdb_continue_to_breakpoint "s = s"
++
++gdb_test "ptype s" {type = character\*3}
++gdb_test "p s" " = 'foo'"
++
++# Fix rejected upstream:
++# https://sourceware.org/ml/gdb-patches/2014-07/msg00768.html
++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
+--- /dev/null
++++ b/gdb/testsuite/gdb.fortran/fortran-frame-string.f90
+@@ -0,0 +1,28 @@
++! Copyright 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 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.
++!
++! Ihis file is the Fortran source file for dynamic.exp.
++! Original file written by Jakub Jelinek <jakub@redhat.com>.
++! Modified for the GDB testcase by Jan Kratochvil <jan.kratochvil@redhat.com>.
++
++  subroutine f(s)
++  character*3 s
++  s = s
++  end
++
++  program main
++  call f ('foo')
++  end

SOURCES/gdb-glibc-strstr-workaround.patch

@@ -0,0 +1,132 @@
+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-glibc-strstr-workaround.patch
+
+;; Workaround PR libc/14166 for inferior calls of strstr.
+;;=fedoratest: Compatibility with RHELs (unchecked which ones).
+
+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 @@
++# Copyright (C) 2012 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/>.
++
++# Workaround for:
++# invalid IFUNC DW_AT_linkage_name: memmove strstr time
++# http://sourceware.org/bugzilla/show_bug.cgi?id=14166
++
++if {[skip_shlib_tests]} {
++    return 0
++}
++
++set testfile "gnu-ifunc-strstr-workaround"
++set executable ${testfile}
++set srcfile start.c
++set binfile [standard_output_file ${executable}]
++
++if [prepare_for_testing ${testfile}.exp $executable $srcfile] {
++    return -1
++}
++
++if ![runto_main] {
++    return 0
++}
++
++set test "ptype atoi"
++gdb_test_multiple $test $test {
++    -re "type = int \\(const char \\*\\)\r\n$gdb_prompt $" {
++	pass $test
++    }
++    -re "type = int \\(\\)\r\n$gdb_prompt $" {
++	untested "$test (no DWARF)"
++	return 0
++    }
++    -re "type = <unknown return type> \\(\\)\r\n$gdb_prompt $" {
++	untested "$test (no DWARF)"
++	return 0
++    }
++}
++
++set addr ""
++set test "print strstr"
++gdb_test_multiple $test $test {
++    -re " = {<text gnu-indirect-function variable, no debug info>} (0x\[0-9a-f\]+) <strstr>\r\n$gdb_prompt $" {
++	set addr $expect_out(1,string)
++	pass $test
++    }
++    -re " = {<text gnu-indirect-function variable, no debug info>} (0x\[0-9a-f\]+) <__strstr>\r\n$gdb_prompt $" {
++	set addr $expect_out(1,string)
++	pass "$test (GDB workaround)"
++    }
++    -re " = {<text gnu-indirect-function variable, no debug info>} (0x\[0-9a-f\]+) <__libc_strstr>\r\n$gdb_prompt $" {
++	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
++    }
++}
++
++set test "info sym"
++gdb_test_multiple "info sym $addr" $test {
++    -re "strstr in section \\.text of /lib\[^/\]*/libc.so.6\r\n$gdb_prompt $" {
++	pass $test
++    }
++    -re " = {char \\*\\(const char \\*, const char \\*\\)} 0x\[0-9a-f\]+ <strstr>\r\n$gdb_prompt $" {
++	# unexpected
++	xfail "$test (not in libc.so.6)"
++	return 0
++    }
++}
++
++set test "info addr strstr"
++gdb_test_multiple $test $test {
++    -re "Symbol \"strstr\" is a function at address $addr\\.\r\n$gdb_prompt $" {
++	fail "$test (DWARF for strstr)"
++    }
++    -re "Symbol \"strstr\" is at $addr in a file compiled without debugging\\.\r\n$gdb_prompt $" {
++	pass "$test"
++    }
++}
++
++set test "print strstr second time"
++gdb_test_multiple "print strstr" $test {
++    -re " = {<text gnu-indirect-function variable, no debug info>} $addr <strstr>\r\n$gdb_prompt $" {
++	pass $test
++    }
++    -re " = {<text gnu-indirect-function variable, no debug info>} $addr <__strstr>\r\n$gdb_prompt $" {
++	pass "$test (GDB workaround)"
++    }
++    -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"}

SOURCES/gdb-gstack.man

@@ -0,0 +1,48 @@
+.\"
+.\" gstack manual page.
+.\" Copyright (c) 1999 Ross Thompson
+.\" Copyright (c) 2001, 2002, 2004, 2008 Red Hat, Inc.
+.\"
+.\" Original author: Ross Thompson <ross@whatsis.com>
+.\"
+.\" 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, 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; see the file COPYING.  If not, write to
+.\" the Free Software Foundation, 59 Temple Place - Suite 330,
+.\" Boston, MA 02111-1307, USA.
+.\"
+.TH GSTACK 1 "Feb 15 2008" "Red Hat Linux" "Linux Programmer's Manual"
+
+.SH NAME
+gstack \- print a stack trace of a running process
+
+.SH SYNOPSIS
+.B gstack
+pid
+
+.SH DESCRIPTION
+
+\f3gstack\f1 attaches to the active process named by the \f3pid\f1 on
+the command line, and prints out an execution stack trace.  If ELF
+symbols exist in the binary (usually the case unless you have run
+strip(1)), then symbolic addresses are printed as well.
+
+If the process is part of a thread group, then \f3gstack\f1 will print
+out a stack trace for each of the threads in the group.
+
+.SH SEE ALSO
+nm(1), ptrace(2), gdb(1)
+
+.SH AUTHORS
+Ross Thompson <ross@whatsis.com>
+
+Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla>

SOURCES/gdb-libexec-add-index.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-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}
+ 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##*/}"
+ 
+ dwarf5=""

SOURCES/gdb-lineno-makeup-test.patch

@@ -0,0 +1,165 @@
+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-lineno-makeup-test.patch
+
+;; Testcase for "Do not make up line information" fix by Daniel Jacobowitz.
+;;=fedoratest
+
+New testcase for:
+https://bugzilla.redhat.com/show_bug.cgi?id=466222
+	(for the first / customer recommended fix)
+and the upstream fix:
+http://sourceware.org/ml/gdb-patches/2006-11/msg00253.html
+	[rfc] Do not make up line information
+http://sourceware.org/ml/gdb-cvs/2006-11/msg00127.html
+
+diff --git a/gdb/testsuite/gdb.base/lineno-makeup-func.c b/gdb/testsuite/gdb.base/lineno-makeup-func.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/lineno-makeup-func.c
+@@ -0,0 +1,21 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   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/>.  */
++
++void
++func (void)
++{
++}
+diff --git a/gdb/testsuite/gdb.base/lineno-makeup.c b/gdb/testsuite/gdb.base/lineno-makeup.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/lineno-makeup.c
+@@ -0,0 +1,35 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   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/>.  */
++
++/* 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'.  */
++
++extern void func (void);
++asm ("func: .incbin \"" BINFILENAME "\"");
++
++int
++main (void)
++{
++  func ();
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/lineno-makeup.exp b/gdb/testsuite/gdb.base/lineno-makeup.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/lineno-makeup.exp
+@@ -0,0 +1,78 @@
++# 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 "lineno-makeup"
++set srcfuncfile ${testfile}-func.c
++set srcfile ${testfile}.c
++set objfuncfile [standard_output_file ${testfile}-func.o]
++set binfuncfile [standard_output_file ${testfile}-func.bin]
++set binfile [standard_output_file ${testfile}]
++
++if { [gdb_compile "${srcdir}/${subdir}/${srcfuncfile}" "${objfuncfile}" object {}] != "" } {
++    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
++}
++
++set objcopy [catch "exec objcopy -O binary --only-section .text ${objfuncfile} ${binfuncfile}" output]
++verbose -log "objcopy=$objcopy: $output"
++if { $objcopy != 0 } {
++    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
++}
++set binfuncfilesize [file size $binfuncfile]
++verbose -log "file size $binfuncfile = $binfuncfilesize"
++
++if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug additional_flags=-DBINFILENAME=\"$binfuncfile\"]] != "" } {
++    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++set b_addr ""
++set test "break func"
++gdb_test_multiple $test $test {
++    -re "Breakpoint \[0-9\]+ at (0x\[0-9a-f\]+)\r\n$gdb_prompt $" {
++	set b_addr $expect_out(1,string)
++	pass $test
++    }
++    -re "Breakpoint \[0-9\]+ at (0x\[0-9a-f\]+): .*\r\n$gdb_prompt $" {
++	set b_addr $expect_out(1,string)
++	fail $test
++    }
++}
++verbose -log "b_addr=<$b_addr>"
++
++set p_addr ""
++set test "print func"
++gdb_test_multiple $test $test {
++    -re "\\$\[0-9\]+ = {<text variable, no debug info>} (0x\[0-9a-f\]+) <func>\r\n$gdb_prompt $" {
++	set p_addr $expect_out(1,string)
++	pass $test
++    }
++}
++verbose -log "p_addr=<$p_addr>"
++
++set test "break address belongs to func"
++if {$b_addr == $p_addr} {
++    pass "$test (exact match)"
++} else {
++    set skip [expr $b_addr - $p_addr]
++    if {$skip > 0 && $skip < $binfuncfilesize} {
++	pass "$test (prologue skip by $skip bytes)"
++    } else {
++	fail $test
++    }
++}

SOURCES/gdb-linux_perf-bundle.patch

@@ -0,0 +1,224 @@
+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-linux_perf-bundle.patch
+
+;; [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
+;;=fedora
+
+diff --git a/gdb/gdb.c b/gdb/gdb.c
+--- a/gdb/gdb.c
++++ b/gdb/gdb.c
+@@ -20,11 +20,19 @@
+ #include "main.h"
+ #include "interps.h"
+ 
++#ifdef PERF_ATTR_SIZE_VER5_BUNDLE
++extern "C" void __libipt_init(void);
++#endif
++
+ int
+ main (int argc, char **argv)
+ {
+   struct captured_main_args args;
+ 
++#ifdef PERF_ATTR_SIZE_VER5_BUNDLE
++  __libipt_init();
++#endif
++
+   memset (&args, 0, sizeof args);
+   args.argc = argc;
+   args.argv = argv;
+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 @@
+ #  include <linux/perf_event.h>
+ #endif
+ 
++#ifdef PERF_ATTR_SIZE_VER5_BUNDLE
++#ifndef HAVE_LINUX_PERF_EVENT_H
++# error "PERF_ATTR_SIZE_VER5_BUNDLE && !HAVE_LINUX_PERF_EVENT_H"
++#endif
++#ifndef PERF_ATTR_SIZE_VER5
++#define PERF_ATTR_SIZE_VER5
++#define perf_event_mmap_page perf_event_mmap_page_bundle
++// kernel-headers-3.10.0-493.el7.x86_64/usr/include/linux/perf_event.h
++/*
++ * Structure of the page that can be mapped via mmap
++ */
++struct perf_event_mmap_page {
++	__u32	version;		/* version number of this structure */
++	__u32	compat_version;		/* lowest version this is compat with */
++
++	/*
++	 * Bits needed to read the hw events in user-space.
++	 *
++	 *   u32 seq, time_mult, time_shift, index, width;
++	 *   u64 count, enabled, running;
++	 *   u64 cyc, time_offset;
++	 *   s64 pmc = 0;
++	 *
++	 *   do {
++	 *     seq = pc->lock;
++	 *     barrier()
++	 *
++	 *     enabled = pc->time_enabled;
++	 *     running = pc->time_running;
++	 *
++	 *     if (pc->cap_usr_time && enabled != running) {
++	 *       cyc = rdtsc();
++	 *       time_offset = pc->time_offset;
++	 *       time_mult   = pc->time_mult;
++	 *       time_shift  = pc->time_shift;
++	 *     }
++	 *
++	 *     index = pc->index;
++	 *     count = pc->offset;
++	 *     if (pc->cap_user_rdpmc && index) {
++	 *       width = pc->pmc_width;
++	 *       pmc = rdpmc(index - 1);
++	 *     }
++	 *
++	 *     barrier();
++	 *   } while (pc->lock != seq);
++	 *
++	 * NOTE: for obvious reason this only works on self-monitoring
++	 *       processes.
++	 */
++	__u32	lock;			/* seqlock for synchronization */
++	__u32	index;			/* hardware event identifier */
++	__s64	offset;			/* add to hardware event value */
++	__u64	time_enabled;		/* time event active */
++	__u64	time_running;		/* time event on cpu */
++	union {
++		__u64	capabilities;
++		struct {
++			__u64	cap_bit0		: 1, /* Always 0, deprecated, see commit 860f085b74e9 */
++				cap_bit0_is_deprecated	: 1, /* Always 1, signals that bit 0 is zero */
++
++				cap_user_rdpmc		: 1, /* The RDPMC instruction can be used to read counts */
++				cap_user_time		: 1, /* The time_* fields are used */
++				cap_user_time_zero	: 1, /* The time_zero field is used */
++				cap_____res		: 59;
++		};
++	};
++
++	/*
++	 * If cap_user_rdpmc this field provides the bit-width of the value
++	 * read using the rdpmc() or equivalent instruction. This can be used
++	 * to sign extend the result like:
++	 *
++	 *   pmc <<= 64 - width;
++	 *   pmc >>= 64 - width; // signed shift right
++	 *   count += pmc;
++	 */
++	__u16	pmc_width;
++
++	/*
++	 * If cap_usr_time the below fields can be used to compute the time
++	 * delta since time_enabled (in ns) using rdtsc or similar.
++	 *
++	 *   u64 quot, rem;
++	 *   u64 delta;
++	 *
++	 *   quot = (cyc >> time_shift);
++	 *   rem = cyc & (((u64)1 << time_shift) - 1);
++	 *   delta = time_offset + quot * time_mult +
++	 *              ((rem * time_mult) >> time_shift);
++	 *
++	 * Where time_offset,time_mult,time_shift and cyc are read in the
++	 * seqcount loop described above. This delta can then be added to
++	 * enabled and possible running (if index), improving the scaling:
++	 *
++	 *   enabled += delta;
++	 *   if (index)
++	 *     running += delta;
++	 *
++	 *   quot = count / running;
++	 *   rem  = count % running;
++	 *   count = quot * enabled + (rem * enabled) / running;
++	 */
++	__u16	time_shift;
++	__u32	time_mult;
++	__u64	time_offset;
++	/*
++	 * If cap_usr_time_zero, the hardware clock (e.g. TSC) can be calculated
++	 * from sample timestamps.
++	 *
++	 *   time = timestamp - time_zero;
++	 *   quot = time / time_mult;
++	 *   rem  = time % time_mult;
++	 *   cyc = (quot << time_shift) + (rem << time_shift) / time_mult;
++	 *
++	 * And vice versa:
++	 *
++	 *   quot = cyc >> time_shift;
++	 *   rem  = cyc & (((u64)1 << time_shift) - 1);
++	 *   timestamp = time_zero + quot * time_mult +
++	 *               ((rem * time_mult) >> time_shift);
++	 */
++	__u64	time_zero;
++	__u32	size;			/* Header size up to __reserved[] fields. */
++
++		/*
++		 * Hole for extension of the self monitor capabilities
++		 */
++
++	__u8	__reserved[118*8+4];	/* align to 1k. */
++
++	/*
++	 * Control data for the mmap() data buffer.
++	 *
++	 * User-space reading the @data_head value should issue an smp_rmb(),
++	 * after reading this value.
++	 *
++	 * When the mapping is PROT_WRITE the @data_tail value should be
++	 * written by userspace to reflect the last read data, after issueing
++	 * an smp_mb() to separate the data read from the ->data_tail store.
++	 * In this case the kernel will not over-write unread data.
++	 *
++	 * See perf_output_put_handle() for the data ordering.
++	 *
++	 * data_{offset,size} indicate the location and size of the perf record
++	 * buffer within the mmapped area.
++	 */
++	__u64   data_head;		/* head in the data section */
++	__u64	data_tail;		/* user-space written tail */
++	__u64	data_offset;		/* where the buffer starts */
++	__u64	data_size;		/* data buffer size */
++
++	/*
++	 * AUX area is defined by aux_{offset,size} fields that should be set
++	 * by the userspace, so that
++	 *
++	 *   aux_offset >= data_offset + data_size
++	 *
++	 * prior to mmap()ing it. Size of the mmap()ed area should be aux_size.
++	 *
++	 * Ring buffer pointers aux_{head,tail} have the same semantics as
++	 * data_{head,tail} and same ordering rules apply.
++	 */
++	__u64	aux_head;
++	__u64	aux_tail;
++	__u64	aux_offset;
++	__u64	aux_size;
++};
++#endif // PERF_ATTR_SIZE_VER5
++#endif // PERF_ATTR_SIZE_VER5_BUNDLE
++
+ 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
+@@ -140,7 +140,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-opcodes-clflushopt-test.patch

@@ -0,0 +1,62 @@
+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-opcodes-clflushopt-test.patch
+
+;; Test clflushopt instruction decode (for RH BZ 1262471).
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.arch/amd64-clflushopt.S b/gdb/testsuite/gdb.arch/amd64-clflushopt.S
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/amd64-clflushopt.S
+@@ -0,0 +1,19 @@
++/* Copyright 2016 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/>.
++
++   This file is part of the gdb testsuite.  */
++
++_start:	.globl	_start
++	clflushopt (%edi)
+diff --git a/gdb/testsuite/gdb.arch/amd64-clflushopt.exp b/gdb/testsuite/gdb.arch/amd64-clflushopt.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/amd64-clflushopt.exp
+@@ -0,0 +1,25 @@
++# Copyright 2016 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 { ![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"] } then {
++    verbose "Skipping amd64 clflushopt test."
++    return
++}
++
++if [prepare_for_testing amd64-clflushopt.exp amd64-clflushopt amd64-clflushopt.S [list debug "additional_flags=-nostdlib"]] {
++    return -1
++}
++
++gdb_test "disas _start" "Dump of assembler code for function _start:\r\n *0x\[0-9a-f\]+ <\[+\]0>:\tclflushopt \\(%edi\\)\r\nEnd of assembler dump\\." "clflushopt"

SOURCES/gdb-orphanripper.c

@@ -0,0 +1,752 @@
+/*
+ * Copyright 2006-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.
+ *
+ * Reap any leftover children possibly holding file descriptors.
+ * Children are identified by the stale file descriptor or PGID / SID.
+ * Both can be missed but only the stale file descriptors are important for us.
+ * PGID / SID may be set by the children on their own.
+ * If we fine a candidate we kill it will all its process tree (grandchildren).
+ * The child process is run with `2>&1' redirection (due to forkpty(3)).
+ * 2007-07-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ */
+
+/* For getpgid(2).  */
+#define _GNU_SOURCE 1
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <errno.h>
+#include <ctype.h>
+#include <string.h>
+#include <limits.h>
+#include <fcntl.h>
+#include <assert.h>
+#include <pty.h>
+#include <poll.h>
+#include <sys/stat.h>
+
+#define LENGTH(x) (sizeof (x) / sizeof (*(x)))
+
+static const char *progname;
+
+static volatile pid_t child;
+
+static void signal_chld (int signo)
+{
+}
+
+static volatile int signal_alrm_hit = 0;
+
+static void signal_alrm (int signo)
+{
+  signal_alrm_hit = 1;
+}
+
+static char childptyname[LINE_MAX];
+
+static void print_child_error (const char *reason, char **argv)
+{
+  char **sp;
+
+  fprintf (stderr, "%s: %d %s:", progname, (int) child, reason);
+  for (sp = argv; *sp != NULL; sp++)
+    {
+      fputc (' ', stderr);
+      fputs (*sp, stderr);
+    }
+  fputc ('\n', stderr);
+}
+
+static int read_out (int amaster)
+{
+  char buf[LINE_MAX];
+  ssize_t buf_got;
+
+  buf_got = read (amaster, buf, sizeof buf);
+  if (buf_got == 0)
+    return 0;
+  /* Weird but at least after POLLHUP we get EIO instead of just EOF.  */
+  if (buf_got == -1 && errno == EIO)
+    return 0;
+  if (buf_got == -1 && errno == EAGAIN)
+    return 0;
+  if (buf_got < 0)
+    {
+      perror ("read (amaster)");
+      exit (EXIT_FAILURE);
+    }
+  if (write (STDOUT_FILENO, buf, buf_got) != buf_got)
+    {
+      perror ("write(2)");
+      exit (EXIT_FAILURE);
+    }
+  return 1;
+}
+
+/* kill (child, 0) == 0 sometimes even when CHILD's state is already "Z".  */
+
+static int child_exited (void)
+{
+  char buf[200];
+  int fd, i, retval;
+  ssize_t got;
+  char state[3];
+
+  snprintf (buf, sizeof (buf), "/proc/%ld/stat", (long) child);
+  fd = open (buf, O_RDONLY);
+  if (fd == -1)
+    {
+      perror ("open (/proc/CHILD/stat)");
+      exit (EXIT_FAILURE);
+    }
+  got = read (fd, buf, sizeof(buf));
+  if (got <= 0)
+    {
+      perror ("read (/proc/CHILD/stat)");
+      exit (EXIT_FAILURE);
+    }
+  if (close (fd) != 0)
+    {
+      perror ("close (/proc/CHILD/stat)");
+      exit (EXIT_FAILURE);
+    }
+  /* RHEL-5 does not support %ms.  */
+  i = sscanf (buf, "%*d%*s%2s", state);
+  if (i != 1)
+    {
+      perror ("sscanf (/proc/CHILD/stat)");
+      exit (EXIT_FAILURE);
+    }
+  retval = strcmp (state, "Z") == 0;
+  return retval;
+}
+
+static int spawn (char **argv, int timeout)
+{
+  pid_t child_got;
+  int status, amaster, i, rc;
+  struct sigaction act;
+  sigset_t set;
+  struct termios termios;
+  unsigned alarm_orig;
+
+  /* We do not use signal(2) to be sure we do not have SA_RESTART.  */
+  memset (&act, 0, sizeof (act));
+  act.sa_handler = signal_chld;
+  i = sigemptyset (&act.sa_mask);
+  assert (i == 0);
+  act.sa_flags = 0;	/* !SA_RESTART */
+  i = sigaction (SIGCHLD, &act, NULL);
+  assert (i == 0);
+
+  i = sigemptyset (&set);
+  assert (i == 0);
+  i = sigaddset (&set, SIGCHLD);
+  assert (i == 0);
+  i = sigprocmask (SIG_SETMASK, &set, NULL);
+  assert (i == 0);
+
+  /* With TERMP passed as NULL we get "\n" -> "\r\n".  */
+  termios.c_iflag = IGNBRK | IGNPAR;
+  termios.c_oflag = 0;
+  termios.c_cflag = CS8 | CREAD | CLOCAL | HUPCL | B9600;
+  termios.c_lflag = IEXTEN | NOFLSH;
+  memset (termios.c_cc, _POSIX_VDISABLE, sizeof (termios.c_cc));
+  termios.c_cc[VTIME] = 0;
+  termios.c_cc[VMIN ] = 1;
+  cfmakeraw (&termios);
+#ifdef FLUSHO
+  /* Workaround a readline deadlock bug in _get_tty_settings().  */
+  termios.c_lflag &= ~FLUSHO;
+#endif
+  child = forkpty (&amaster, childptyname, &termios, NULL);
+  switch (child)
+    {
+      case -1:
+	perror ("forkpty(3)");
+	exit (EXIT_FAILURE);
+      case 0:
+	/* Do not replace STDIN as inferiors query its termios.  */
+#if 0
+	i = close (STDIN_FILENO);
+	assert (i == 0);
+	i = open ("/dev/null", O_RDONLY);
+	assert (i == STDIN_FILENO);
+#endif
+
+	i = sigemptyset (&set);
+	assert (i == 0);
+	i = sigprocmask (SIG_SETMASK, &set, NULL);
+	assert (i == 0);
+
+	/* Do not setpgrp(2) in the parent process as the process-group
+	   is shared for the whole sh(1) pipeline we could be a part
+	   of.  The process-group is set according to PID of the first
+	   command in the pipeline.
+	   We would rip even vi(1) in the case of:
+		./orphanripper sh -c 'sleep 1&' | vi -
+	   */
+	/* Do not setpgrp(2) as our pty would not be ours and we would
+	   get `SIGSTOP' later, particularly after spawning gdb(1).
+	   setsid(3) was already executed by forkpty(3) and it would fail if
+	   executed again.  */
+	if (getpid() != getpgrp ())
+	  {
+	    perror ("getpgrp(2)");
+	    exit (EXIT_FAILURE);
+	  }
+	execvp (argv[0], argv);
+	perror ("execvp(2)");
+	exit (EXIT_FAILURE);
+      default:
+	break;
+    }
+  i = fcntl (amaster, F_SETFL, O_RDWR | O_NONBLOCK);
+  if (i != 0)
+    {
+      perror ("fcntl (amaster, F_SETFL, O_NONBLOCK)");
+      exit (EXIT_FAILURE);
+    }
+
+  /* We do not use signal(2) to be sure we do not have SA_RESTART.  */
+  act.sa_handler = signal_alrm;
+  i = sigaction (SIGALRM, &act, NULL);
+  assert (i == 0);
+
+  alarm_orig = alarm (timeout);
+  assert (alarm_orig == 0);
+
+  i = sigemptyset (&set);
+  assert (i == 0);
+
+  while (!signal_alrm_hit)
+    {
+      struct pollfd pollfd;
+
+      pollfd.fd = amaster;
+      pollfd.events = POLLIN;
+      i = ppoll (&pollfd, 1, NULL, &set);
+      if (i == -1 && errno == EINTR)
+	{
+	  if (child_exited ())
+	    break;
+	  /* Non-CHILD child may have exited.  */
+	  continue;
+	}
+      assert (i == 1);
+      /* Data available?  Process it first.  */
+      if (pollfd.revents & POLLIN)
+	{
+	  if (!read_out (amaster))
+	    {
+	      fprintf (stderr, "%s: Unexpected EOF\n", progname);
+	      exit (EXIT_FAILURE);
+	    }
+	}
+      if (pollfd.revents & POLLHUP)
+        break;
+      if ((pollfd.revents &= ~POLLIN) != 0)
+	{
+	  fprintf (stderr, "%s: ppoll(2): revents 0x%x\n", progname,
+		   (unsigned) pollfd.revents);
+	  exit (EXIT_FAILURE);
+	}
+      /* Child exited?  */
+      if (child_exited ())
+	break;
+    }
+
+  if (signal_alrm_hit)
+    {
+      i = kill (child, SIGKILL);
+      assert (i == 0);
+    }
+  else
+    alarm (0);
+
+  /* WNOHANG still could fail.  */
+  child_got = waitpid (child, &status, 0);
+  if (child != child_got)
+    {
+      fprintf (stderr, "waitpid (%d) = %d: %m\n", (int) child, (int) child_got);
+      exit (EXIT_FAILURE);
+    }
+  if (signal_alrm_hit)
+    {
+      char *buf;
+
+      if (asprintf (&buf, "Timed out after %d seconds", timeout) != -1)
+	{
+	  print_child_error (buf, argv);
+	  free (buf);
+	}
+      rc = 128 + SIGALRM;
+    }
+  else if (WIFEXITED (status))
+    rc = WEXITSTATUS (status);
+  else if (WIFSIGNALED (status))
+    {
+      print_child_error (strsignal (WTERMSIG (status)), argv);
+      rc = 128 + WTERMSIG (status);
+    }
+  else if (WIFSTOPPED (status))
+    {
+      fprintf (stderr, "waitpid (%d): WIFSTOPPED - WSTOPSIG is %d\n",
+	       (int) child, WSTOPSIG (status));
+      exit (EXIT_FAILURE);
+    }
+  else
+    {
+      fprintf (stderr, "waitpid (%d): !WIFEXITED (%d)\n", (int) child, status);
+      exit (EXIT_FAILURE);
+    }
+
+  /* Not used in fact.  */
+  i = sigprocmask (SIG_SETMASK, &set, NULL);
+  assert (i == 0);
+
+  /* Do not unset O_NONBLOCK as a stale child (the whole purpose of this
+     program) having open its output pty would block us in read_out.  */
+#if 0
+  i = fcntl (amaster, F_SETFL, O_RDONLY /* !O_NONBLOCK */);
+  if (i != 0)
+    {
+      perror ("fcntl (amaster, F_SETFL, O_RDONLY /* !O_NONBLOCK */)");
+      exit (EXIT_FAILURE);
+    }
+#endif
+
+  while (read_out (amaster));
+
+  /* Do not close the master FD as the child would have `/dev/pts/23 (deleted)'
+     entries which are not expected (and expecting ` (deleted)' would be
+     a race.  */
+#if 0
+  i = close (amaster);
+  if (i != 0)
+    {
+      perror ("close (forkpty ()'s amaster)");
+      exit (EXIT_FAILURE);
+    }
+#endif
+
+  return rc;
+}
+
+/* Detected commandline may look weird due to a race:
+   Original command:
+	./orphanripper sh -c 'sleep 1&' &
+   Correct output:
+	[1] 29610
+	./orphanripper: Killed -9 orphan PID 29612 (PGID 29611): sleep 1
+   Raced output (sh(1) child still did not update its argv[]):
+	[1] 29613
+	./orphanripper: Killed -9 orphan PID 29615 (PGID 29614): sh -c sleep 1&
+   We could delay a bit before ripping the children.  */
+static const char *read_cmdline (pid_t pid)
+{
+  char cmdline_fname[32];
+  static char cmdline[LINE_MAX];
+  int fd;
+  ssize_t got;
+  char *s;
+
+  if (snprintf (cmdline_fname, sizeof cmdline_fname, "/proc/%d/cmdline",
+      (int) pid) < 0)
+    return NULL;
+  fd = open (cmdline_fname, O_RDONLY);
+  if (fd == -1)
+    {
+      /* It may have already exited - ENOENT.  */
+#if 0
+      fprintf (stderr, "%s: open (\"%s\"): %m\n", progname, cmdline_fname);
+#endif
+      return NULL;
+    }
+  got = read (fd, cmdline, sizeof (cmdline) - 1);
+  if (got == -1)
+    fprintf (stderr, "%s: read (\"%s\"): %m\n", progname,
+       cmdline_fname);
+  if (close (fd) != 0)
+    fprintf (stderr, "%s: close (\"%s\"): %m\n", progname,
+       cmdline_fname);
+  if (got < 0)
+    return NULL;
+  /* Convert '\0' argument delimiters to spaces.  */
+  for (s = cmdline; s < cmdline + got; s++)
+    if (!*s)
+      *s = ' ';
+  /* Trim the trailing spaces (typically single '\0'->' ').  */
+  while (s > cmdline && isspace (s[-1]))
+    s--;
+  *s = 0;
+  return cmdline;
+}
+
+static int dir_scan (const char *dirname,
+		  int (*callback) (struct dirent *dirent, const char *pathname))
+{
+  DIR *dir;
+  struct dirent *dirent;
+  int rc = 0;
+
+  dir = opendir (dirname);
+  if (dir == NULL)
+    {
+      if (errno == EACCES || errno == ENOENT)
+	return rc;
+      fprintf (stderr, "%s: opendir (\"%s\"): %m\n", progname, dirname);
+      exit (EXIT_FAILURE);
+    }
+  while ((errno = 0, dirent = readdir (dir)))
+    {
+      char pathname[LINE_MAX];
+      int pathname_len;
+
+      pathname_len = snprintf (pathname, sizeof pathname, "%s/%s",
+				 dirname, dirent->d_name);
+      if (pathname_len <= 0 || pathname_len >= (int) sizeof pathname)
+	{
+	  fprintf (stderr, "entry file name too long: `%s' / `%s'\n",
+		   dirname, dirent->d_name);
+	  continue;
+	}
+      /* RHEL-4.5 on s390x never fills in D_TYPE.  */
+      if (dirent->d_type == DT_UNKNOWN)
+        {
+	  struct stat statbuf;
+	  int i;
+
+	  /* We are not interested in the /proc/PID/fd/ links targets.  */
+	  i = lstat (pathname, &statbuf);
+	  if (i == -1)
+	    {
+	      if (errno == EACCES || errno == ENOENT)
+	        continue;
+	      fprintf (stderr, "%s: stat (\"%s\"): %m\n", progname, pathname);
+	      exit (EXIT_FAILURE);
+	    }
+	  if (S_ISDIR (statbuf.st_mode))
+	    dirent->d_type = DT_DIR;
+	  if (S_ISLNK (statbuf.st_mode))
+	    dirent->d_type = DT_LNK;
+	  /* No other D_TYPE types used in this code.  */
+	}
+      rc = (*callback) (dirent, pathname);
+      if (rc != 0)
+	{
+	  errno = 0;
+	  break;
+	}
+    }
+  if (errno != 0)
+    {
+      fprintf (stderr, "%s: readdir (\"%s\"): %m\n", progname, dirname);
+      exit (EXIT_FAILURE);
+    }
+  if (closedir (dir) != 0)
+    {
+      fprintf (stderr, "%s: closedir (\"%s\"): %m\n", progname, dirname);
+      exit (EXIT_FAILURE);
+    }
+  return rc;
+}
+
+static int fd_fs_scan (pid_t pid, int (*func) (pid_t pid, const char *link))
+{
+  char dirname[64];
+
+  if (snprintf (dirname, sizeof dirname, "/proc/%d/fd", (int) pid) < 0)
+    {
+      perror ("snprintf(3)");
+      exit (EXIT_FAILURE);
+    }
+
+  int callback (struct dirent *dirent, const char *pathname)
+  {
+    char buf[LINE_MAX];
+    ssize_t buf_len;
+
+    if ((dirent->d_type != DT_DIR && dirent->d_type != DT_LNK)
+	|| (dirent->d_type == DT_DIR && strcmp (dirent->d_name, ".") != 0
+	    && strcmp (dirent->d_name, "..") != 0)
+	|| (dirent->d_type == DT_LNK && strspn (dirent->d_name, "0123456789")
+	    != strlen (dirent->d_name)))
+      {
+	fprintf (stderr, "Unexpected entry \"%s\" (d_type %u)"
+			 " on readdir (\"%s\"): %m\n",
+		 dirent->d_name, (unsigned) dirent->d_type, dirname);
+	return 0;
+      }
+    if (dirent->d_type == DT_DIR)
+      return 0;
+    buf_len = readlink (pathname, buf, sizeof buf - 1);
+    if (buf_len <= 0 || buf_len >= (ssize_t) sizeof buf - 1)
+      {
+	if (errno != ENOENT && errno != EACCES)
+	  fprintf (stderr, "Error reading link \"%s\": %m\n", pathname);
+	return 0;
+      }
+    buf[buf_len] = 0;
+    return (*func) (pid, buf);
+  }
+
+  return dir_scan (dirname, callback);
+}
+
+static void pid_fs_scan (void (*func) (pid_t pid, void *data), void *data)
+{
+  int callback (struct dirent *dirent, const char *pathname)
+  {
+    if (dirent->d_type != DT_DIR
+	|| strspn (dirent->d_name, "0123456789") != strlen (dirent->d_name))
+      return 0;
+    (*func) (atoi (dirent->d_name), data);
+    return 0;
+  }
+
+  dir_scan ("/proc", callback);
+}
+
+static int rip_check_ptyname (pid_t pid, const char *link)
+{
+  assert (pid != getpid ());
+
+  return strcmp (link, childptyname) == 0;
+}
+
+struct pid
+  {
+    struct pid *next;
+    pid_t pid;
+  };
+static struct pid *pid_list;
+
+static int pid_found (pid_t pid)
+{
+  struct pid *entry;
+
+  for (entry = pid_list; entry != NULL; entry = entry->next)
+    if (entry->pid == pid)
+      return 1;
+  return 0;
+}
+
+/* Single pass is not enough, a (multithreaded) process was seen to survive.
+   Repeated killing of the same process is not enough, zombies can be killed.
+   */
+static int cleanup_acted;
+
+static void pid_record (pid_t pid)
+{
+  struct pid *entry;
+
+  if (pid_found (pid))
+    return;
+  cleanup_acted = 1;
+
+  entry = malloc (sizeof (*entry));
+  if (entry == NULL)
+    {
+      fprintf (stderr, "%s: malloc: %m\n", progname);
+      exit (EXIT_FAILURE);
+    }
+  entry->pid = pid;
+  entry->next = pid_list;
+  pid_list = entry;
+}
+
+static void pid_forall (void (*func) (pid_t pid))
+{
+  struct pid *entry;
+
+  for (entry = pid_list; entry != NULL; entry = entry->next)
+    (*func) (entry->pid);
+}
+
+/* Returns 0 on failure.  */
+static pid_t pid_get_parent (pid_t pid)
+{
+  char fname[64];
+  FILE *f;
+  char line[LINE_MAX];
+  pid_t retval = 0;
+
+  if (snprintf (fname, sizeof fname, "/proc/%d/status", (int) pid) < 0)
+    {
+      perror ("snprintf(3)");
+      exit (EXIT_FAILURE);
+    }
+  f = fopen (fname, "r");
+  if (f == NULL)
+    {
+      return 0;
+    }
+  while (errno = 0, fgets (line, sizeof line, f) == line)
+    {
+      if (strncmp (line, "PPid:\t", sizeof "PPid:\t" - 1) != 0)
+	continue;
+      retval = atoi (line + sizeof "PPid:\t" - 1);
+      errno = 0;
+      break;
+    }
+  if (errno != 0)
+    {
+      fprintf (stderr, "%s: fgets (\"%s\"): %m\n", progname, fname);
+      exit (EXIT_FAILURE);
+    }
+  if (fclose (f) != 0)
+    {
+      fprintf (stderr, "%s: fclose (\"%s\"): %m\n", progname, fname);
+      exit (EXIT_FAILURE);
+    }
+  return retval;
+}
+
+static void killtree (pid_t pid);
+
+static void killtree_pid_fs_scan (pid_t pid, void *data)
+{
+  pid_t parent_pid = *(pid_t *) data;
+
+  /* Do not optimize it as we could miss some newly spawned processes.
+     Always traverse all the leaves.  */
+#if 0
+  /* Optimization.  */
+  if (pid_found (pid))
+    return;
+#endif
+
+  if (pid_get_parent (pid) != parent_pid)
+    return;
+
+  killtree (pid);
+}
+
+static void killtree (pid_t pid)
+{
+  pid_record (pid);
+  pid_fs_scan (killtree_pid_fs_scan, &pid);
+}
+
+static void rip_pid_fs_scan (pid_t pid, void *data)
+{
+  pid_t pgid;
+
+  /* Shouldn't happen.  */
+  if (pid == getpid ())
+    return;
+
+  /* Check both PGID and the stale file descriptors.  */
+  pgid = getpgid (pid);
+  if (pgid == child
+      || fd_fs_scan (pid, rip_check_ptyname) != 0)
+    killtree (pid);
+}
+
+static void killproc (pid_t pid)
+{
+  const char *cmdline;
+
+  cmdline = read_cmdline (pid);
+  /* Avoid printing the message for already gone processes.  */
+  if (kill (pid, 0) != 0 && errno == ESRCH)
+    return;
+  if (cmdline == NULL)
+    cmdline = "<error>";
+  fprintf (stderr, "%s: Killed -9 orphan PID %d: %s\n", progname, (int) pid, cmdline);
+  if (kill (pid, SIGKILL) == 0)
+    cleanup_acted = 1;
+  else if (errno != ESRCH)
+    fprintf (stderr, "%s: kill (%d, SIGKILL): %m\n", progname, (int) pid);
+  /* RHEL-3 kernels cannot SIGKILL a `T (stopped)' process.  */
+  kill (pid, SIGCONT);
+  /* Do not waitpid(2) as it cannot be our direct descendant and it gets
+     cleaned up by init(8).  */
+#if 0
+  pid_t pid_got;
+  pid_got = waitpid (pid, NULL, 0);
+  if (pid != pid_got)
+    {
+      fprintf (stderr, "%s: waitpid (%d) != %d: %m\n", progname,
+	 (int) pid, (int) pid_got);
+      return;
+    }
+#endif
+}
+
+static void rip (void)
+{
+  cleanup_acted = 0;
+  do
+    {
+      if (cleanup_acted)
+        usleep (1000000 / 10);
+      cleanup_acted = 0;
+      pid_fs_scan (rip_pid_fs_scan, NULL);
+      pid_forall (killproc);
+    }
+  while (cleanup_acted);
+}
+
+int main (int argc, char **argv)
+{
+  int timeout = 0;
+  int rc;
+
+  progname = *argv++;
+  argc--;
+
+  if (argc < 1 || strcmp (*argv, "-h") == 0
+      || strcmp (*argv, "--help") == 0)
+    {
+      puts ("Syntax: orphanripper [-t <seconds>] <execvp(3) commandline>");
+      exit (EXIT_FAILURE);
+    }
+  if ((*argv)[0] == '-' && (*argv)[1] == 't')
+    {
+      char *timeout_s = NULL;
+
+      if ((*argv)[2] == 0)
+	timeout_s = *++argv;
+      else if (isdigit ((*argv)[2]))
+	timeout_s = (*argv) + 2;
+      if (timeout_s != NULL)
+	{
+	  long l;
+	  char *endptr;
+
+	  argv++;
+	  l = strtol (timeout_s, &endptr, 0);
+	  timeout = l;
+	  if ((endptr != NULL && *endptr != 0) || timeout < 0 || timeout != l)
+	    {
+	      fprintf (stderr, "%s: Invalid timeout value: %s\n", progname,
+		       timeout_s);
+	      exit (EXIT_FAILURE);
+	    }
+	}
+    }
+
+  rc = spawn (argv, timeout);
+  rip ();
+  return rc;
+}

SOURCES/gdb-physname-pr11734-test.patch

@@ -0,0 +1,229 @@
+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-physname-pr11734-test.patch
+
+;; Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
+;;=fedoratest
+
+http://sourceware.org/ml/gdb-patches/2010-12/msg00263.html
+
+diff --git a/gdb/testsuite/gdb.cp/pr11734-1.cc b/gdb/testsuite/gdb.cp/pr11734-1.cc
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/pr11734-1.cc
+@@ -0,0 +1,29 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 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/>.
++
++   Please email any bugs, comments, and/or additions to this file to:
++   bug-gdb@gnu.org  */
++
++#include "pr11734.h"
++
++int
++main ()
++{
++  pr11734 *p = new pr11734;
++  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 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 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/>.
++
++   Please email any bugs, comments, and/or additions to this file to:
++   bug-gdb@gnu.org  */
++
++#include "pr11734.h"
++
++void
++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 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 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/>.
++
++   Please email any bugs, comments, and/or additions to this file to:
++   bug-gdb@gnu.org  */
++
++#include "pr11734.h"
++
++void
++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 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 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/>.
++
++   Please email any bugs, comments, and/or additions to this file to:
++   bug-gdb@gnu.org  */
++
++#include "pr11734.h"
++
++void
++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
++++ b/gdb/testsuite/gdb.cp/pr11734.exp
+@@ -0,0 +1,55 @@
++# Copyright 2010 Free Software Foundation, Inc.
++#
++# Contributed by Red Hat, originally written by Keith Seitz.
++#
++# 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/>.
++
++# This file is part of the gdb testsuite.
++
++if { [skip_cplus_tests] } { continue }
++
++set testfile "pr11734"
++set class $testfile
++
++set srcfiles {}
++for {set i 1} {$i < 5} {incr i} {
++    lappend srcfiles $testfile-$i.cc
++}
++
++prepare_for_testing pr11734 $testfile $srcfiles {c++ debug}
++
++if {![runto_main]} {
++    perror "couldn't run to breakpoint"
++    continue
++}
++
++# An array holding the overload types for the method pr11734::foo.  The
++# first element is the overloaded method parameter.  The second element
++# is the expected source file number, e.g. "pr11734-?.cc".
++array set tests {
++    "char*"  4
++    "int"    3
++    ""       2
++}
++
++# Test each overload instance twice: once quoted, once unquoted
++foreach ovld [array names tests] {
++    set method "${class}::foo\($ovld\)"
++    set result "Breakpoint (\[0-9\]).*file .*/$class-$tests($ovld).*"
++    gdb_test "break $method" $result
++    gdb_test "break '$method'" $result
++}
++
++gdb_exit
++return 0
+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 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 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/>.
++
++   Please email any bugs, comments, and/or additions to this file to:
++   bug-gdb@gnu.org  */
++
++class pr11734
++{
++ public:
++  void foo ();
++  void foo (int);
++  void foo (char *);
++};

SOURCES/gdb-physname-pr12273-test.patch

@@ -0,0 +1,103 @@
+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-physname-pr12273-test.patch
+
+;; Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
+;;=fedoratest
+
+http://sourceware.org/ml/gdb-patches/2010-12/msg00264.html
+
+diff --git a/gdb/testsuite/gdb.cp/pr12273.cc b/gdb/testsuite/gdb.cp/pr12273.cc
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/pr12273.cc
+@@ -0,0 +1,37 @@
++/* This test case is part of GDB, the GNU debugger.
++
++   Copyright 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/>.  */
++
++template <typename T>
++class GDB
++{
++ public:
++   static int simple (void) { return 0; }
++   static int harder (T a) { return 1; }
++   template <typename X>
++   static X even_harder (T a) { return static_cast<X> (a); }
++   int operator == (GDB const& other)
++   { return 1; }
++};
++
++int main(int argc, char **argv)
++{
++   GDB<int> a, b;
++   if (a == b)
++     return GDB<char>::harder('a') + GDB<int>::harder(3)
++	+ GDB<char>::even_harder<int> ('a');
++   return GDB<int>::simple ();
++}
+diff --git a/gdb/testsuite/gdb.cp/pr12273.exp b/gdb/testsuite/gdb.cp/pr12273.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/pr12273.exp
+@@ -0,0 +1,46 @@
++# Copyright 2010 Free Software Foundation, Inc.
++#
++# Contributed by Red Hat, originally written by Keith Seitz.
++#
++# 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/>.
++
++# This file is part of the gdb testsuite.
++
++if {[skip_cplus_tests]} { continue }
++
++set testfile "pr12273"
++# Do NOT compile with debug flag.
++prepare_for_testing pr12273 $testfile $testfile.cc {c++}
++
++gdb_test_no_output "set language c++"
++
++# A list of minimal symbol names to check.
++# Note that GDB<char>::even_harder<int>(char) is quoted and includes
++# the return type.  This is necessary because this is the demangled name
++# of the minimal symbol.
++set min_syms [list \
++		  "GDB<int>::operator ==" \
++		  "GDB<int>::operator==(GDB<int> const&)" \
++		  "GDB<char>::harder(char)" \
++		  "GDB<int>::harder(int)" \
++		  {"int GDB<char>::even_harder<int>(char)"} \
++		  "GDB<int>::simple()"]
++
++foreach sym $min_syms {
++    if {[gdb_breakpoint $sym]} {
++	pass "setting breakpoint at $sym"
++    }
++}
++
++gdb_exit

SOURCES/gdb-ppc-power7-test.patch

@@ -0,0 +1,303 @@
+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-ppc-power7-test.patch
+
+;; Test power7 ppc disassembly.
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.arch/powerpc-power7rh.exp b/gdb/testsuite/gdb.arch/powerpc-power7rh.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/powerpc-power7rh.exp
+@@ -0,0 +1,178 @@
++# 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 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.
++
++# Test PowerPC Power7 instructions disassembly.
++
++if {![istarget "powerpc*-*-*"]} then {
++    verbose "Skipping PowerPC Power7 instructions disassembly."
++    return
++}
++
++set testfile "powerpc-power7rh"
++set srcfile ${testfile}.s
++set objfile [standard_output_file ${testfile}.o]
++
++if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug}] != "" } {
++    untested "PowerPC Power7 instructions disassembly"
++    return -1
++}
++
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${objfile}
++
++
++# Disassemble the function.
++
++set test "disass func"
++gdb_test_multiple $test $test {
++    -re "\r\nDump of assembler code for function func:(\r\n.*\r\n)End of assembler dump.\r\n$gdb_prompt $" {
++	set func $expect_out(1,string)
++	pass $test
++    }
++}
++
++proc instr_to_patt {offset instr} {
++    # 0x0000000000000018 <func+24>:	stxvd2x vs43,r4,r5
++    return ".*\r\n\[ \t\]*[string map {0x 0x0*} $offset] <(func)?\\+?\[0-9\]*>:\[ \t\]*[string map [list { } "\[ \t\]+" . {\.}] $instr]\[ \t\]*\r\n.*"
++}
++
++# KFAIL strings would not exist if -Many would print the same as -Mpower7.
++# That means the power7 form should be the preferred one.
++# http://sourceware.org/ml/gdb-patches/2009-03/threads.html#00020
++
++proc func_check {offset instr {kfail ""}} {
++    global func
++
++    set test "Found $offset: $instr"
++    if [regexp -nocase -line [instr_to_patt $offset $instr] $func] {
++	pass $test
++    } elseif {$kfail != "" && [regexp -nocase -line [instr_to_patt $offset $kfail] $func]} {
++	kfail gdb/NNNN $test
++    } else {
++	fail $test
++    }
++}
++
++func_check   0x0 "lxvd2x  vs3,r4,r5"
++# [PATCH] Remove support for POWER7 VSX load/store with update instructions
++# http://sourceware.org/ml/binutils/2009-09/msg00680.html
++# http://sourceware.org/ml/binutils-cvs/2009-09/msg00331.html
++func_check   0x4 "lxvb16x vs3,r4,r5"
++func_check   0x8 "lxvd2x  vs43,r4,r5"
++func_check   0xc "lxvb16x vs43,r4,r5"
++func_check  0x10 "stxvd2x vs3,r4,r5"
++func_check  0x14 "stxvb16x vs3,r4,r5"
++func_check  0x18 "stxvd2x vs43,r4,r5"
++func_check  0x1c "stxvb16x vs43,r4,r5"
++func_check  0x20 "xxmrghd vs3,vs4,vs5"
++func_check  0x24 "xxmrghd vs43,vs44,vs45"
++func_check  0x28 "xxmrgld vs3,vs4,vs5"
++func_check  0x2c "xxmrgld vs43,vs44,vs45"
++func_check  0x30 "xxmrghd vs3,vs4,vs5"
++func_check  0x34 "xxmrghd vs43,vs44,vs45"
++func_check  0x38 "xxmrgld vs3,vs4,vs5"
++func_check  0x3c "xxmrgld vs43,vs44,vs45"
++func_check  0x40 "xxpermdi vs3,vs4,vs5,1"
++func_check  0x44 "xxpermdi vs43,vs44,vs45,1"
++func_check  0x48 "xxpermdi vs3,vs4,vs5,2"
++func_check  0x4c "xxpermdi vs43,vs44,vs45,2"
++func_check  0x50 "xvmovdp vs3,vs4"
++func_check  0x54 "xvmovdp vs43,vs44"
++func_check  0x58 "xvmovdp vs3,vs4"
++func_check  0x5c "xvmovdp vs43,vs44"
++func_check  0x60 "xvcpsgndp vs3,vs4,vs5"
++func_check  0x64 "xvcpsgndp vs43,vs44,vs45"
++func_check  0x68 "wait"
++func_check  0x6c "wait"
++func_check  0x70 "waitrsv"
++func_check  0x74 "waitrsv"
++func_check  0x78 "waitimpl"
++func_check  0x7c "waitimpl"
++func_check  0x80 "doze"
++func_check  0x84 "nap"
++func_check  0x88 "sleep"
++func_check  0x8c "rvwinkle"
++func_check  0x90 "prtyw   r3,r4"
++func_check  0x94 "prtyd   r13,r14"
++func_check  0x98 "mfcfar  r10"           "mfspr   r10,28"
++func_check  0x9c "mtcfar  r11"           "mtspr   28,r11"
++func_check  0xa0 "cmpb    r3,r4,r5"
++func_check  0xa4 "lwzcix  r10,r11,r12"
++func_check  0xa8 "dadd    f16,f17,f18"
++func_check  0xac "daddq   f20,f22,f24"
++func_check  0xb0 "dss     3"
++func_check  0xb4 "dssall"
++func_check  0xb8 "dst     r5,r4,1"
++func_check  0xbc "dstt    r8,r7,0"
++func_check  0xc0 "dstst   r5,r6,3"
++func_check  0xc4 "dststt  r4,r5,2"
++func_check  0xc8 "divwe   r10,r11,r12"
++func_check  0xcc "divwe.  r11,r12,r13"
++func_check  0xd0 "divweo  r12,r13,r14"
++func_check  0xd4 "divweo. r13,r14,r15"
++func_check  0xd8 "divweu  r10,r11,r12"
++func_check  0xdc "divweu. r11,r12,r13"
++func_check  0xe0 "divweuo r12,r13,r14"
++func_check  0xe4 "divweuo. r13,r14,r15"
++func_check  0xe8 "bpermd  r7,r17,r27"
++func_check  0xec "popcntw r10,r20"
++func_check  0xf0 "popcntd r10,r20"
++func_check  0xf4 "ldbrx   r20,r21,r22"
++func_check  0xf8 "stdbrx  r20,r21,r22"
++func_check  0xfc "lfiwzx  f10,0,r10"
++func_check 0x100 "lfiwzx  f10,r9,r10"
++func_check 0x104 "fcfids  f4,f5"
++func_check 0x108 "fcfids. f4,f5"
++func_check 0x10c "fcfidus f4,f5"
++func_check 0x110 "fcfidus. f4,f5"
++func_check 0x114 "fctiwu  f4,f5"
++func_check 0x118 "fctiwu. f4,f5"
++func_check 0x11c "fctiwuz f4,f5"
++func_check 0x120 "fctiwuz. f4,f5"
++func_check 0x124 "fctidu  f4,f5"
++func_check 0x128 "fctidu. f4,f5"
++func_check 0x12c "fctiduz f4,f5"
++func_check 0x130 "fctiduz. f4,f5"
++func_check 0x134 "fcfidu  f4,f5"
++func_check 0x138 "fcfidu. f4,f5"
++func_check 0x13c "ftdiv   cr0,f10,f11"
++func_check 0x140 "ftdiv   cr7,f10,f11"
++func_check 0x144 "ftsqrt  cr0,f10"
++func_check 0x148 "ftsqrt  cr7,f10"
++func_check 0x14c "dcbtt   r8,r9"         "dcbt    16,r8,r9"
++func_check 0x150 "dcbtstt r8,r9"         "dcbtst  16,r8,r9"
++func_check 0x154 "dcffix  f10,f12"
++func_check 0x158 "dcffix. f20,f22"
++func_check 0x15c "lbarx   r10,r11,r12"
++func_check 0x160 "lbarx   r10,r11,r12"
++func_check 0x164 "lbarx   r10,r11,r12,1"
++func_check 0x168 "lharx   r20,r21,r22"
++func_check 0x16c "lharx   r20,r21,r22"
++func_check 0x170 "lharx   r20,r21,r22,1"
++func_check 0x174 "stbcx.  r10,r11,r12"
++func_check 0x178 "sthcx.  r10,r11,r12"
++func_check 0x17c "fre     f14,f15"
++func_check 0x180 "fre.    f14,f15"
++func_check 0x184 "fres    f14,f15"
++func_check 0x188 "fres.   f14,f15"
++func_check 0x18c "frsqrte f14,f15"
++func_check 0x190 "frsqrte. f14,f15"
++func_check 0x194 "frsqrtes f14,f15"
++func_check 0x198 "frsqrtes. f14,f15"
++func_check 0x19c "isel    r2,r3,r4,28"
+diff --git a/gdb/testsuite/gdb.arch/powerpc-power7rh.s b/gdb/testsuite/gdb.arch/powerpc-power7rh.s
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/powerpc-power7rh.s
+@@ -0,0 +1,107 @@
++	.text
++	.globl	func
++func:
++	.long	0x7c642e98	/*   0: lxvd2x  vs3,r4,r5         */
++	.long	0x7c642ed8	/*   4: lxvd2ux vs3,r4,r5         */
++	.long	0x7d642e99	/*   8: lxvd2x  vs43,r4,r5        */
++	.long	0x7d642ed9	/*   c: lxvd2ux vs43,r4,r5        */
++	.long	0x7c642f98	/*  10: stxvd2x vs3,r4,r5         */
++	.long	0x7c642fd8	/*  14: stxvd2ux vs3,r4,r5        */
++	.long	0x7d642f99	/*  18: stxvd2x vs43,r4,r5        */
++	.long	0x7d642fd9	/*  1c: stxvd2ux vs43,r4,r5       */
++	.long	0xf0642850	/*  20: xxmrghd vs3,vs4,vs5       */
++	.long	0xf16c6857	/*  24: xxmrghd vs43,vs44,vs45    */
++	.long	0xf0642b50	/*  28: xxmrgld vs3,vs4,vs5       */
++	.long	0xf16c6b57	/*  2c: xxmrgld vs43,vs44,vs45    */
++	.long	0xf0642850	/*  30: xxmrghd vs3,vs4,vs5       */
++	.long	0xf16c6857	/*  34: xxmrghd vs43,vs44,vs45    */
++	.long	0xf0642b50	/*  38: xxmrgld vs3,vs4,vs5       */
++	.long	0xf16c6b57	/*  3c: xxmrgld vs43,vs44,vs45    */
++	.long	0xf0642950	/*  40: xxpermdi vs3,vs4,vs5,1    */
++	.long	0xf16c6957	/*  44: xxpermdi vs43,vs44,vs45,1 */
++	.long	0xf0642a50	/*  48: xxpermdi vs3,vs4,vs5,2    */
++	.long	0xf16c6a57	/*  4c: xxpermdi vs43,vs44,vs45,2 */
++	.long	0xf0642780	/*  50: xvmovdp vs3,vs4           */
++	.long	0xf16c6787	/*  54: xvmovdp vs43,vs44         */
++	.long	0xf0642780	/*  58: xvmovdp vs3,vs4           */
++	.long	0xf16c6787	/*  5c: xvmovdp vs43,vs44         */
++	.long	0xf0642f80	/*  60: xvcpsgndp vs3,vs4,vs5     */
++	.long	0xf16c6f87	/*  64: xvcpsgndp vs43,vs44,vs45  */
++	.long	0x7c00007c	/*  68: wait                      */
++	.long	0x7c00007c	/*  6c: wait                      */
++	.long	0x7c20007c	/*  70: waitrsv                   */
++	.long	0x7c20007c	/*  74: waitrsv                   */
++	.long	0x7c40007c	/*  78: waitimpl                  */
++	.long	0x7c40007c	/*  7c: waitimpl                  */
++	.long	0x4c000324	/*  80: doze                      */
++	.long	0x4c000364	/*  84: nap                       */
++	.long	0x4c0003a4	/*  88: sleep                     */
++	.long	0x4c0003e4	/*  8c: rvwinkle                  */
++	.long	0x7c830134	/*  90: prtyw   r3,r4             */
++	.long	0x7dcd0174	/*  94: prtyd   r13,r14           */
++	.long	0x7d5c02a6	/*  98: mfcfar  r10               */
++	.long	0x7d7c03a6	/*  9c: mtcfar  r11               */
++	.long	0x7c832bf8	/*  a0: cmpb    r3,r4,r5          */
++	.long	0x7d4b662a	/*  a4: lwzcix  r10,r11,r12       */
++	.long	0xee119004	/*  a8: dadd    f16,f17,f18       */
++	.long	0xfe96c004	/*  ac: daddq   f20,f22,f24       */
++	.long	0x7c60066c	/*  b0: dss     3                 */
++	.long	0x7e00066c	/*  b4: dssall                    */
++	.long	0x7c2522ac	/*  b8: dst     r5,r4,1           */
++	.long	0x7e083aac	/*  bc: dstt    r8,r7,0           */
++	.long	0x7c6532ec	/*  c0: dstst   r5,r6,3           */
++	.long	0x7e442aec	/*  c4: dststt  r4,r5,2           */
++	.long	0x7d4b6356	/*  c8: divwe   r10,r11,r12       */
++	.long	0x7d6c6b57	/*  cc: divwe.  r11,r12,r13       */
++	.long	0x7d8d7756	/*  d0: divweo  r12,r13,r14       */
++	.long	0x7dae7f57	/*  d4: divweo. r13,r14,r15       */
++	.long	0x7d4b6316	/*  d8: divweu  r10,r11,r12       */
++	.long	0x7d6c6b17	/*  dc: divweu. r11,r12,r13       */
++	.long	0x7d8d7716	/*  e0: divweuo r12,r13,r14       */
++	.long	0x7dae7f17	/*  e4: divweuo. r13,r14,r15      */
++	.long	0x7e27d9f8	/*  e8: bpermd  r7,r17,r27        */
++	.long	0x7e8a02f4	/*  ec: popcntw r10,r20           */
++	.long	0x7e8a03f4	/*  f0: popcntd r10,r20           */
++	.long	0x7e95b428	/*  f4: ldbrx   r20,r21,r22       */
++	.long	0x7e95b528	/*  f8: stdbrx  r20,r21,r22       */
++	.long	0x7d4056ee	/*  fc: lfiwzx  f10,0,r10         */
++	.long	0x7d4956ee	/* 100: lfiwzx  f10,r9,r10        */
++	.long	0xec802e9c	/* 104: fcfids  f4,f5             */
++	.long	0xec802e9d	/* 108: fcfids. f4,f5             */
++	.long	0xec802f9c	/* 10c: fcfidus f4,f5             */
++	.long	0xec802f9d	/* 110: fcfidus. f4,f5            */
++	.long	0xfc80291c	/* 114: fctiwu  f4,f5             */
++	.long	0xfc80291d	/* 118: fctiwu. f4,f5             */
++	.long	0xfc80291e	/* 11c: fctiwuz f4,f5             */
++	.long	0xfc80291f	/* 120: fctiwuz. f4,f5            */
++	.long	0xfc802f5c	/* 124: fctidu  f4,f5             */
++	.long	0xfc802f5d	/* 128: fctidu. f4,f5             */
++	.long	0xfc802f5e	/* 12c: fctiduz f4,f5             */
++	.long	0xfc802f5f	/* 130: fctiduz. f4,f5            */
++	.long	0xfc802f9c	/* 134: fcfidu  f4,f5             */
++	.long	0xfc802f9d	/* 138: fcfidu. f4,f5             */
++	.long	0xfc0a5900	/* 13c: ftdiv   cr0,f10,f11       */
++	.long	0xff8a5900	/* 140: ftdiv   cr7,f10,f11       */
++	.long	0xfc005140	/* 144: ftsqrt  cr0,f10           */
++	.long	0xff805140	/* 148: ftsqrt  cr7,f10           */
++	.long	0x7e084a2c	/* 14c: dcbtt   r8,r9             */
++	.long	0x7e0849ec	/* 150: dcbtstt r8,r9             */
++	.long	0xed406644	/* 154: dcffix  f10,f12           */
++	.long	0xee80b645	/* 158: dcffix. f20,f22           */
++	.long	0x7d4b6068	/* 15c: lbarx   r10,r11,r12       */
++	.long	0x7d4b6068	/* 160: lbarx   r10,r11,r12       */
++	.long	0x7d4b6069	/* 164: lbarx   r10,r11,r12,1     */
++	.long	0x7e95b0e8	/* 168: lharx   r20,r21,r22       */
++	.long	0x7e95b0e8	/* 16c: lharx   r20,r21,r22       */
++	.long	0x7e95b0e9	/* 170: lharx   r20,r21,r22,1     */
++	.long	0x7d4b656d	/* 174: stbcx.  r10,r11,r12       */
++	.long	0x7d4b65ad	/* 178: sthcx.  r10,r11,r12       */
++	.long	0xfdc07830	/* 17c: fre     f14,f15           */
++	.long	0xfdc07831	/* 180: fre.    f14,f15           */
++	.long	0xedc07830	/* 184: fres    f14,f15           */
++	.long	0xedc07831	/* 188: fres.   f14,f15           */
++	.long	0xfdc07834	/* 18c: frsqrte f14,f15           */
++	.long	0xfdc07835	/* 190: frsqrte. f14,f15          */
++	.long	0xedc07834	/* 194: frsqrtes f14,f15          */
++	.long	0xedc07835	/* 198: frsqrtes. f14,f15         */
++	.long	0x7c43271e	/* 19c: isel    r2,r3,r4,28       */

SOURCES/gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch

@@ -0,0 +1,83 @@
+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-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+
+;; Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.base/set-solib-absolute-prefix.c b/gdb/testsuite/gdb.base/set-solib-absolute-prefix.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/set-solib-absolute-prefix.c
+@@ -0,0 +1,26 @@
++/* Copyright (C) 2012 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/>.  */
++
++#include <stdio.h>
++#include <stdlib.h>
++
++int
++main (int argc, char *argv[])
++{
++  printf ("Hello, World.\n");
++  abort ();
++}
+diff --git a/gdb/testsuite/gdb.base/set-solib-absolute-prefix.exp b/gdb/testsuite/gdb.base/set-solib-absolute-prefix.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/set-solib-absolute-prefix.exp
+@@ -0,0 +1,39 @@
++# Copyright 2012 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 "set-solib-absolute-prefix"
++set srcfile ${testfile}.c
++
++# It is necessary to verify if the binary is 32-bit, so that the system
++# call `__kernel_vsyscall' originates from vDSO.
++
++if { ![is_ilp32_target] } {
++    return -1
++}
++
++if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
++    return -1
++}
++
++if { ![runto_main] } {
++    return -1
++}
++
++gdb_test "continue" "Program received signal SIGABRT, Aborted.*" \
++    "continue until abort"
++gdb_test "set solib-absolute-prefix /BOGUS_DIRECT" \
++    ".*warning: Unable to find dynamic linker breakpoint function.*" \
++    "set solib-absolute-prefix"
++gdb_test "bt" "__kernel_vsyscall.*" "backtrace with __kernel_vsyscall"

SOURCES/gdb-rhbz-853071-update-manpages.patch

@@ -0,0 +1,258 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Bruno Larsen <blarsen@redhat.com>
+Date: Tue, 9 Nov 2021 14:07:26 -0300
+Subject: gdb-rhbz-853071-update-manpages.patch
+
+;; Backport manpage update
+
+[gdb/doc]: Updated manpages to be consistent with help
+
+Updated manpages to be consistent with help information provided by the
+binary. The main changes are:
+
+* Making all long-form options have '--', instead of a single '-';
+* added most of the missing options to the manpage;
+* removed the information about using '+' instead of '-', since it
+  doesn't seem to be supported anymore.
+
+This also fixes 2 upstream bugs:
+* https://sourceware.org/bugzilla/show_bug.cgi?id=23965; by adding
+--args to the manpage
+* https://sourceware.org/bugzilla/show_bug.cgi?id=10619; by adding the
+double dashes
+
+diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
+--- a/gdb/doc/gdb.texinfo
++++ b/gdb/doc/gdb.texinfo
+@@ -47030,14 +47030,7 @@ switch (die->tag)
+ @c man title gdb The GNU Debugger
+ 
+ @c man begin SYNOPSIS gdb
+-gdb [@option{-help}] [@option{-nh}] [@option{-nx}] [@option{-q}]
+-[@option{-batch}] [@option{-cd=}@var{dir}] [@option{-f}]
+-[@option{-b}@w{ }@var{bps}]
+-    [@option{-tty=}@var{dev}] [@option{-s} @var{symfile}]
+-[@option{-e}@w{ }@var{prog}] [@option{-se}@w{ }@var{prog}]
+-[@option{-c}@w{ }@var{core}] [@option{-p}@w{ }@var{procID}]
+-    [@option{-x}@w{ }@var{cmds}] [@option{-d}@w{ }@var{dir}]
+-[@var{prog}|@var{prog} @var{procID}|@var{prog} @var{core}]
++gdb [OPTIONS] [@var{prog}|@var{prog} @var{procID}|@var{prog} @var{core}]
+ @c man end
+ 
+ @c man begin DESCRIPTION gdb
+@@ -47101,8 +47094,8 @@ Here are some of the most frequently needed @value{GDBN} commands:
+ 
+ @c pod2man highlights the right hand side of the @item lines.
+ @table @env
+-@item break [@var{file}:]@var{function}
+-Set a breakpoint at @var{function} (in @var{file}).
++@item break [@var{file}:][@var{function}|@var{line}]
++Set a breakpoint at @var{function} or @var{line} (in @var{file}).
+ 
+ @item run [@var{arglist}]
+ Start your program (with @var{arglist}, if specified).
+@@ -47150,72 +47143,91 @@ as the @code{gdb} entry in the @code{info} program.
+ Any arguments other than options specify an executable
+ file and core file (or process ID); that is, the first argument
+ encountered with no
+-associated option flag is equivalent to a @option{-se} option, and the second,
++associated option flag is equivalent to a @option{--se} option, and the second,
+ if any, is equivalent to a @option{-c} option if it's the name of a file.
+ Many options have
+-both long and short forms; both are shown here.  The long forms are also
++both long and abbreviated forms; both are shown here.  The long forms are also
+ recognized if you truncate them, so long as enough of the option is
+-present to be unambiguous.  (If you prefer, you can flag option
+-arguments with @option{+} rather than @option{-}, though we illustrate the
+-more usual convention.)
++present to be unambiguous.
++
++The abbreviated forms are shown here with @samp{-} and long forms are shown
++with @samp{--} to reflect how they are shown in @option{--help}. However,
++@value{GDBN} recognizes all of the following conventions for most options:
++
++@table @code
++@item --option=@var{value}
++@item --option @var{value}
++@item -option=@var{value}
++@item -option @var{value}
++@item --o=@var{value}
++@item --o @var{value}
++@item -o=@var{value}
++@item -o @var{value}
++@end table
+ 
+ All the options and command line arguments you give are processed
+ in sequential order.  The order makes a difference when the @option{-x}
+ option is used.
+ 
+ @table @env
+-@item -help
++@item --help
+ @itemx -h
+ List all options, with brief explanations.
+ 
+-@item -symbols=@var{file}
++@item --symbols=@var{file}
+ @itemx -s @var{file}
+-Read symbol table from file @var{file}.
++Read symbol table from @var{file}.
+ 
+-@item -write
++@item --write
+ Enable writing into executable and core files.
+ 
+-@item -exec=@var{file}
++@item --exec=@var{file}
+ @itemx -e @var{file}
+-Use file @var{file} as the executable file to execute when
++Use @var{file} as the executable file to execute when
+ appropriate, and for examining pure data in conjunction with a core
+ dump.
+ 
+-@item -se=@var{file}
+-Read symbol table from file @var{file} and use it as the executable
++@item --se=@var{file}
++Read symbol table from @var{file} and use it as the executable
+ file.
+ 
+-@item -core=@var{file}
++@item --core=@var{file}
+ @itemx -c @var{file}
+-Use file @var{file} as a core dump to examine.
++Use @var{file} as a core dump to examine.
+ 
+-@item -command=@var{file}
++@item --command=@var{file}
+ @itemx -x @var{file}
+-Execute @value{GDBN} commands from file @var{file}.
++Execute @value{GDBN} commands from @var{file}.
+ 
++@item --eval-command=@var{command}
+ @item -ex @var{command}
+ Execute given @value{GDBN} @var{command}.
+ 
+-@item -directory=@var{directory}
++@item --init-eval-command=@var{command}
++@item -iex
++Execute @value{GDBN} @var{command} before loading the inferior.
++
++@item --directory=@var{directory}
+ @itemx -d @var{directory}
+ Add @var{directory} to the path to search for source files.
+ 
+-@item -nh
++@item --nh
+ Do not execute commands from @file{~/.config/gdb/gdbinit},
+ @file{~/.gdbinit}, @file{~/.config/gdb/gdbearlyinit}, or
+ @file{~/.gdbearlyinit}
+ 
+-@item -nx
++@item --nx
+ @itemx -n
+ Do not execute commands from any @file{.gdbinit} or
+ @file{.gdbearlyinit} initialization files.
+ 
+-@item -quiet
++@item --quiet
++@item --silent
+ @itemx -q
+ ``Quiet''.  Do not print the introductory and copyright messages.  These
+ messages are also suppressed in batch mode.
+ 
+-@item -batch
++@item --batch
+ Run in batch mode.  Exit with status @code{0} after processing all the command
+ files specified with @option{-x} (and @file{.gdbinit}, if not inhibited).
+ Exit with nonzero status if an error occurs in executing the @value{GDBN}
+@@ -47233,11 +47245,71 @@ Program exited normally.
+ (which is ordinarily issued whenever a program running under @value{GDBN} control
+ terminates) is not issued when running in batch mode.
+ 
+-@item -cd=@var{directory}
++@item --batch-silent
++Run in batch mode, just like @option{--batch}, but totally silent.  All @value{GDBN}
++output is supressed (stderr is unaffected).  This is much quieter than
++@option{--silent} and would be useless for an interactive session.
++
++This is particularly useful when using targets that give @samp{Loading section}
++messages, for example.
++
++Note that targets that give their output via @value{GDBN}, as opposed to writing
++directly to @code{stdout}, will also be made silent.
++
++@item --args @var{prog} [@var{arglist}]
++Change interpretation of command line so that arguments following this
++option are passed as arguments to the inferior.  As an example, take
++the following command:
++
++@smallexample
++gdb ./a.out -q
++@end smallexample
++
++@noindent
++It would start @value{GDBN} with @option{-q}, not printing the introductory message.  On
++the other hand, using:
++
++@smallexample
++gdb --args ./a.out -q
++@end smallexample
++
++@noindent
++starts @value{GDBN} with the introductory message, and passes the option to the inferior.
++
++@item --pid=@var{pid}
++Attach @value{GDBN} to an already running program, with the PID @var{pid}.
++
++@item --tui
++Open the terminal user interface.
++
++@item --readnow
++Read all symbols from the given symfile on the first access.
++
++@item --readnever
++Do not read symbol files.
++
++@item --dbx
++Run in DBX compatibility mode.
++
++@item --return-child-result
++@value{GDBN}'s exit code will be the same as the child's exit code.
++
++@item --configuration
++Print details about GDB configuration and then exit.
++
++@item --version
++Print version information and then exit.
++
++@item --cd=@var{directory}
+ Run @value{GDBN} using @var{directory} as its working directory,
+ instead of the current directory.
+ 
+-@item -fullname
++@item --data-directory=@var{directory}
++@item -D
++Run @value{GDBN} using @var{directory} as its data directory.  The data
++directory is where @value{GDBN} searches for its auxiliary files.
++
++@item --fullname
+ @itemx -f
+ Emacs sets this option when it runs @value{GDBN} as a subprocess.  It tells
+ @value{GDBN} to output the full file name and line number in a standard,
+@@ -47248,11 +47320,14 @@ and character position separated by colons, and a newline.  The
+ Emacs-to-@value{GDBN} interface program uses the two @samp{\032}
+ characters as a signal to display the source code for the frame.
+ 
+-@item -b @var{bps}
++@item -b @var{baudrate}
+ Set the line speed (baud rate or bits per second) of any serial
+ interface used by @value{GDBN} for remote debugging.
+ 
+-@item -tty=@var{device}
++@item -l @var{timeout}
++Set timeout, in seconds, for remote debugging.
++
++@item --tty=@var{device}
+ Run using @var{device} for your program's standard input and output.
+ @end table
+ @c man end

SOURCES/gdb-rhbz1007614-memleak-infpy_read_memory-test.patch

@@ -0,0 +1,170 @@
+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-rhbz1007614-memleak-infpy_read_memory-test.patch
+
+;; Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
+;;=fedoratest
+
+Original message by Tom Tromey:
+
+  <https://sourceware.org/ml/gdb-patches/2012-03/msg00955.html>
+  Message-ID: <871uoc1va3.fsf@fleche.redhat.com>
+
+Comment from Sergio Durigan Junior:
+
+  In order to correctly test this patch, I wrote a testcase based on Jan
+  Kratochvil's <gdb/testsuite/gdb.base/gcore-excessive-memory.exp>.  The
+  testcase, which can be seen below, tests GDB in order to see if the
+  amount of memory being leaked is minimal, as requested in the bugzilla.
+  It is hard to define what "minimum" is, so I ran the testcase on all
+  supported RHEL architectures and came up with an average.
+
+commit cc0265cdda9dc7e8665e8bfcf5b4477489daf27c
+Author: Tom Tromey <tromey@redhat.com>
+Date:   Wed Mar 28 17:38:08 2012 +0000
+
+    	* python/py-inferior.c (infpy_read_memory): Remove cleanups and
+    	explicitly free 'buffer' on exit paths.  Decref 'membuf_object'
+    	before returning.
+
+diff --git a/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.c b/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.c
+@@ -0,0 +1,27 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 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/>.  */
++
++static struct x
++  {
++    char unsigned u[4096];
++  } x, *px = &x;
++
++int
++main (int argc, char *argv[])
++{
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.exp b/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.exp
+@@ -0,0 +1,68 @@
++# Copyright 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/>.
++
++set testfile py-gdb-rhbz1007614-memleak-infpy_read_memory
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++
++if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
++    return -1
++}
++
++if { [skip_python_tests] } { continue }
++
++set pid_of_gdb [exp_pid -i [board_info host fileid]]
++
++proc memory_v_pages_get {} {
++    global pid_of_gdb
++    set fd [open "/proc/$pid_of_gdb/statm"]
++    gets $fd line
++    close $fd
++    # number of pages of virtual memory
++    scan $line "%d" drs
++    return $drs
++}
++
++if { ![runto_main] } {
++    untested $testfile.exp
++    return -1
++}
++
++set remote_python_file [remote_download host ${srcdir}/${subdir}/${testfile}.py]
++
++gdb_test "source ${remote_python_file}" ""
++
++gdb_test "hello-world" ""
++
++set kbytes_before [memory_v_pages_get]
++verbose -log "kbytes_before = $kbytes_before"
++
++gdb_test "hello-world" ""
++
++set kbytes_after [memory_v_pages_get]
++verbose -log "kbytes_after = $kbytes_after"
++
++set kbytes_diff [expr $kbytes_after - $kbytes_before]
++verbose -log "kbytes_diff = $kbytes_diff"
++
++# The value "1000" was calculated by running a few GDB sessions with this
++# testcase, and seeing how much (in average) the memory consumption
++# increased after the "hello-world" command issued above.  The average
++# was around 500 bytes, so I chose 1000 as a high estimate.
++if { $kbytes_diff > 1000 } {
++    fail "there is a memory leak on GDB (RHBZ 1007614)"
++} else {
++    pass "there is not a memory leak on GDB (RHBZ 1007614)"
++}
+diff --git a/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.py b/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.py
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.py
+@@ -0,0 +1,30 @@
++# 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/>.
++
++class HelloWorld (gdb.Command):
++    """Greet the whole world."""
++
++    def __init__ (self):
++        super (HelloWorld, self).__init__ ("hello-world",
++                                           gdb.COMMAND_OBSCURE)
++
++    def invoke (self, arg, from_tty):
++        px = gdb.parse_and_eval("px")
++        core = gdb.inferiors()[0]
++        for i in range(256 * 1024):
++            chunk = core.read_memory(px, 4096)
++        print "Hello, World!"
++
++HelloWorld ()

SOURCES/gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch

@@ -0,0 +1,235 @@
+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-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+
+;; Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
+;; Kratochvil, RH BZ 1084404).
+;;=fedoratest
+
+These testcases have been created by compiling glibc-2.17-78 on
+RHEL-7.1 s390x/ppc64 boxes, and then taking the "select.o" file
+present at $builddir/misc/select.o.
+
+diff --git a/gdb/testsuite/gdb.arch/ppc64-prologue-skip.exp b/gdb/testsuite/gdb.arch/ppc64-prologue-skip.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/ppc64-prologue-skip.exp
+@@ -0,0 +1,34 @@
++# 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/>.
++
++if { ![istarget powerpc64-*linux-*] || ![is_lp64_target] } {
++    verbose "Skipping ppc64-prologue-skip.exp"
++    return
++}
++
++set testfile "ppc64-prologue-skip"
++set uufile "${srcdir}/${subdir}/${testfile}.o.uu"
++set ofile "${srcdir}/${subdir}/${testfile}.o"
++
++if { [catch "system \"uudecode -o ${ofile} ${uufile}\"" ] != 0 } {
++    untested "failed uudecode"
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_load $ofile
++
++gdb_test "break ___newselect_nocancel" "Breakpoint $decimal at 0xc: file ../sysdeps/unix/syscall-template.S, line 81." "breakpoint on ___newselect_nocancel"
+diff --git a/gdb/testsuite/gdb.arch/ppc64-prologue-skip.o.uu b/gdb/testsuite/gdb.arch/ppc64-prologue-skip.o.uu
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/ppc64-prologue-skip.o.uu
+@@ -0,0 +1,70 @@
++begin 644 ppc64-skip-prologue.o.uu
++M?T5,1@("`0`````````````!`!4````!````````````````````````````
++M``-(``````!```````!``!0`$8%-B-`L"@``0,(`-#@``(Y$```"3.,`('P(
++M`J;X`0`0^"'_D4@```%@````Z`$`@#@A`'!\"`.F3H``(/@A_X%]*`*F^2$`
++MD/CA`-#XP0#(^*$`P/B!`+CX80"P2````6````#X80!PZ.$`T.C!`,CHH0#`
++MZ($`N.AA`+`X``".1````GP``";X80!X^`$`B.AA`'!(```!8````.DA`)#H
++M`0"(Z&$`>'TH`Z9\#_$@."$`@$SC`"!+__]@```````,($``````````O``(
++M7U]S96QE8W0```````````````````````````!6``(````Y!`'[#@T``0$!
++M`0````$```$N+B]S>7-D97!S+W5N:7@``'-Y<V-A;&PM=&5M<&QA=&4N4P`!
++M``````D"```````````#T``!`BT3`@D``0$```"/``(`````"`$`````````
++M`````````````````"XN+W-Y<V1E<',O=6YI>"]S>7-C86QL+71E;7!L871E
++M+E,`+W)O;W0O9VQI8F,O9VQI8F,M,BXQ-RTW."YE;#<N<W)C+V=L:6)C+3(N
++M,3<M8S<U.&$V.#8O;6ES8P!'3E4@05,@,BXR,RXU,BXP+C$`@`$!$0`0!A$!
++M$@$#"!L()0@3!0`````````````````L``(`````"```````````````````
++M````````V``````````````````````````0``````%Z4@`$>$$!&PP!````
++M`#`````8`````````+P`20YP$4%^1`X`009!0@Z``4(107Y2$49_20X`!D$&
++M1@``````+G-Y;71A8@`N<W1R=&%B`"YS:'-T<G1A8@`N<F5L82YT97AT`"YD
++M871A`"YB<W,`+G)E;&$N;W!D`"YN;W1E+D=.52US=&%C:P`N<F5L82YD96)U
++M9U]L:6YE`"YR96QA+F1E8G5G7VEN9F\`+F1E8G5G7V%B8G)E=@`N<F5L82YD
++M96)U9U]A<F%N9V5S`"YR96QA+F5H7V9R86UE````````````````````````
++M````````````````````````````````````````````````````````````
++M`````````"`````!``````````8```````````````````!``````````-@`
++M```````````````````$```````````````;````!```````````````````
++M```````````*>`````````!(````$@````$`````````"``````````8````
++M)@````$``````````P```````````````````1@`````````````````````
++M``````````$``````````````"P````(``````````,`````````````````
++M``$8```````````````````````````````!```````````````V`````0``
++M```````#```````````````````!&``````````0````````````````````
++M"```````````````,0````0`````````````````````````````"L``````
++M````,````!(````%``````````@`````````&````#L````!````````````
++M``````````````````$H```````````````````````````````!````````
++M``````!0`````0`````````````````````````````!*`````````!:````
++M`````````````````0``````````````2P````0`````````````````````
++M````````"O``````````&````!(````(``````````@`````````&````&$`
++M```!``````````````````````````````&"`````````),`````````````
++M```````!``````````````!<````!``````````````````````````````+
++M"`````````!@````$@````H`````````"``````````8````;0````$`````
++M`````````````````````````A4`````````%`````````````````````$`
++M`````````````(`````!``````````````````````````````(P````````
++M`#`````````````````````0``````````````![````!```````````````
++M```````````````+:``````````P````$@````T`````````"``````````8
++M````E`````$``````````@```````````````````F``````````2```````
++M``````````````@``````````````(\````$````````````````````````
++M``````N8`````````!@````2````#P`````````(`````````!@````1````
++M`P`````````````````````````````"J`````````">````````````````
++M`````0```````````````0````(`````````````````````````````"$@`
++M```````!L````!,````+``````````@`````````&`````D````#````````
++M``````````````````````GX`````````'H````````````````````!````
++M`````````````````````````````````````````````P```0``````````
++M`````````````````P```P```````````````````````````P``!```````
++M`````````````````````P``!0```````````````````````````P``"@``
++M`````````````````````````P``#````````````````````````````P``
++M"````````````````````````````P``#0``````````````````````````
++M`P``#P```````````````````````````P``!P``````````````````````
++M```!$@``!0```````````````````-@````*$@```0`````````,````````
++M`#`````@$``````````````````````````````P$```````````````````
++M``````````!*$`````````````````````````````!E(@``!0``````````
++M`````````-@```!S(@``!0```````````````````-@`7U]S96QE8W0`7U]?
++M;F5W<V5L96-T7VYO8V%N8V5L`%]?<WES8V%L;%]E<G)O<@!?7VQI8F-?96YA
++M8FQE7V%S>6YC8V%N8V5L`%]?;&EB8U]D:7-A8FQE7V%S>6YC8V%N8V5L`%]?
++M;&EB8U]S96QE8W0`<V5L96-T```````````````````D````#0````H`````
++M``````````````!<````#@````H```````````````````"4````#P````H`
++M`````````````````````````0```"8````````````````````(````````
++M`#,```````````````````!&`````0```"8````````````````````&````
++M!@````$````````````````````,````!P````$````````````````````0
++M`````0```"8````````````````````8`````0```"8`````````V```````
++M```&````!0````$````````````````````0`````0```"8`````````````
++6```````<`````0```!H`````````````
++`
++end
+diff --git a/gdb/testsuite/gdb.arch/s390x-prologue-skip.exp b/gdb/testsuite/gdb.arch/s390x-prologue-skip.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/s390x-prologue-skip.exp
+@@ -0,0 +1,34 @@
++# 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/>.
++
++if { ![istarget s390x-*linux-*] || ![is_lp64_target] } {
++    verbose "Skipping s390x-prologue-skip.exp"
++    return
++}
++
++set testfile "s390x-prologue-skip"
++set uufile "${srcdir}/${subdir}/${testfile}.o.uu"
++set ofile "${srcdir}/${subdir}/${testfile}.o"
++
++if { [catch "system \"uudecode -o ${ofile} ${uufile}\"" ] != 0 } {
++    untested "failed uudecode"
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_load $ofile
++
++gdb_test "break select" "Breakpoint $decimal at 0x48: file ../sysdeps/unix/syscall-template.S, line 81." "breakpoint on select"
+diff --git a/gdb/testsuite/gdb.arch/s390x-prologue-skip.o.uu b/gdb/testsuite/gdb.arch/s390x-prologue-skip.o.uu
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/s390x-prologue-skip.o.uu
+@@ -0,0 +1,64 @@
++begin 644 s390x-prologue-skip.o.uu
++M?T5,1@("`0`````````````!`!8````!````````````````````````````
++M``+```````!```````!``!(`#^LE\!``).O?\&@`)+D$`.^G^_]@X^#P```D
++MP.4`````N00``NLE\+``!`J.N00`TKD$`"#`Y0````"Y!``MZ]_Q"``$I_0`
++M"L`0`````+\/$`"G=/_7"HZG2?`!N2$`),"T``````?^````5@`"````.0$!
++M^PX-``$!`0$````!```!+BXO<WES9&5P<R]U;FEX``!S>7-C86QL+71E;7!L
++M871E+E,``0`````)`@```````````]```0)F$P("``$!````CP`"``````@!
++M```````````````````````````N+B]S>7-D97!S+W5N:7@O<WES8V%L;"UT
++M96UP;&%T92Y3`"]R;V]T+V=L:6)C+V=L:6)C+3(N,3<M-S@N96PW+G-R8R]G
++M;&EB8RTR+C$W+6,W-3AA-C@V+VUI<V,`1TY5($%3(#(N,C,N-3(N,"XQ`(`!
++M`1$`$`81`1(!`P@;""4($P4`````````````````+``"``````@`````````
++M`````````````````&@`````````````````````````%``````!>E(``7@.
++M`1L,#Z`!````````&````!P`````````1`!,CP6.!HT'2`[``@```!`````X
++M`````````"```````"YS>6UT86(`+G-T<G1A8@`N<VAS=')T86(`+G)E;&$N
++M=&5X=``N9&%T80`N8G-S`"YN;W1E+D=.52US=&%C:P`N<F5L82YD96)U9U]L
++M:6YE`"YR96QA+F1E8G5G7VEN9F\`+F1E8G5G7V%B8G)E=@`N<F5L82YD96)U
++M9U]A<F%N9V5S`"YR96QA+F5H7V9R86UE````````````````````````````
++M````````````````````````````````````````````````````````````
++M````````(`````$`````````!@```````````````````$``````````:```
++M``````````````````0``````````````!L````$````````````````````
++M``````````F``````````&`````0`````0`````````(`````````!@````F
++M`````0`````````#````````````````````J```````````````````````
++M````````!```````````````+`````@``````````P``````````````````
++M`*@```````````````````````````````0``````````````#$````!````
++M``````````````````````````"H```````````````````````````````!
++M``````````````!&`````0``````````````````````````````J```````
++M``!:`````````````````````0``````````````00````0`````````````
++M````````````````">``````````&````!`````&``````````@`````````
++M&````%<````!``````````````````````````````$"`````````),`````
++M```````````````!``````````````!2````!```````````````````````
++M```````)^`````````!@````$`````@`````````"``````````8````8P``
++M``$``````````````````````````````94`````````%```````````````
++M``````$``````````````'8````!``````````````````````````````&P
++M`````````#`````````````````````0``````````````!Q````!```````
++M```````````````````````*6``````````P````$`````L`````````"```
++M```````8````B@````$``````````@```````````````````>``````````
++M2`````````````````````@``````````````(4````$````````````````
++M``````````````J(`````````#`````0````#0`````````(`````````!@`
++M```1`````P`````````````````````````````"*`````````"4````````
++M`````````````0```````````````0````(`````````````````````````
++M````!T`````````!L````!$````*``````````@`````````&`````D````#
++M``````````````````````````````CP`````````(X`````````````````
++M```!`````````````````````````````````````````````````P```0``
++M`````````````````````````P```P```````````````````````````P``
++M!````````````````````````````P``"```````````````````````````
++M`P``"@```````````````````````````P``!@``````````````````````
++M`````P``"P```````````````````````````P``#0``````````````````
++M`````````P``!0`````````````````````````!$```````````````````
++M```````````;$``````````````````````````````V$@```0````````!(
++M`````````"`````_$`````````````````````````````!7$@```0``````
++M``!6`````````!````!I$`````````````````````````````!Y(@```0``
++M``````!(`````````"````"'(@```0````````!(`````````"``7U]L:6)C
++M7V5N86)L95]A<WEN8V-A;F-E;`!?7VQI8F-?9&ES86)L95]A<WEN8V-A;F-E
++M;`!?7W-E;&5C=`!?7VQI8F-?;75L=&EP;&5?=&AR96%D<P!?7W-E;&5C=%]N
++M;V-A;F-E;`!?7W-Y<V-A;&Q?97)R;W(`7U]L:6)C7W-E;&5C=`!S96QE8W0`
++M````````````'`````H````3``````````(`````````-@````L````3````
++M``````(`````````2@````T````3``````````(`````````8@````\````3
++M``````````(`````````1@````$````6````````````````````!@````4`
++M```$````````````````````#`````8````$````````````````````$```
++M``$````6````````````````````&`````$````6`````````&@`````````
++M!@````0````$````````````````````$`````$````6````````````````
++L````(`````$````%````````````````````/`````$````%`````````$@`
++`
++end

SOURCES/gdb-rhbz1149205-catch-syscall-after-fork-test.patch

@@ -0,0 +1,123 @@
+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-rhbz1149205-catch-syscall-after-fork-test.patch
+
+;; Fix '`catch syscall' doesn't work for parent after `fork' is called'
+;; (Philippe Waroquiers, RH BZ 1149205).
+;;=fedoratest
+
+URL: <https://sourceware.org/ml/gdb-patches/2013-05/msg00364.html>
+Message-ID: <1368136582.30058.7.camel@soleil>
+
+  From: Philippe Waroquiers <philippe dot waroquiers at skynet dot be>
+  To: gdb-patches at sourceware dot org
+  Subject: RFA: fix gdb_assert caused by 'catch signal ...' and fork
+  Date: Thu, 09 May 2013 23:56:22 +0200
+
+  The attached patch fixes a gdb_assert caused by the combination of catch
+  signal and fork:
+    break-catch-sig.c:152: internal-error: signal_catchpoint_remove_location: Assertion `signal_catch_counts[iter] > 0' failed.
+
+  The problem is that the signal_catch_counts is decremented by detach_breakpoints.
+  The fix consists in not detaching breakpoint locations of type bp_loc_other.
+  The patch introduces a new test.
+
+Comments by Sergio Durigan Junior:
+
+  I addded a specific testcase for this patch, which tests exactly the
+  issue that the customer is facing.  This patch does not solve the
+  whole problem of catching a syscall and forking (for more details,
+  see <https://sourceware.org/bugzilla/show_bug.cgi?id=13457>,
+  specifically comment #3), but it solves the issue reported by the
+  customer.
+
+  I also removed the original testcase of this patch, because it
+  relied on "catch signal", which is a command that is not implemented
+  in this version of GDB.
+
+commit bd9673a4ded96ea5c108601501c8e59003ea1be6
+Author: Philippe Waroquiers <philippe@sourceware.org>
+Date:   Tue May 21 18:47:05 2013 +0000
+
+    Fix internal error caused by interaction between catch signal and fork
+
+diff --git a/gdb/testsuite/gdb.base/gdb-rhbz1149205-catch-syscall-fork.c b/gdb/testsuite/gdb.base/gdb-rhbz1149205-catch-syscall-fork.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gdb-rhbz1149205-catch-syscall-fork.c
+@@ -0,0 +1,11 @@
++#include <stdio.h>
++#include <unistd.h>
++
++int
++main (int argc, char **argv)
++{
++  if (fork () == 0)
++    sleep (1);
++  chdir (".");
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/gdb-rhbz1149205-catch-syscall-fork.exp b/gdb/testsuite/gdb.base/gdb-rhbz1149205-catch-syscall-fork.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gdb-rhbz1149205-catch-syscall-fork.exp
+@@ -0,0 +1,58 @@
++# 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/>.
++
++if { [is_remote target] || ![isnative] } then {
++    continue
++}
++
++set testfile "gdb-rhbz1149205-catch-syscall-fork"
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++
++# Until "catch syscall" is implemented on other targets...
++if {![istarget "hppa*-hp-hpux*"] && ![istarget "*-linux*"]} then {
++    continue
++}
++
++# This shall be updated whenever 'catch syscall' is implemented
++# on some architecture.
++#if { ![istarget "i\[34567\]86-*-linux*"]
++if { ![istarget "x86_64-*-linux*"] && ![istarget "i\[34567\]86-*-linux*"]
++     && ![istarget "powerpc-*-linux*"] && ![istarget "powerpc64-*-linux*"]
++     && ![istarget "sparc-*-linux*"] && ![istarget "sparc64-*-linux*"] } {
++     continue
++}
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
++    untested ${testfile}.exp
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load $binfile
++
++if { ![runto_main] } {
++    return -1
++}
++
++gdb_test "catch syscall chdir" \
++  "Catchpoint $decimal \\\(syscall (.)?chdir(.)? \\\[$decimal\\\]\\\)" \
++  "catch syscall chdir"
++
++gdb_test "continue" \
++  "Continuing\.\r\n.*\r\nCatchpoint $decimal \\\(call to syscall .?chdir.?.*" \
++  "continue from catch syscall after fork"

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

@@ -0,0 +1,371 @@
+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-rhbz1156192-recursive-dlopen-test.patch
+
+;; Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
+;; crash.' (RH BZ 1156192).
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen-libbar.c b/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen-libbar.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen-libbar.c
+@@ -0,0 +1,30 @@
++/* Testcase for recursive dlopen calls.
++
++   Copyright (C) 2014 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/>.  */
++
++/* This test was copied from glibc's testcase called
++   <dlfcn/tst-rec-dlopen.c> and related files.  */
++
++#include <stdio.h>
++#include <stdlib.h>
++
++void
++bar (void)
++{
++  printf ("Called bar.\n");
++}
+diff --git a/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen-libfoo.c b/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen-libfoo.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen-libfoo.c
+@@ -0,0 +1,30 @@
++/* Testcase for recursive dlopen calls.
++
++   Copyright (C) 2014 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/>.  */
++
++/* This test was copied from glibc's testcase called
++   <dlfcn/tst-rec-dlopen.c> and related files.  */
++
++#include <stdio.h>
++#include <stdlib.h>
++
++void
++foo (void)
++{
++  printf ("Called foo.\n");
++}
+diff --git a/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen.c b/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen.c
+@@ -0,0 +1,125 @@
++/* Testcase for recursive dlopen calls.
++
++   Copyright (C) 2014 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/>.  */
++
++/* This test was copied from glibc's testcase called
++   <dlfcn/tst-rec-dlopen.c> and related files.  */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <malloc.h>
++#include <dlfcn.h>
++
++#define DSO "gdb-rhbz1156192-recursive-dlopen-libfoo.so"
++#define FUNC "foo"
++
++#define DSO1 "gdb-rhbz1156192-recursive-dlopen-libbar.so"
++#define FUNC1 "bar"
++
++/* Prototype for my hook.  */
++void *custom_malloc_hook (size_t, const void *);
++
++/* Pointer to old malloc hooks.  */
++void *(*old_malloc_hook) (size_t, const void *);
++
++/* Call function func_name in DSO dso_name via dlopen.  */
++void
++call_func (const char *dso_name, const char *func_name)
++{
++  int ret;
++  void *dso;
++  void (*func) (void);
++  char *err;
++
++  /* Open the DSO.  */
++  dso = dlopen (dso_name, RTLD_NOW|RTLD_GLOBAL);
++  if (dso == NULL)
++    {
++      err = dlerror ();
++      fprintf (stderr, "%s\n", err);
++      exit (1);
++    }
++  /* Clear any errors.  */
++  dlerror ();
++
++  /* Lookup func.  */
++  *(void **) (&func) = dlsym (dso, func_name);
++  if (func == NULL)
++    {
++      err = dlerror ();
++      if (err != NULL)
++        {
++  fprintf (stderr, "%s\n", err);
++  exit (1);
++        }
++    }
++  /* Call func twice.  */
++  (*func) ();
++
++  /* Close the library and look for errors too.  */
++  ret = dlclose (dso);
++  if (ret != 0)
++    {
++      err = dlerror ();
++      fprintf (stderr, "%s\n", err);
++      exit (1);
++    }
++
++}
++
++/* Empty hook that does nothing.  */
++void *
++custom_malloc_hook (size_t size, const void *caller)
++{
++  void *result;
++  /* Restore old hooks.  */
++  __malloc_hook = old_malloc_hook;
++  /* First call a function in another library via dlopen.  */
++  call_func (DSO1, FUNC1);
++  /* Called recursively.  */
++  result = malloc (size);
++  /* Restore new hooks.  */
++  old_malloc_hook = __malloc_hook;
++  __malloc_hook = custom_malloc_hook;
++  return result;
++}
++
++int
++main (void)
++{
++
++  /* Save old hook.  */
++  old_malloc_hook = __malloc_hook;
++  /* Install new hook.  */
++  __malloc_hook = custom_malloc_hook;
++
++  /* Attempt to dlopen a shared library. This dlopen will
++     trigger an access to the ld.so.cache, and that in turn
++     will require a malloc to duplicate data in the cache.
++     The malloc will call our malloc hook which calls dlopen
++     recursively, and upon return of this dlopen the non-ref
++     counted ld.so.cache mapping will be unmapped. We will
++     return to the original dlopen and crash trying to access
++     dlopened data.  */
++  call_func (DSO, FUNC);
++
++  /* Restore old hook.  */
++  __malloc_hook = old_malloc_hook;
++
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen.exp b/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen.exp
+@@ -0,0 +1,157 @@
++# Copyright 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/>.
++
++if {[skip_shlib_tests]} {
++    untested "skipping shlib tests"
++    return 0
++} elseif {[use_gdb_stub]} {
++    untested "skipping tests because of stub"
++    return 0
++}
++
++# Library foo
++set libname1 "gdb-rhbz1156192-recursive-dlopen-libfoo"
++set srcfile_lib1 ${srcdir}/${subdir}/${libname1}.c
++set binfile_lib1 [standard_output_file ${libname1}.so]
++# Library bar
++set libname2 "gdb-rhbz1156192-recursive-dlopen-libbar"
++set srcfile_lib2 ${srcdir}/${subdir}/${libname2}.c
++set binfile_lib2 [standard_output_file ${libname2}.so]
++
++set testfile "gdb-rhbz1156192-recursive-dlopen"
++set srcfile ${testfile}.c
++set executable ${testfile}
++set binfile [standard_output_file ${executable}]
++
++if { [gdb_compile_shlib ${srcfile_lib1} ${binfile_lib1} \
++	{ debug "additional_flags=-fPIC" }] != "" } {
++    untested "Could not compile ${binfile_lib1}"
++    return -1
++}
++
++if { [gdb_compile_shlib ${srcfile_lib2} ${binfile_lib2} \
++	{ debug "additional_flags=-fPIC" }] != "" } {
++    untested "Could not compile ${binfile_lib2}"
++    return -1
++}
++
++if { [prepare_for_testing ${testfile}.exp ${executable} ${srcfile} \
++	[ list debug shlib_load "additional_flags=-Wno-deprecated-declarations" ]] } {
++    untested "Could not compile ${executable}"
++    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]"
++  set libfoo_match "[string_to_regexp $binfile_lib1]"
++
++  gdb_test_multiple "info shared" "info shared" {
++    -re ".*$libfoo_match\r\n.*$libbar_match\(\r\n.*Shared library is missing\)?.*\r\n${gdb_prompt} $" {
++      if { $has_libfoo && $has_libbar } {
++	pass "matched libfoo and libbar"
++      } else {
++	fail "matched libfoo and libbar (has_libfoo = $has_libfoo, has_libbar = $has_libbar)"
++      }
++    }
++    -re ".*$libfoo_match\(\r\n.*Shared library is missing\)?.*\r\n${gdb_prompt} $" {
++      if { $has_libfoo && !$has_libbar } {
++	pass "matched libfoo"
++      } else {
++	fail "matched libfoo (has_libfoo = $has_libfoo, has_libbar = $has_libbar)"
++      }
++    }
++    -re ".*$libbar_match\(\r\n.*Shared library is missing\)?.*\r\n${gdb_prompt} $" {
++      if { $has_libbar && !$has_libfoo } {
++	pass "matched libbar"
++      } else {
++	fail "matched libbar (has_libfoo = $has_libfoo, has_libbar = $has_libbar)"
++      }
++    }
++    "\r\n${gdb_prompt} $" {
++      if { !$has_libfoo && !$has_libbar } {
++	pass "did not match libfoo nor libbar"
++      } else {
++	fail "did not match libfoo nor libbar (has_libfoo = $has_libfoo, has_libbar = $has_libbar)"
++      }
++    }
++  }
++}
++
++proc test_stop_on_solib_events { } {
++  set pass 0
++  # This variable holds the information about whether libfoo and
++  # libbar (respectively) are expected in the "info shared" output.
++  set solib_event_order { { 0 0 } { 0 0   } { 0 0   } { 0 1 } \
++			  { 0 1 } { 0 0   } { 0 0   } { 0 1 } \
++			  { 0 1 } { 0 0   } { 0 0   } { 0 1 } \
++			  { 0 1 } { 0 0   } { 0 0 1 } { 1 1 } \
++			  { 1 1 } { 1 0   } { 1 0   } { 1 1 } \
++			  { 1 1 } { 1 0 1 } { 1 0   } { 1 0 } }
++
++  with_test_prefix "stop-on-solib-events" {
++    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" {
++	set should_be_corrupted [expr 0+0[lindex $l 2]]
++	do_test [lindex $l 0] [lindex $l 1]
++	set test "continue"
++	global gdb_prompt
++	gdb_test_multiple $test $test {
++	  -re "\r\nwarning: Corrupted shared library list:.*\r\nStopped due to shared library event.*\r\n$gdb_prompt $" {
++	    set corrupted 1
++	    pass $test
++	  }
++	  -re "\r\nStopped due to shared library event.*\r\n$gdb_prompt $" {
++	    set corrupted 0
++	    pass $test
++	  }
++	}
++	set test "corrupted=$corrupted but should_be_corrupted=$should_be_corrupted"
++	if {$corrupted == $should_be_corrupted} {
++	  pass $test
++	} else {
++	  fail $test
++	}
++      }
++    }
++    # In the last pass we do not expect to see libfoo or libbar.
++    incr pass
++    with_test_prefix "pass #$pass" {
++      do_test 0 0
++    }
++  }
++}
++
++test_stop_on_solib_events

SOURCES/gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch

@@ -0,0 +1,135 @@
+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-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+
+;; Fix 'backport GDB 7.4 fix to RHEL 6.6 GDB' [Original Sourceware bug
+;; description: 'C++ (and objc): Internal error on unqualified name
+;; re-set', PR 11657] (RH BZ 1186476).
+;;=fedoratest
+
+Comments from Sergio Durigan Junior:
+
+  The "proper" fix for this whole problem would be to backport the
+  "ambiguous linespec" patch series.  However, it is really not
+  recommended to do that for RHEL GDB, because the patch series is too
+  big and could introduce unwanted regressions.  Instead, what we
+  chose to do was to replace the gdb_assert call by a warning (which
+  allows the user to continue the debugging session), and tell the
+  user that, although more than one location was found for his/her
+  breakpoint, only one will be used.
+
+diff --git a/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set-main.cc b/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set-main.cc
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set-main.cc
+@@ -0,0 +1,22 @@
++/* 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/>.  */
++
++int
++main (int argc, char *argv[])
++{
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set.cc b/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set.cc
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set.cc
+@@ -0,0 +1,26 @@
++/* 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/>.  */
++
++class C
++  {
++    public:
++      C () {}
++      C (int x) {}
++  };
++
++C a;
++C b (1);
+diff --git a/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set.exp b/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/gdb-rhbz1186476-internal-error-unqualified-name-re-set.exp
+@@ -0,0 +1,51 @@
++# 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/>.
++
++if { [skip_cplus_tests] } { continue }
++if { [skip_shlib_tests] } { continue }
++if { [is_remote target] } { continue }
++if { [target_info exists use_gdb_stub] } { continue }
++
++set testfile gdb-rhbz1186476-internal-error-unqualified-name-re-set-main
++set srcfile $testfile.cc
++set executable $testfile
++set binfile [standard_output_file $executable]
++
++set libtestfile gdb-rhbz1186476-internal-error-unqualified-name-re-set
++set libsrcfile $libtestfile.cc
++set sofile [standard_output_file lib$libtestfile.so]
++
++# Create and source the file that provides information about the compiler
++# used to compile the test case.
++if [get_compiler_info "c++"] {
++    return -1
++}
++
++if { [gdb_compile_shlib $srcdir/$subdir/$libsrcfile $sofile {debug c++ "additional_flags=-fPIC"}] != ""
++     || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list additional_flags=-Wl,-rpath,[file dirname ${sofile}] "c++" shlib=${sofile} ]] != ""} {
++    untested $libtestfile.exp
++    return -1
++}
++
++clean_restart $executable
++
++gdb_test_no_output "set breakpoint pending on"
++# gdb_breakpoint would print a failure because of some warning messages
++gdb_test "break C::C" "Breakpoint $decimal \\(C::C\\) pending."
++
++#gdb_test "run" "warning: Found more than one location for breakpoint #$decimal; only the first location will be used.(\r\n)+Breakpoint $decimal, C::C.*"
++gdb_test "run"
++
++gdb_test "info break" " in C::C\\(\\) at .* in C::C\\(int\\) at .*"

SOURCES/gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch

@@ -0,0 +1,104 @@
+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-rhbz1261564-aarch64-hw-watchpoint-test.patch
+
+;; [aarch64] Fix hardware watchpoints (RH BZ 1261564).
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.base/rhbz1261564-aarch64-watchpoint.c b/gdb/testsuite/gdb.base/rhbz1261564-aarch64-watchpoint.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/rhbz1261564-aarch64-watchpoint.c
+@@ -0,0 +1,33 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2016 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/>.  */
++
++__attribute__((aligned(16))) struct
++{
++  int var0, var4, var8;
++} aligned;
++
++int
++main (void)
++{
++  aligned.var0 = 1;
++  aligned.var4 = 2;
++  aligned.var8 = 3;
++
++  aligned.var4 = aligned.var0;
++
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/rhbz1261564-aarch64-watchpoint.exp b/gdb/testsuite/gdb.base/rhbz1261564-aarch64-watchpoint.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/rhbz1261564-aarch64-watchpoint.exp
+@@ -0,0 +1,53 @@
++# Copyright (C) 2016 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 { [prepare_for_testing rhbz1261564-aarch64-watchpoint.exp "rhbz1261564-aarch64-watchpoint"] } {
++    return -1
++}
++
++if { ! [ runto main ] } then { return 0 }
++
++set test "rwatch aligned.var4"
++if [istarget "s390*-*-*"] {
++    gdb_test $test {Target does not support this type of hardware watchpoint\.}
++    untested "s390* does not support hw read watchpoint"
++    return
++}
++gdb_test $test "Hardware read watchpoint \[0-9\]+: aligned.var4"
++
++proc checkvar { address } {
++    global gdb_prompt
++
++    set test "p &aligned.var$address"
++    gdb_test_multiple $test $test {
++	-re " = \\(int \\*\\) 0x\[0-9a-f\]+$address <aligned(\\+\[0-9\]+)?>\r\n$gdb_prompt $" {
++	    pass $test
++	}
++	-re "\r\n$gdb_prompt $" {
++	    untested "$test (unexpected ELF layout)"
++	    return 0
++	}
++    }
++    return 1
++}
++if ![checkvar "0"] { return }
++if ![checkvar "4"] { return }
++if ![checkvar "8"] { return }
++
++# Assumes: PPC_PTRACE_GETHWDBGINFO::data_bp_alignment == 8
++# 'lwz' does read only 4 bytes but the hw watchpoint is 8 bytes wide.
++setup_xfail "powerpc*-*-*"
++
++gdb_continue_to_end

SOURCES/gdb-rhbz1325795-framefilters-test.patch

@@ -0,0 +1,176 @@
+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-rhbz1325795-framefilters-test.patch
+
+;; New test for Python "Cannot locate object file for block" (for RH BZ 1325795).
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.python/py-framefilter-thread.c b/gdb/testsuite/gdb.python/py-framefilter-thread.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.python/py-framefilter-thread.c
+@@ -0,0 +1,39 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2016 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 <pthread.h>
++#include <assert.h>
++
++static void *
++start (void *arg)
++{
++  return arg; /* Backtrace end breakpoint */
++}
++
++int
++main (void)
++{
++  pthread_t thread1;
++  int i;
++
++  i = pthread_create (&thread1, NULL, start, NULL);
++  assert (i == 0);
++  i = pthread_join (thread1, NULL);
++  assert (i == 0);
++
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.python/py-framefilter-thread.exp b/gdb/testsuite/gdb.python/py-framefilter-thread.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.python/py-framefilter-thread.exp
+@@ -0,0 +1,54 @@
++# Copyright (C) 2016 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/>.
++
++load_lib gdb-python.exp
++
++standard_testfile
++
++if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug pthreads}]} {
++    return -1
++}
++
++# Skip all tests if Python scripting is not enabled.
++if { [skip_python_tests] } { continue }
++
++if ![runto_main] then {
++    return
++}
++gdb_test_no_output "set python print-stack full" \
++    "Set python print-stack to full"
++
++# Load global frame-filters
++set remote_python_file [remote_download host ${srcdir}/${subdir}/${testfile}.py]
++gdb_test_no_output "python exec (open ('${remote_python_file}').read ())" \
++    "Load python file"
++
++gdb_breakpoint [gdb_get_line_number "Backtrace end breakpoint"]
++gdb_continue_to_breakpoint "Backtrace end breakpoint"
++
++# #2  0x00007ffff75f228d in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:113^M
++gdb_test "bt no-filters" " in (\\.?_*clone|thread_start) \[^\r\n\]*" "bt no-filters"
++
++# #2  0x00007ffff75f228d in 941595343737041 () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:113^M
++# vs.
++# #2  0x00007ffff75f228d in 941595343737041Traceback (most recent call last):
++#   File "/home/jkratoch/redhat/rhel/gdb/rhel-7.3/gdb-7.6.1/gdb/testsuite/../data-directory/python/gdb/FrameDecorator.py", line 145, in frame_args
++#     return self._base.frame_args()
++#   File "/home/jkratoch/redhat/rhel/gdb/rhel-7.3/gdb-7.6.1/gdb/testsuite/../data-directory/python/gdb/FrameDecorator.py", line 152, in frame_args
++#     return args.fetch_frame_args()
++#   File "/home/jkratoch/redhat/rhel/gdb/rhel-7.3/gdb-7.6.1/gdb/testsuite/../data-directory/python/gdb/FrameDecorator.py", line 276, in fetch_frame_args
++#     block = self.frame.block()
++# RuntimeError: Cannot locate object file for block.
++gdb_test "bt" " in \[0-9\]+ \[^\r\n\]*" "bt with filters"
+diff --git a/gdb/testsuite/gdb.python/py-framefilter-thread.py b/gdb/testsuite/gdb.python/py-framefilter-thread.py
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.python/py-framefilter-thread.py
+@@ -0,0 +1,60 @@
++# Copyright (C) 2016 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/>.
++
++# This file is part of the GDB testsuite.  It tests Python-based
++# frame-filters.
++
++# This test is specifically crafted for RH BZ 1197665.
++
++import gdb
++import itertools
++from gdb.FrameDecorator import FrameDecorator
++import copy
++
++class Reverse_Function (FrameDecorator):
++
++    def __init__(self, fobj):
++        super(Reverse_Function, self).__init__(fobj)
++        self.fobj = fobj
++
++    def function (self):
++        # This function call should not fail.
++        gdb.target_charset ()
++
++        fname = str (self.fobj.function())
++        if (fname == None or fname == ""):
++            return None
++        else:
++            fname = fname[::-1]
++        return fname
++
++class FrameFilter ():
++
++    def __init__ (self):
++        self.name = "Reverse"
++        self.priority = 100
++        self.enabled = True
++        gdb.frame_filters [self.name] = self
++
++    def filter (self, frame_iter):
++        # Python 3.x moved the itertools.imap functionality to map(),
++        # so check if it is available.
++        if hasattr(itertools, "imap"):
++            frame_iter = itertools.imap (Reverse_Function, frame_iter)
++        else:
++            frame_iter = map (Reverse_Function, frame_iter)
++        return frame_iter
++
++FrameFilter()

SOURCES/gdb-rhbz1350436-type-printers-error.patch

@@ -0,0 +1,83 @@
+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-rhbz1350436-type-printers-error.patch
+
+;; Test 'info type-printers' Python error (RH BZ 1350436).
+;;=fedoratest
+
+Typo in Python support breaks info type-printers command
+https://bugzilla.redhat.com/show_bug.cgi?id=1350436
+
+[testsuite patch] PR python/17136: 'info type-printers' causes an exception when there are per-objfile printers
+https://sourceware.org/ml/gdb-patches/2016-06/msg00455.html
+
+diff --git a/gdb/testsuite/gdb.python/py-typeprint.cc b/gdb/testsuite/gdb.python/py-typeprint.cc
+--- a/gdb/testsuite/gdb.python/py-typeprint.cc
++++ b/gdb/testsuite/gdb.python/py-typeprint.cc
+@@ -31,6 +31,12 @@ templ<basic_string> s;
+ 
+ basic_string bs;
+ 
++class Other
++{
++};
++
++Other ovar;
++
+ int main()
+ {
+   return 0;
+diff --git a/gdb/testsuite/gdb.python/py-typeprint.exp b/gdb/testsuite/gdb.python/py-typeprint.exp
+--- a/gdb/testsuite/gdb.python/py-typeprint.exp
++++ b/gdb/testsuite/gdb.python/py-typeprint.exp
+@@ -50,3 +50,7 @@ gdb_test_no_output "enable type-printer string"
+ gdb_test "whatis bs" "string" "whatis with enabled printer"
+ 
+ gdb_test "whatis s" "templ<string>"
++
++gdb_test "info type-printers" "Type printers for \[^\r\n\]*/py-typeprint:\r\n *other\r\n.*" \
++	 "info type-printers for other"
++gdb_test "whatis ovar" "type = Another"
+diff --git a/gdb/testsuite/gdb.python/py-typeprint.py b/gdb/testsuite/gdb.python/py-typeprint.py
+--- a/gdb/testsuite/gdb.python/py-typeprint.py
++++ b/gdb/testsuite/gdb.python/py-typeprint.py
+@@ -15,8 +15,7 @@
+ 
+ import gdb
+ 
+-
+-class Recognizer(object):
++class StringRecognizer(object):
+     def __init__(self):
+         self.enabled = True
+ 
+@@ -32,7 +31,27 @@ class StringTypePrinter(object):
+         self.enabled = True
+ 
+     def instantiate(self):
+-        return Recognizer()
++        return StringRecognizer()
+ 
+ 
+ gdb.type_printers.append(StringTypePrinter())
++
++class OtherRecognizer(object):
++    def __init__(self):
++        self.enabled = True
++
++    def recognize(self, type_obj):
++        if type_obj.tag == 'Other':
++            return 'Another'
++        return None
++
++class OtherTypePrinter(object):
++    def __init__(self):
++        self.name = 'other'
++        self.enabled = True
++
++    def instantiate(self):
++        return OtherRecognizer()
++
++import gdb.types
++gdb.types.register_type_printer(gdb.objfiles()[0], OtherTypePrinter())

SOURCES/gdb-rhbz1398387-tab-crash-test.patch

@@ -0,0 +1,454 @@
+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-rhbz1398387-tab-crash-test.patch
+
+;; New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.base/tab-crash.bz2.uu b/gdb/testsuite/gdb.base/tab-crash.bz2.uu
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/tab-crash.bz2.uu
+@@ -0,0 +1,393 @@
++begin 644 /tmp/libgcc_s-6.3.1-20161221.so.1-objcopyR.debug.bz2
++M0EIH.3%!6293622@"44`>Q=_____________________________________
++M________X#\<>SD#OM[7/HAP:R]\H#D"=!/";NP7!]OOJG>U[N;WW'KVV?9I
++M[[,[X.\/;%2U``[[NUM7P^T[U617V#12M]6M7W;M7CZU<=!]/8WL[LI=AZZ>
++MJ5XW;QP]W<NQW8Q539B5-[UA8``:HSG=SF*R#=AT#0`'+3D>]DVHY@]/6RS=
++M8[:2][W/<YN3<[=[S=37NY[=X&IH@)H"8$T```3$U-@)@F)B,(TT:-#$T9``
++M`3`!H-`*G^BGB,$--4]E,R-"9JGL4V)J;*>F01Z:GIID,IC$GHU-HR$:@T0F
++M@$PC($P"`$PF)D9-&IZFCT-4\$TRI^330-$TR>32>FFF@F!H0GJ>TD_*9!E,
++MR3Q3/11M-,%#T-3:-3T9(P-3T3TT@;1ZD>C1E,AM0:`@@303"`(Q*>FGHU)Z
++MGDFR8FFJ'L5/1C313R3U/*?JF]&35-J!Y3U/TI^1$\IZGFBGJ>HVF4>H])ZA
++MZC)ZFT)H>IH]0>H!H&RC0,F0T9E!HT-`TT`)-1(A$R&J?J3T80]313\F0GHC
++MU3:90\H]$]3:C93U-!LH\IIZ$]0R>:D>329J--`/4_5'I-`TT9#3U!ZC0>H#
++M0])H!H9!Z@#30VH#30-/4T'J`]09%$!4\)A3R,-1'J`S2#0--,$:/$C9-3TG
++MH:FR9-(T>D\4],HT'I`/4`>HVFIIZFR:FR:)Y,3*/3*;"FT:(VIYJC:FF)Z:
++MCTFAIZCTAH:#U!F*")1`0!`"9#4Q-,FT(R33R-4VFE/U&TU-3RGZ1FJ>&H]2
++M;U38GJ-J3TQ0Q'DU-'J?JF]2&30-'J:>H,FC1HWJ@#RFC0!Z#2-/4T&&4T-/
++M2:&(>D'J,5#"1JH5B["KJTH:1R2I95!0TXN8+PQ'&*+8%8JVQCC/1G1D0A-S
++M<I944!D8K(C"*`I!((H+`S?O/"O^MIFA>91MLJJLK];M*G>^]MGIW=W7E>KL
++M)MXKMO7VV\M77ANM3H=6LGI)+AR&CF'#<66)4&4S6:;*26:S5DUQGS$+>97<
++M!3.,U$LQELITU,X3Y5[GW>0?IM4(5>Z!^AE04E8=:H(X[7T$U.`@QRT\Z]_"
++M7?`4-8Q_UDP"AQ@$1,B`G(D*S"^7Z%ABZ-%T<L]#FC8#-<VF6>6MS+#&8M+G
++M)M>_Y9ME3-K"RMO>,UK^9/4HYU5!3:6'45^1-AA23JG7FH&=KT9ZK-!6>?\-
++M;_HD;$V3C,[X\-20B*R?`.(:CK$3A&J2!XYI6TW[U*HI*560[F!42LB.:FO9
++MT2S-`KC"H/^S^JJFC(54?*/HIBKH,!73^2++62,G98Y/*,\,%R,Y08$R@$&L
++MC#"P#E53*YTZS&>L\]4*"<8&2^]*I?02,46;3.V(P+2P`3$>F+HNTY/(%Z<`
++MM.P&I]6,N<YQ5QZL0]B&[?*?757VV"$MA$PU!CM3C:=M[)14&\?,W,8G`:_Z
++M:"!X2U%Y27M:ALSP\;:NN/-<%#.J9]653UK^E@@[&^NWC27B&%J9M[R6M)90
++M1]AC4PE2-+_V#SBBFMO=0D\:GY]-F<'UYQ"RKVHV>ED[M1J4`O?!J@8`&>?1
++M%!8/]>.7UF-'?ZO,O??);\\L:3X7JN-O^ZWAPV:'ONI*N$I2REEE+$\Q47N6
++M)NB0W\O.LZ)TMD[9VG1NS+?94@_.$$=!P2#U2(8;*%.99OOW:1@#`W]ZV:OR
++M1IW<Y\T_[@G!L<&-V&1="[W(M!N9R^OOH?0``<D1CT)A(*L^:&H=+.^+:/]'
++M04%%.SW-\#;`53:0[GC?<_OK4%3=]'?\H^U4`^9^I>EL,R4\*2Y2^>SP[^QB
++M_,U-)GY3;9KT/P=<O3?SAWG$AXK@0I)`(AD(`)"("Z>Q.GX.7G"Q:>QK&9"$
++M[#-J-&>2W>*T.XDRFC(,4I`"ED(D0(($(R0#&6;D6H(.:&R(R,:JBHZ!54G<
++M11T9V@K&&$`@8+T3IN#,:<5@P(RTBD1%(JP%55$2*#^!4E,%ER22`*-**JU6
++MJZII6%N>*+(`*J_?LDI@")%A1D1`@0D?O:UXU=+B+/%.C.3P3935G@9N(=B(
++M39SA1$,K(<1`/."P@;M&4XI&*(9N(H[,#92F)PFDD,V:<P:&CI-74Y(%5G9Q
++M.;&CNT9/.(D(0E-%1E-38298NLWC1:8#&:TRBD72U("/%-3!D/9BWJ:]FM#)
++M2L@[*@&EK:079)8-B@%&PML&Q0"QSC<@!>;%@V(`6%EHV(`6$+T`+00*I0;U
++M`+6F`+<5+:@OPH!:+<%V-Y:H6@0ST6@@$DQO&U0"]M7&.2N,;AN4`HP8H!<7
++MT;QP4`N;A(R`&`P88BZ-&+V-:04?;20GS/LL>$_B,!&RT)$%@$(*)!"$E!7/
++M#&8("!8N/9=K.,FB'MY.._/VD>C9#^`XS.XJ/S:XR1TI^MMN1AER0/FI,QI<
++MI!S/-3&8!4S2B>DK$=5/`G2Z><=$L7)SB`(%.`?MXB?J?H_!K]]%1:Q0>>D5
++M@*,0!$21@`8Q[N?N_7_H;4[#S/![4O,^[NUOC?7F"'Z'YMMYO*;_)-<!Z[TG
++MI*)=+?,[8F8#>K^K9([W=II7_32_/>'@"M-U3'I3>\5F/7!,>LN:H3*N!L;;
++M")']UU7>>-S\,?K65#!/&(542)(!76C2F<92T@@7G-NX#D][M'6*;YS)AF7<
++M!W7=#3Y1,RGT_`:&!`EU8>JEM/&<Z=3T%4V1[G3DVDH\X<(1KVY(YKFX4,W#
++M@OCO$:6B8^HAC+,.^S`V.CG>JEI"+[5?4O\_]DT0",,XH95*#$@#=L,AO4L+
++M1BB(3Q$X?C1IAS!$AY.>_%4]AI=*'&F6&\>U;\YG,QV14-HP9\BY30H/3].G
++MTW36AQ.N"4&8U(-$CSEJ:IAKE6J,KC=.U9$\H:1I/5!WK37"2WTTCL+"6YJD
++MVV8?W_`MAI=@)]J^U-YAOBS;:'(S4SPBJP))LEQ'+GK;<]US[@5VN)U.SEI]
++M@B6(>WE8&UNN(Z_Y^_U`>?=I<YH<:Y7@Z9C$)>*[4=\'V/"\YOXXU=RH7$2P
++MZ8AP5/2</TOZ\C(9=&&[AG/8E@*VB@8L:0:5=Y66\X2D.7TV9:?@;+B>@#F"
++M^(R"5",K@5=:R=P=>/%\_!=LCS0>*ISX$*;G?\$9(P-<"734Z=7:V/E#,EJ3
++MR#)DN].):$0+S";E13Q8UADO"%],GD)5UBLW<J)YR".E/J3J`^PF6,0SG-%0
++M"7N9K0*D#I.`[B%7`^)[%EN<\.D]+[$>UDCN34&A3.I3U+69_K:PL#9:%6F)
++M[AU5/05TLKLJ2*QB0,US:"U%(#G!9N81MN&'7T1O*J^]%%^#HV->-]LNGN*=
++M"C%H8>WG7$,^&0"244E4:#V6Y!289:<&E<<-ZGKH1[>$BW"MUU,#SL;,,),V
++M565B6/E!Z,H8E#]WD=(P%@X(,/C7GD<S]$14+$KE2?!'&@4#"J4DUM@S<>0D
++MP-:,NZ$0>8GQY;JN=^^\XXXN0&5=W>Z5]AZ1HYC%E&S'8*.!D@5[<8]"EYC)
++M7*.I"&7-3RH1V#K4>$VO7@MZ*G*`]>M6049!<IIHH&:*@U..`8SPN9NZ/@W$
++M&,^",8M/J#@-9F,F35FU[UMWUZ`A^/!1>\$(C%$3O$(">"B@IT'Y=.=H)`'G
++MP?T,;OF2.6;FQ;,.#Y<(PT)/0+73.OI!]&#-""F<TJ>[4ST51A!FJDN2B3PA
++MCB(Q@J)!V14/5@R7:FG%FN\:RY!,K%<CRJ)2E'H':71::U+B9EZ&^[QA"$(6
++MW[UV*8E.$)YLMO(SQ!W:VB68:T<\[J:GE`^T,VO'GU:)Q<37E7%6&7=6*0:C
++M130555L1[```B"D1'L4)04H@+`D`!*40I2""85*?;,!0/,ML%:I2GZ7JOT_^
++M__JGX^`88*"^A2B!("$DD)-JTBB*)!&01619$18(D%1(C(BL!EM046+$148*
++MB0448@JBJK$4L`JZA/-TU(2O62'UK"RTDD#%#32HU54TJU&$I.=`:'<L4M&Z
++M#3XD##Y(;+O*'P?O/*L$0M7X4(Q+A$./HU"$E?+2H4$0_*[S[.?+^5OM!_4_
++M&;Y:7'A#\NXTI=P]9X81`(@)D"("VFZ#(``(E`BHF35`Z,7BT/QW.\K-?*=`
++M#H[THS)C:DZ[>>T32S-L$$!!O<Z/1:=GW7L.-`@+OC?L!%%%01YJ0`W\#O_<
++MU7+AYV=\KX_M\G+/<I8S?E:J'"]%[4IBH5:8;!*?B5.\9;(40FH14V2K4D9\
++MU79K*ZG:G;26OW<;!(4112K2I_&OTNYP.TXS2`2<66Z>M9<,*\;?V9^D]EW*
++MBQ6*UR5PQ\J=9&)2U[%%,*&2VK(M$(BHTDQO)TV^76K`\E7:.HV99X,B$L68
++MSG"]BK3]QP^-(JA!,M42_#=-`S`(@)8T4R,S_Y[7P__.8YW/0JJJJJJJNK8X
++M-=3PO'T&C*J9)`]F0`%K%$*P$#"""'MX"\OETF6EW>4IT9RN8.;PY_?U:<^?
++M*X$4<G+IS96`!RXB`W?+I9`4-_^=]@=5PM10NDDBBA..4DY\"D#+`\7;U[G#
++MO=@@?%VQX&)]5][V?U]Z-?DW??P?H<?6U2\`#8A\D^S^;\VZ[QY0#'`3U,IK
++MLXHES[NTJ)5](L\+[G%+;D/B#Q`X4AG*UHL1KC9MFPLT`%,&%)B_^A;.P#UH
++MFUO;E0'(83(IV[A:>&<5`%`1414BR`"1@4.DH8`QG9@#`TT7)^C&:7C@<GE+
++MH21&K'625@X1SV8=C[7_!BK`FS4,OJG>IA^%"_<3WTX+Q5*-=*7Y#/IE(_)_
++MYYO52X/>^`A8NS+]GQ6$%J!9HFB5*_*22UE#*>TYS.T"1U[AFR44'A(ZIZ$N
++M7O')DXRK49/4T!7XG8#F7\)CF+,TPJAPV;\#4,AD7,Z/*?9D2DQDGR.^]LB(
++M%[`,/\]CK_:F,LN`#`T>]RT?A*WQ[K='\FN+&[/YKKD[GOG)".MPK9KOE&2>
++M4312<,\Y^C:>3=S-OHU-R)^F^*9H5Q"=7^-'_#GT?0V-ZX-3_S"6N2Q?O;7:
++M=G#ZR=L/JQG[<S([.GUTY(]YW<0002-&03+]]@]K1M228\@$'[8E&`X0,H(P
++M1&=K.;MCX^[[_\*P#V$[N)^U]G0V?:4`Z41`"(&!@9N"#?S[?F^CU<GQ*7,>
++MO\_!J];07#9:XP=/JNC6V$KW5]`_.82T05/S?='X=WG0YS.[I94'X$?S()[N
++M#_Y@OQH(_`@/2399*2&\0*8=X^IVZ-3#*-44=7^#1YU#@<+A<&%:']\FNF[I
++M29_6J&Z$R.&H/.2,M8LDC$UZC*6*@F7SBW:"GQ3@-&AS/D'%[PAX*Z.!&Q`!
++MK?M_?V/CA,ZX91WMR-A0992O)T0BR^HF9=VI<Z;3/3/B,,.>A-3&20"GDL&"
++M2O*AJJ$K`'3#X"@L61'"0N\_-&J])J,%%(*O_R0A*R3X>_<_]4=+TNCF/6?<
++M]IGY%UQ&M/IX7^;)C'TSL++)C1,MUVW257A0K(-$P.$V@S/RDA=MA.W#)`^<
++MI.1!C(@-*E;AB)^IQOD_^YWQ:2]K^31Z+%2J$@W$OT7PD.02BH.>E@'022(E
++M3@Y$+>HD)''<X_^[Q9E<G8)L?9]R_X3L2TLN(::ZWJ)!F6F4AID@*_Z3Z?>I
++MK!<&,1@9T",6@FYM(V?[Q8KX6%]RJ`*8F:0\/6K-)X%%08$0"I?TTOH7J&:2
++MP"RV[FF`@B!MYU]ZA5,A0DG2_Q)37"OW#@@D%P1P53,Y9BTRN'V=+Z4!-QP>
++M0Y0QJ(A,6"07X?-ZWOBHFM&@L1]UFNEG^IKIM+R/9>.LI"N99-[D[:+A+S@]
++M9SU/\?K]_\Q%2,`!A(D20!4>@D8$G;HBBL(!"(2`J'98-5R/N2MRE[9.N+,!
++MO"/VT9Y%Q@(TM(/8\%_VL"*'2P^*D+N2<O=WB`H+SS-YB;;<UE-#-N:Y9@?!
++M^#+W*IA0`QB-#D#`YB!!01448@B,1%$2",51!%BP%4BP5!&"1B(HJ"@2)$C&
++M,D#TNA0$!`_!_//C_\:,LO33YN;-]UX[=NL$NWM-W#2&/RRVQM#F%?ZYS-(C
++M!:"*BO%^GER_)Y^/U\1'3UP<.4C&$>,C?4!XXM?3VL;&:5WJ^+#L>F7!H_,N
++MIUM`#L5Y[#M_O]A6"9J&&AI_78:(A$4RYACP^Q[,#B9?EORFBL,[/%'C)]'[
++M.CACW"3O$#=`(=[_-\UU>&,/=25L+C^"'BK/E0!N1^$_"JB+_JPA`*]8CO(:
++M`,.^+BG;`ZF7BV09<[-_][:8^4KLHF.(1`0&LTSWGYJ3I.3K!0![LX-.34%X
++MKYZ.+[/.9+T`A+UD=Y@88X+<D[;(9[$K8+5I?Z$&^</H*6JWR3"CB_,77/+_
++MX^DG*!-6>WRYRQ#Z.0GAL_X^DU8%6CXLM.6/V<%ZXA\X\>Z?;"LR((5^)BH[
++M9YVM6QCU[L+>4:^0@[(+A[*2R473>#_#80G05=[MO!0B83]S4Y#69SL\FU;,
++MM[%]++><ZV/:Y5)WN%_&CUF;?Z:</"R<V\VOFXR?C$\?+,?MAET205[+6I!J
++MRA5AYEG26<>'XGB[M<9CU9H/*ZY^J8LEQ/Y>=4H#=<EIJ8&40/&J$?"Z818<
++MIQ6H\)F_";T.[2M_F=)VW!@'ND!QI,[BE=GR^B_,X7I0+3JJ4]A6Q-]XV1_5
++MU'M[]=[#.PYEXCJ&:P)_3RZ#"([W['6=LW(OD+4"CHU(W$?2=PS]B!N"A`>D
++M076@OV1*HU!09+VY&I##%336?/5%)M>9>5%%"0;X0^D(!5LP%ZR;J#4AL2A(
++M<S2DL$I55=_1LS*$$M0$ST<MVA),QC^IJ^!V\86P1":U`)2(R._\EYKN--VK
++MKDVDP]$@@CE/F](,R"?T>VL=+2L3>4N`V%1T%AG`R@("$$@E`4)0]>@`6#Y_
++M!?KZ5D(#B^G8"OV,(-.'8LE-"R&W?C;5W&U,*%TS9#DQGG02?L<W(#+,*L5`
++M3W\)2.M&$X]T'R#@C7)1N>I;-V'6_'VD:/[B\[^!BK._+R4O,AIRU>SJ67X@
++M9BGP5'Z*.")D_)5(1^2U>5IE7MC^?6;KS0@W,1]%[_1Q>7T[6YJ6XJQ.^W;Y
++M/EBI?KRW$W[U(3Z"^#'K&C9:437[_,^`K\[(S?[&%\T)U''KMU:$5SAVI&?1
++MO)WDB92)(QL1_:14'+!3-4<$"%!A'EL<M,6PH"93>*M:SVOPL/C22OB0/^XF
++MK<69BJ[(VD8/"J7=>==O$-;WW//)P10\;N+6!'EH$U.A3!PVG>^?[V.QP)[E
++MM#M7!J:JJ5FI.V-&A9([(@[VAQ'!<$'(1S;SN=_.6>^5#L1AQ&_D'TL&-9`/
++M68$)7J_190&=D@#5'\F^+AINR/5:*)DDUZ[PNR9<+9KN3=Z?U+GOLD3<33S=
++MITE&9$Q@::(*8DUSZ<4:QI+(U)BWK2;WBIFENWDW[`N'(FMFG:Z>V\N0-.!C
++M]U#!U]T8<9HC9P8<^B_][RM5^;"??IE6G\((HDSM:T1.%M7\:[:DU2F*_DM4
++MYS/(B9,$-F_^*?"5:RW^<#:*&>C'":.!%4R6T1D?:_G=$H[JG;^K-&;DAU5X
++M&\$R"F*J1F;BV>]?N_E7K/--@V7(QI0@&I.NR=19-&!(=T.&_,X7T=/'`?1*
++M%W!R_DXWII`J:7?>BE$CIAWG*'YBZ$Q'_%_<27$JIQGYCU"!+X5C(PDS@W[\
++M7\*E`_CB_W[+#`2HNE+Z5(.<CG9DS>40BX]1`,]W]9L2=-5S\JMIA,-W<&@;
++M^[8^O76V>0CBYD0'SW%)\GD[WPO%X,)C%,*J;0T`C:JCB'+92>O:H';H,-[R
++M=DRZ#I]-'NVA`SO3(FDOZW8P4EL?@9A=5^0Y7FCDLWBFFUTVRG&%.[D2V^=`
++M5#K.+)QE0NXQY^M7*(C1-,N?>U93STMV@CGTY>&R$>RPK3'2R2*?5I5(24S/
++M3K0$S`PJ(?/0Q9_SG%)RTTU3HP8:\7'A72DJ57`^O/MG`YY><>SSD?WAH=M:
++M"RO5HS+T!`\:(`9QAYB=#3-8"F2'/%UT1%Q3?D&F$[TQ2-M#%>'(OH`!2E./
++M)389QV:(LHH6GG+(3N1L[?82L*K4K0&9XD2X6@M+0N,)U%K,T-":?/Y]\MK5
++MK_Z:_I>'2UZ7+0:AKH\.K%VYPA6E!DHVG,PO?KU25M)+DT,P/AGJ<1$85R9%
++MPF!G=#T]<HR$?#[2E@+NC"6RWM$3#I[5-<Z/6[2%1ZFE73CH4URF96")%C.<
++MUS4Y90$A."A4S:-LK4[5U/+UM):-H<SSX#P(*-.@5&,JF@[R4F9.)J@T%S6&
++MY-7"0,'GK!AS[U94MKW798VT*`7T_MZ=JT=23U]YB:[5ZZC$)W<.AIMBB3:&
++M_8,[9C"SU:MY%I#G1P*,.%"7H-.MJ!L1<,-93X25*-A70/1;AU7,W4?.63TX
++M]6(=)M]%&!<M@U?E(SK#DN0I)JZEJT>U45@%VRRB)A-TW^ZQ(Q_ZZED+F:K/
++M%[7I:0$4UD$#WL$0]Y40\#A.AW7;\'O>+#S^/JY/1OZ/3K>4XW>>[AD]#5PU
++M:AAQU[/W.(AMMJ>4Q`29&#B9U_*;%>_:VI]+:'MP6ICV=R&`\X8;_^^!.GMS
++M[CNN,)<#02E3:J,LVK(;7-QHKD@J'][T+:HKY^3V'XE@FQ3YWDML=KUMVS9T
++M--UE*6'ES*\2<L#VF)@Z.*G"/L#%@/+XH^NZ]:G%Y#6=6-,6K*1L8T^J:KMN
++MP4V*$YQXT8=J[5=H0%G&1`:`(&`!2N8*%Q%,H=_@0=\O(9E#/)`D(2#`DC(Q
++M3<]9[G9P^?PUZN7?L<7/&!%`1`@!(NVVQ>LIZ+T;BH^&&6:[X%`OG)G&&W,6
++M)H$T1"14@OL:/PY6'YT^RE4`/70$D`%\6*J_[>]LELD`/3H$F<BGYO7W#-P#
++M)(+"(18=3Z.PLD1!A(L6?39=WB8-50HDFLR"P*C^G[ZY9`1/(3_#Q*Q&$F]*
++M@A`\#X%A8B2?ZU1)$9%)(Q%@"@LDG-D`8'(&,"(8(YS&#0!3:QMRG/,TU?%R
++MG7'NZ/Y>C6R':]3T>]R:N[G/F>L^-Z8W(@05",604",9-Y"A3TN;K^7U_D?5
++M]+)>,!C#_7R<;\D\CX1PL]S$<S^5PCQ;Y]N7OG-3"G1I4&VM7_;EN(G/K_I[
++MN:N:C<>^X[C@`P,/0"-31'T61;6DR@][DZ>GRX>I6>`E\3;J]#&J;J-QZDEZ
++MN`Z"S<>Q9D;G8<GSMW1G=>V4DQ'4T:78NL=:(*1TE&S_R-!0N)EE'3[0&B*!
++MXQ*NL=1!1^MME#CP3"#Z\>EWS"6?=]^))<L/*'D&0)_+'NT37FKB6HHED8[\
++MP@8?\?J3Q]N@LL\X@V,1(0:0)L21V28:XQN,AB[Z8TJAUKCT1M]NHG:;H(B@
++MS^R5=M$+[^_8K"^&BP,&JT$M,/?@J\LZP'!<-A.;DV<5D0!J$((TAJ[I<=8O
++M<WXT`V#3<Y.[4_ZJ&0Q+;CH%#^?(=#@2S:]3(($2XI=O_SZY(DP\(RP(.)68
++MXW^IE\%0)2B[NW^6>"@K:@'@@WDG:-N)I=7TH:&]V:HU#$8H@2H7&5C!B8/<
++M>+*R`ZN=[,`1\>^V(NU#+I]][;J]J$$)=@@8!C&8F38Z2ZYW@!C;&*7UJH?S
++MQ*8,+&MJ!D'$H2WJ"=:##R1L!V.SV:FBB#KMJZ-A8U=P'F)%DBD+Y(]`W<76
++M0"B`P'7/I#2C1W`Q//G]JRCF4N!U6V.,:6B(^'F_PM]?37_I^G\>W:F,#`!L
++M#$,?SLN]D@92+./&PT_IX_D\#C]]P.?H=A[GX8-3>EHG#-5Y:9#51"%*"@8,
++MR,#P4(,M6C4*U0!009;_,O-S^;=Q%1U4]/RN)VFLJGPB`SJ%?B]A6)UT%0>\
++M7?CM)8U>&P!P_@=A7"`%&/ZL=2/B:J/Z>/Q_QN./XO]HL>FR%6\R]CX<7IV1
++MM0K6BSY&M4Q1/\^R5ZB<#`'BZ1KJHV!@LE\&)<,`$827-VNZ1PXSI0/%T;N2
++M:'A7:2NQC\#-SZFY*DG.9SA'QL/C0XYFJ`..@)-DDV29VD5#RDE>]G8Q^3VW
++ML)IY;;C3C--_D9B/%?0-[\A)B^]1S.A,'R5))?(UTRN%AZ[R=7^#1>8QD6;?
++M\\>9'WS7+Q2MMQB$4G'&LKKE_5:P6VHX=!IXC/A?V!&;E12BA`S"D%5]>PD&
++MLS[;Q-_NX\>E1,6!J!`.E>BKU-7><]ML_>YUY`*]=J1"%3^'=ZG#M`_=FP\5
++M_1@U\L5HC!6/M^AK=6RKL$<4WMRZ#=/)WD-JE[^K[$5:2F,WF$W:PM9.*M4Y
++M,1F3/&3Z4AKF[0P[+OYJE&NVX5N("$H-U)M)Q]U1O+/^/[+5!F0AOSIW)JO1
++M-W"XB@\FPFF^^+'I5<9E=\R":I,J$XM:0Y$V!"D*0/[J>C4]94.6F>7>N3E^
++MZS4N7`.VR=BDAPI]W\W2SM;LA4L[C%P*HES%0]GNJ_4,L#<[Z^]\A0P/G_9<
++M-GJDQ,;U!M7+G$4.Q774HG@<3ZR^,@.(C5#=9R1V,1BJ>G;B^X1G8:0*J9PI
++M0O;M#TOG'I,BH@=IM=C3M.?3S+JKI7#,9^+T0K`E=MSFF.*<'F(&]5Y[G99G
++M$Q0MHQB/4_,W&S73.T(4?>X?VDZ)REP[?IQJS%,A"CV=$(_EC6+=\=C[AZ^L
++MT6_?WU:<<"*P,*F!BTVR-7-UZ8R*<(0Z,?*JV<():T68@T1[:_##<>AN:?DT
++MFK>X6UN;;41]M,=73:_5`8T)T.!>[ADD@M$)!&9DX4_BU5+'$2![3L[L]J^Z
++MNB>(E(74J3W"%&E0J0Z!0A1"@K/[XD5C,*BGM#&WV3BL+08N0>"'P6\JH&%[
++M_'ONYQUCK5P8Z@\6BSVU0/@G(./1*RH.1^?4F$S2GX":4R%3D!X_,0:@()!,
++MX.-/LI6"D^5H9QOY(BMN;Y[FTCO5U^=_V]-005[^R6@N"H]!I"@*J2I9445_
++M?LM+4&A$:4*A`@3/(K`5895(TB768N-]$Y",C9W-PTE8>7<6FSV_800?X^2Q
++ML6'"\!JHI4"AC#]EJ"+343WC0<ZAD@1A"H"(J`@@>"P%!X6Z=Z+>/#;E\:3H
++M*J9Z)ZHG?FL$!@@([X%`13X]*>3\4W=4+!:?80*1;@X_:7`V2$",%O%+Y;NW
++MSK?IH.1]7FZJ%F6T;`NP\"[HC>M:RB9@9<!0@5"8`P*!0@1$`LLUJIW\LM)S
++MF[S%QOO]V&GJZZ7=Y^!.7U#[F<<`H4I]\$##HI(@BL0*84T)]KZODY'.!>CM
++MN5V'C^C]SZ+:[B[]+=^EM]A+]F_!\*>SA;M^^UT*,[^Z802/D8,&I$20.<B(
++MCG.#[O,*QA>*F'Q/!Z_P-@_2/8^OT^"0@))K'@?MU`W<04B($7/6DU3`./KY
++M:1.?^/Y_JBD3"%"(29.P4)IHI_DA+0R?6Z%LR#'D>>-RY]_<[&]";4S'N9LZ
++M"Y_Z2\H5#%Z.7J?>2_*H\+?3*3@?E2><BI;"X*(;,/-+C,[=@5'(68`+PB!`
++M#C_4Q&I:S[CCH7Y:*R(MYAZ3$#(('E4F32%9#TE.LCN?!L.UW0)R1?-163@K
++MO!L)_7#I?&D`X'CGK&)`F`0($&-=4.70?Q[8?'Y'=?L7-;)4HWWPM+-;Q<?\
++MPHWN=Q_5QAJX)>)5$*M1;0//-@K!L7>5:>)F4[WO4.>,LM,94O5/E$SMAZ>H
++M\![?H>XT]I<WJ1C!D"Q\E)CXE^',%,QY\#?+K(L,A+-J!*'@`E7""M'JSH[0
++MUB@AHPP#0@JTHUF+"76.<IL,-PG^56DB=_X26G4W"#V!U`"%2_G9](:V%<B%
++M8D2#0B*R5^%$):,5*PP%)5UR0$23)=/4U*ZKG[YHVWO^<L\[K9S52*(GH-%8
++M.AT9AJE>?,L*YE4(_XY&?7:=O,PS0::.'M8IM8F#)34%%76)^HW?:5.<Q"C'
++M2:=*$+RR0P"&_NARU_58F=B!'.CV6U<3$SB/0]<\S`,Q`RYR@UGN_@3[D2$A
++M2@\5)7=&<#+6DAP&6G1<Y0?K)I'^0?*I;KT-36H=7@XN\CH+O%4M8SN]0Y71
++M5+6*G'.H$8AY0:/,=+=![_R=V&ZU[O#-+:+#/%EZM=YPV];`,V`I2IW'O-@:
++MTR\CFZ#1#1MY4,,!/NLBSMLDH*+&FJ^>S=Y6&,4AE,AE@%G2V47(DXEPJT)0
++M..PL_..*EQ<M%G=D73[G&VS+Y]`Y,;1*H49.QW2.+@L=M`K2F;+-E>-^+I,4
++M56.:ST1Q#2EAT>"]%8+(?\>5O`*'!.B37T7>L6.7PW*[?5@`6%UD\A!('2L+
++M.$R'/6!C>GKC#<5U,GN3M%F9WZDL`#J<E\*\/W>-4OYO1/K#W'8/.+L-B!CG
++MX>C5+"2X.U^#\@\X%#M@H7^B?UMO@_`IC<6<>OX?O"ZMQ?_D-P]Z(A[$]Z_%
++M+`/EE#J)UQ1L@*%@C[$1"K]>"A+B&;O@8'Q?I;)U?/;1OP=SD7<Z1,"Q'K2J
++M&8*.,0G/J6["QSZC4H^$KDKMLP$UIEA7KG..+UK'S4LB]:_+Y2>X(0+@/D`C
++M/D>5DIGL#VVM`4V40(D($48(AZH0`3N`(J^_Z7C^-$K2C]+3I-44+?CE2BE:
++M#.]`(@$(E,*(A?*OS&D'J%0$X>>2#.C>W]UAB?==P[^@X@.USAH$4HVQ5N0`
++MZODUS#,W(T.=7,.=4Z"1PJ7D&>!D_"SMO9HN>!IEBHY@LWU&4`A2C*%!*P@F
++M8:NPEZZ1OJ+8!2PM4`I5D,(BM2`%DHF4@!@-D)G$G;9"2$@VMR@%5`*C5O"T
++M4`BYZ*`8%I9>WMXV(`8>GP<;"C@H!&EW$,0`H)-61KVF4`"BE8`&6*P(T5MY
++M[,,;ND@P0:%;$:!6,4@"?R*`@&(I`?/V.OR$P*:HNV,TP%#5A;Z`2JI_A9J'
++M][V!`!.$/:?0EGVF8TSR<_YI`4.0%0RB(=X"A!$/`!0OJ`)50["B$$0M!0I0
++M2"H11'R04*J-04+S-FYJBAX210"0]YV;<VQ?3JG\W</I?IJ?0;"&6#OQLOO:
++M>I/?,69?B1'DF7D;]MP`1`).+&>KUBK4B?4=S:MC<=XWW$U4KM[G[J2EVCN;
++M/@/-;<73F[?O[4P!0W`4.`%#R=[`2!W.O9K37>X]!V]56Z^)X;I9Q1+C!41$
++MA)"20]?3*9`AEP?L?*3)N`Q3!3D0`LC0"E*)%1I%>]!0VP4.J"ALW`8GBTD@
++M#L^)$P#&[CW_!W%E/`IFIAB>S2DGPA)&9)!F9F`A"*L=/@R,)LXZQI19P9&2
++M15")D#(0,00(D`:\P,X<1RJ9G3.Q+U&^0G`B'FW@#<8A8&_T9K"I@@00;!0V
++MFV+(\9;GZW-.K6N_:8*<.7D+*!;[0KZ.DM+/;Q1#DO]1P=U<X&3$<1$.0%"*
++MH<`*'E@2@$0$5RP`1`-WN-,0AUS2828S:@01!X.]G)S7NM%=TJNDV/?;4LNK
++M9==J]QN<W=-HVD=HVIY8(+3K@H5#U'4Q[`N.(E/ZR\FGLB#GL'$&0`SMZ<IM
++M0''1*9&)%*8X2[=1)6&V:])@<X\`/.E:&%G2(^"PVUD9M`.6ZEG[0T*!?XE7
++M*)NJBN5KJ^!WS"V*^K3[TX(8P@Q9C?XV^B!<F-!/`)_$P0<6L!@6\&;4)*0:
++M&Y]1?6>0K$SDMIB"0,=)TI=B1D1`&1@9+]015`AUX.G%YCZTQSMP&.NF[Q2D
++MLFF^%S/`X*6,"GT/\-3\<Q7JRJ4003DG:>I.+EJ[:-C*DVU%JVK?RT55HA5M
++M=IL\W`ZX8X'%R6G6UJ($"HG#NPH6)[9)5#I>#661&#'.,(R#0BA?#,(=4P<9
++MC849O*SG1$]L9,1UH*!1HCV=J7?)NP'\_L2T\!H*$(67:P!AE18K\Z$!Z8K#
++M3<BJ0S<9XFVSY4)'@Q'==>**H"OOKTP&`WF3K!\@2',QTC=T"G1R-J+][XLV
++M(+8U@=`1MFP\,V/E5"&F8=JAMA>ST4A8R]DFB-V.8J;>MYL^"G(IU)_!1T1S
++M1ZKUQC]A"6W+L==(4)^N[[/IW.W'V>OI3ZQ3I)5#=,;"[4`WYH:H"EIO#QP]
++MSLR@!H'@:TL;M]IPBL<^H8]HE8\TV##;I=QSPY_<XST^OOP\'_QP8U>]QF;P
++MM/>O"3T)[*80=VMJ@'7HE+(S=H(%<+PY^)\@S<S(YO;%WJ,P^Q(GUFG48GD\
++MSS=G`-LA=((YY8/GUFD`N^9-KZ<U.6L5,N0),)!"")LGCS71M,"L:S=[>]_<
++M;HPZ-X4BF#W(*'(0`K;8HF.\+K,J(@7U(\$0%_L?>;GX@ZBQQ8+SQM-(KZ,T
++M9C:"/-1$LP6-!UB!H'J`"Z[BU1&&*B])JICY7IM$"$[=1A]Z(`N00(;F^!CC
++M5^P%&$;?H8DTT347F=$+184JB<Q,?@UJPRZEVLNV,M;F81Y6W*E@8F-@:UW+
++MUCE\O;C^9QGZN\AOP.GI?,(3UYO5//\C5J\WO?ZOCGWOHGAO*2,@R&)`"9BU
++M["+8KH`$+7&@&Z4>Y0.(9!0,+$N[M:9UZ'XN<E/AUZW;U/DPCMHB0"*]#D#^
++M_VR]PLKFTC<0TYX!26Z*67#0#.`5B05(;M=<(K='`Y!WC;<K`NI[;MT+6A3*
++MD`9\`(NC+0,%F#@A`TAR1`BB3V>^`PG`&KU$<SX&CQE>+X:VQP^/<A5[6J*S
++M!/4M6\;"HA!RDBH@?3RBPKBIEH32=%7I;"K<Z0EZ_,I6[07?[4-:1=_'4[-S
++MP9F-I"D)V=7>6EA!K$],NI#&V[..-H-1%"/>\UILE?@CGDZ_->"R,B!V.L@$
++M\&)YAC4=[_/OLTGHN.\HM45P\AYL%3UTXX8UK89FA0IA!,I6./VBK\XR="PY
++MX$>0E!].'NBXP53HL[#=M+887P^KJ$O*\J%%R3%HS53F3>PW"W)RE^0XP`&B
++MX5S4FXKO7KFF=!'B*40SE(LCGE4:[%<'28D=N(EZTAK?KT,J8/+0;J:&KD4Q
++MB[OTEDH1OBO+GDKUP8>/$/I/K&79VH!DW(/A#%O11Q,@?43>'>UDD\ER#*FT
++M')J(=2J>5.VW66K+2X(DT)IN(PK1W!R2F&OY&3M18,?"*L,:G@I^8P.Q>&WF
++M#.EZ:?20E*9N80_^%7)T<D'&5M0J$6&RB+T(USCCMKU739O\/1518<*YIG-0
++M#65V@+'Y%U6DOF2-F>'JNIOAM2U8J7U%SQ!5SP<%>O\CD:[T#9<P6C))@P9F
++MXA#D)&#<BYHDU%EY4Z)&<30'1LTC]25P84V4D'%1LVS6@>,"[%5=`GHARQIT
++M%\QD4*(FQ4)1^"94)MT,<05.QG++X<\&]/K$6S/WCS493!P1"*-:=F<4IPIN
++M/+HA_?]9K12Z4?9#B^ZG``&8)YPC&'J`:.$+6*I=A&GX74>)[[HP]&G1Q'WD
++M&I$34#4[D:E&0X>6!PZ:3'B0^W>(,D=*^/92`7Q>Q9-VAPUEQY3OTL_HZO#;
++M>#LA+:6P2J`"-2V,RA8$1Z7F[]*K)3,'CQHY$78K\B']@`8P%]=;,/U'E7#N
++M*&)X?MY1EQ%FK,8H:9K><W!,3A+XJ7WC>;;!S?'N^@'EQ,87%WG+>)!%3C>!
++MPG)6ZNZG!P'@4%04Y;)`BM,$\7AB]3RL4:\XW7W00(".LJFSTKGT*M2TN^L7
++M%@0`B`(A<`$"(1N!QX5FD<SH=5450P&>\?@KO;H<;O.81WCXCX0Q*/U9@/0C
++M%(`V()O@A7*8\:4@&#F)EC0I05R7\PBCBCE#2XF,#"KCFN@W<DX")&7&2Q%U
++M#O13N<&2B9&HDMZKMM0,]DIS60L1JBKZ01&R=S*!1\9-8U7.?SM9E<+5'C]>
++M>X>>N2Q1:\ZY(2F0,Q?:''2/&A[N9<9W,W"C.BFA"X6`#S/>PH?FQ$NZU?L5
++M:%KJY31\`:46RYB8<C4G8&[Y>I12>4+@=KUF'V84*AZ9)<=+3`TMQSW!&4&1
++MOVK3F)P\F'+M>@6I@UR)FR&V&]@54]WN43U=;>HIBQ14'9V"IBLL3##*Q],)
++M]QWNQWGS@"VU^,'ZK(O"&XX73+[$P:JK;=PJN[)<HRDVO8<U1[*Q-UY0SL%'
++M/WY"1A*,7:^X[^'K4RX?([G;.-QYYN`'K@D#KM8RHW,O:;&,_:T"^M`+*E*E
++M+79L^KAV(>=#R\,!3RVIIE4%#$M#M:[T;+*^L[L\_E->?;7GBTF.WV'SA^,C
++MI_(U5I*^F0K_A\E2M,7C("1S"";,76BQS-J0\@"(!@A7K8LPYTN8I$"81B%1
++M`2=VC#?M08HPA"!^5`AU)@H2LH%WI7IIQW$(44H5I@A&_(*0&2]9BH$/S424
++MA[ID(4F0PG+%CL8%'F96&M\T#-$984"5((`<NZN89TN`%QI6,JR;F?(Y#K];
++MTW,[F5"RU555SJEF<,8,<G[#W?6<[YKPOF/&LPZ32F8Z1HT>GI9O\^J`G)"3
++MF$F&UPO%T7I"-_4@?=<7448N.,D(T:\SOC/B0Q[.&;'-BYP3#<._R"(7]"@2
++MB;[:-2ACE"YUZ)"\@RP@*&P7C0%#GO?PG1<VFPRE-.NY$NW7,W!;O\J3[+KI
++M4Z-E)T7A["ERR(`0@6'W$QV])]<:,6/5R*`)ZX%"Y`3KF9>Z($QPJPJX;0J%
++MM77KK\]``=R#J10T14"4D%<\6L+ME\?UG3^>^5U.OD!0]L0`3B!0@@KR<9-P
++MXQ-;L=B_?>*S;KP@@@<.\Z#.-M"Q%IPM$S$,EA?"(H)'AE%@E>(`38$0KENH
++M]!A=)P]Y_=LLSAE$R%+").Z_8;-;K9`DT\WCWG0Y"P]#];[*TR"=W$V,V91A
++M71,P*$:G9H`TMG,HETJ\/!38KNF;OK\P*&5H!OJJO>I!4(\(*&-IF"F@%#?:
++MYPX,&FHI(<=[S*;`*%B<R!K\*VFQX6WU[K78U-Z*&LE9"8[6N1=@I0I:6BU*
++MDZZ;!:UO34V.1L-QA5R@8UP=L.`*9/85?J_JH!D`1'SD(B!#-P*C!$NG>V3+
++M@P&<#C!ZMB!2%%`=4,*!O.H4S#`@H%NK\B\5#*>?XGQMCF8W'\*G4SGM?J3$
++M.[`K2U%`44!BQ&16V,KX'0*3KCCC(@8G90&TX@*';F\]9.BEPZ+322R/-M10
++MR5`$IZ@@N9>,I984,W=;)`QC)JX*%<D70I#0,L/'L#HP'.DM!0M!0L=C5=''
++M14W+0!*UU''>>Y?0&'-AM15=<-%!(&;ZK>!O.*&]IL/,LNP44\D;(=EVWGN.
++M<:*;Y.R9TN"O:[A73N%1/,)PN)6#(&+%6B&Y"2A!;:[G-0<O!LKJ]=W&^;>(
++M^-\(=F/B/>'L(+-)POFTHV%?R5\SNC[ABBN!J7%-YELS%@L5(H5@58P5D`B`
++MQ/D!-HQ7,::HBH&,@RH3&"0PAK<0`BHRSV)WVT<&3@">YM+7(7/6<0U33JH%
++MFYS:'!VWP`!*]J2!E)"0B0B*((HQ$11B/WIB!1L2$UPD9"-3(1C`4W^Z@.T2
++M$RV=VM%5165C3(]7JSZ`N=#Z<"=NM9G/\83I['_K/4_HWCFKHWV:J:Y?Y'7A
++M?DI$1`BM`$0%(``A]#ENPDS3Z^)MN7]3\W6%<T-&>.*Z'<&R.8+:@@0!@(0%
++M"09`0($!0@H)Q;WT=+2$%0GCY,%<C811E_?+U:6R.#+0NHZS]YRS=_SY1%7^
++M5G?HC\/?M15/RPB@`/!S,N^=WR5*':Y8?')V/`\/I/*RLVF#JS#JB:"[02*`
++M(@,L`B`8VC"`T1V#0(X948JAZ&79='7Y?9/I#DH9\FJ9FA)"2LKEYN(?4URS
++MK.S,^\-'K^>V.FV#8+C555,5:JE1I*&A64J4TRPD#?A"`A7A?E=V;H^5^.-Z
++M6;9:`B>RV7/ZWMF<\GFAL7@"0.W=<"A9CT-E%!,43[^,@)S]'FB,H9"!IZQH
++MH1S!EM)#>P@B%+J@H=P:#%`(H!&-^E\:4(U/%V"IIP!0VP4,!8N3#&7E(4*%
++M)0E+QR`H8:"X`T;-Y?41POCSN=O=DYGW<]63['4"AD9$])!#N0$%Y%49R1H]
++M6*"?%YJ!HJ9E39'VPG`9;O/EH#D8L95,.A8F&DHX/>60794`1,M0S,&B"%^>
++M[P>L"]1T,P1:P($'TD0"Y41OAU@4,@*&P>W@],!U&R'%CMFQ:HY5&CU!-N[:
++M:`]:H6HH)F;`H[WL[.Z[\^9ZZ[8.CHFX(ZCAF4T3E@H1&D:F)3>UXW%).3O]
++MRT3:,VU>!F(A42\]S]WA?`OT/W'0ZPB&3&:)2,V*VM25/IZA($,I-Z0HI"08
++M-.R5&JC:35G(%UE`@`EGDP"BC`(HW^#4+@4(!-L%"/8+F@V"(0E!$*(9H2M"
++MHP<I@(A3.EH*%/A10BIZG)RGTY"X'GC!0"*`08_BV;4):=,W*'1$>D"AN&["
++MHYN6'+C&PP%&S;A:II;HDMNP,&X`2"C<T`$\BWO'G`H<X1#048]X,!(!5';5
++M9!`7Q65`NR`#)@+Q?`%PB!9N'JL.24`"=TBC8<^264I[CX?H76/"[!!S/&:.
++M%X#M7\\`373'H-'>@&373*.8%#/6+@=`;!$.`>9,UQMY*T*=9H'VFCSJY7!1
++MH?-G*<O,SZM)H[S5ACLRWLNC#>%!;>7G+:^;0H7;MI8I6M-//XE"IS@R@H7E
++MY\2C1W-"$VZCS`4,FYEC"$C)Q.UJUX'<V"C-8*&,!0P.5E--UX7@*&H.B;%0
++ML+&6EQKHA_$SSME2NEX/@\11XBG.X,`4--8G3ED+.WP7^'FY4Y7)CEWI**H9
++M44)PT)$0/,^UQZ'N/X]?+\725]GGS$W`4(.Y4IXFLYV[SPZ/.7ID;*W5,DZ7
++M6NO,9"[`%LY37W7WV2T8:.]H"AB:H&G4F3,'3ADO=?%))6R;'4M$0U]M1N4<
++M,V)O"@MH*''QS7D)N`H?*TZ#32Y1#:TPJ%X*%502"V(;4JY>2_3P_3?C7Y81
++MP,^I,KDUEX*'2RG3Z1TR=K[S57UI`^G-6<@AIA:KW**=FLHRLF,>RE9I:;CV
++M4C_OU2_?Z=CQ.71PKA'F+1J.K@V'#!L0F\Q=I##\/`0="-8S0ZE_`R/TQ<ZV
++M&3,_K3)<4$0*N!0XCG>F'CHT4`W8<[TPTZU!0+[.[FW,VK1354`PU6:N@I$Y
++M1)%S)K0='IB5-T]&)5RK!@S/9"_3E$4!NNR>F!0@9T1/(CV^`DDA/[34!0RQ
++M%#(P6<\X#56L2%-:EHOT6QP7!X.0;!#X&/ASC>:8LLPWEBS*LKKB9-)5-!59
++M;6UU`W:U?"X$VMI5J-"JJM33NIPX&OL!*OGM;9XNSKN6C=V;OA4M:TIL8[8*
++M%^J)980DA-L3E:P4-XO,2W1]3!ORDA(8FT"AA0<T0`B0@@$AD<IIX]K7)))?
++M<.[GHCS^J;>@TH(;+`IJ,.ZW<J;D-%3:3/3Q\*J;-,MSQHN:?A,B!F[43+*A
++M3T`NL]D$+W",F=1;?[324]FE`>.(-U!^J\((H=5D)E'S]CYGC\FGS[,.=D#,
++M(@6/J18(LK%TQ`B`(48]'1WW<%0RDAXIVF(Y#P3)VT/;XM<X*$(=^2K1'24&
++M55^C@6F/V]WOI]OR"@NK\CN)K%SO$([H`B`/5XM7"(&62-<CT\*JF+[2+_WG
++MKXK0J9>?VC8[E<)6]2F'B^O^_4N,>`RGOW`@G[W'RU`?#%[PDA$DU(]^8A?^
++MDQ/MS"1D8>ER,>3H3/'H7"ZZZZZ8`23.A,Z?;PB*/NR+C\>IA[S;IO[X\L(U
++M*8+6$!40?^>X!1K^-^)7O8>D0_%NKYCSH<TR'OLV.OQ`4@X0_2\83>ZS]:)(
++M#/7AQ%$8&:1AS>,M=[MMCGM6%&D&#F`2`,8!0\5[J>,"A_;L#]"=R+AE/7]C
++M8_=MCV(DO(2>>\_GL\JRX/G?045JAA`"?.G7@>0?@4#[;Q3V6/>^I+CR_SZ/
++M,QH'S_0_0J>U@>)/_$/5:-1JY7&7'UTX3B"P`2@J&]3PK1Y37045.-[&RU@C
++MRZE!QRM1S7R%'CX/#[_R-&9Z3/H$A9[*ITAY+H87N/MQ^XRSN=4GN]8J"*9T
++M4R?\IT_Z'OD_W1@',I\5%O.?>V!^_>KA%_VPS55;10&&]E*IK?KLI,/7_/>L
++M^UO:R&]I_AK"3J<UAO"':52CZ0SHW&=@[_]DDT5E69\1(RM#Y('517P>+\;_
++M27^:>[[K:'0_IRO#AY]*0D\W_]V,W?7WO7[;][\4N]4J;74]OKR<YX+,3HS5
++M-^>#I("ZF)[\D.+7[JW<1M_S+T\R07]^.GHN2N_V9W^UAH/?M6L(]G=;K8`^
++MNGF*OQV7S(P>`QF$K9K.8#_/:_`86%)Q#=W]L'PKE*TZ/Q/>W0X:[]Z!=<AP
++M[M,3V:G65?K3L9DD?V^Q*VB.OE[QI9PM'#=^<;.7QLQSN>MVAGZ3XE<T)#Y?
++MF*H8QF?OJ!!W!F41S*"'QE"1;W2$G@CFMLBQZBT?S1KV.)RT(3((Y1TN%]N\
++M[?\DP3J"1[<&#L#@)<<.!W^8K$$/A-T3CHK\\@8_A2\!>^R4@7Z<;!&Y2#\_
++MZ)!2!?*E\$B%&8XI)1DC5[YX0Q.D!U5!X>T_#9.<7W8\W8*\2(#[7OKPL/%P
++MMCZ'U_NJ)T\='S>((D_7A^ELI=U(3,[P-9[+TT'PWDE'"$\!X=_\_).ROW^?
++MC=.S-W,8.>T2CBVG&3T>S'H/R<V,(]17Y\?Z9949J%A>==M"JX)?-VOP7GM-
++M?2\':;;5N;OB<3>9^20W4&3S:/LW:AA<AG0Q/QE^%$C9;^YY5[*/TX4]:U)+
++MR.=ENOC<%J+`\(2[L7FL9$7U_UQ["R"69C;JW556R,+O.,RK&&>RVH-G6TXL
++MDV\!)L(@OU(`.H@8<80FQRK)$PE(T\YV=T-QZICXH'U:!W.%:XYY4M:_.D`5
++M6YB":A=D94"H`(#`W"$#%A,')0]-U:>&S":X@W%\BOH3^V+%,$"HQKE""HB-
++M0A!C@V((WR@$O#G3>I#[/G[2P@U&5UR47BO1?WMZ5$;Y`0%V0?IONU7!O;OQ
++M$->N4W#HL,OL_MU_I-KT.>\Z;3O>4:*LX#Q,&CM7">7Z$\6]4ZMY7I=NTYM%
++MZ)IY48P2K*WEJ^2V-(B`/`IKS(?6MQ2E'=>U[*5&>8($I,!YRH*,FI%59T3G
++MCT@9#11"[,IUXXTZJ=+@L^BO,#!,@8`B,,'D:[,(IRKJN!N(PCUN7ETFMNQ>
++MT.M,<5L4#9FB*%?$W!57FM?/^ZBA@2T-7E"Z%F;\[:8XR0<6)_+$E*H!FF8.
++M-XG<(8#8^U:S%08IU0*`6B3A$>0E<[+<ZK@N!FS4:YV48;0PM!EH/5%A[CMP
++M$&^(`B?L%`P>JG_>:@;>-`Y1E`&`8=(RYUE')]1`TYY(A:#RB0FG3$PE+)8S
++MGU.@!,R[6^+K@E&1>47'U:5Y9^H"9N$SLJ5J?%:_%JV9"PQ"#C%I;C:?MTG)
++M<_+^*U#T[J#O`$?NA$H`J5@CT><;M?J"+89:J5'/N15EU7F7>F1"I0/G+">Y
++M3+-@8%+J^"D)LAGHE1:IW4%D>L70=!S'KQZ=T/&:X3,<[QS#1;Q0:L.Y4(WR
++MIS8('-XK,_=EA`C,5^$HZS9@[X!)(&TP;5L0+F9IIL:86^R:&;<$8IY<9"=$
++M980D2B%BWIQ8MF1**D<C'(B(H>]I;;CK69[X^A0WPLO@0K_*(X]F;<'PTXE7
++M=W36:V(H)-<H3-9VJ2*8<)R3>CY_U'(8WEH]4NH>1WYRQ+BR</?UNR'F7?3D
++MMT2R'C%XN48K6]_0=R98O.?AXM=&"^,8F;?1F5KU"<RW6$%"J"HU6`[)>@4%
++M$1U.K,)S+4!]61]+Q!Q];=1<:0H&&9F^&`@320!JS8'6STZ[:=E*IZ;&BDC7
++M0Z/7-5O>MY:IK*BM/5>;X56^9&U^#42.H)OFI54HV1)`TJC7_B33GAVXJ]7O
++M;?1"OI([IPP,[MV,/M;SJ$X)F]1/8&A&510:&ID)5D![*U)9=_1^5X(."9$3
++MAKAD3Q"G(58]/R>7K9'EWM'SQL4<(VSXPXG5&YKMU-_C3ND*S57\G4:0+B9,
++MJ5UN=Z]5!0TZS\:=[S.J>H-<K0YH6-N7,(0P<'BJ!U.&WQQQ+M=8D`JJ%TC`
++MV8O[\4"(>)[0]<R`YSOCG4S:@B1`=(&#*9Q5"$!`TZ\[P<5B!VH%*9$H@-=[
++M@OO8,]4"KEF@KLC'OVU1@TC.JJ5E+%4@H:S!+"N5'H0`/I[O@]/6&@/E8.VK
++M1A8',GW)\Y&$!8FA`9,)%T=LD&Q69%/J(]AM-J[P;/M==J8K$*&@89V&ME8"
++MND7RM#$V]AD=V*V[6[S=23=Z!389@HD9G;3JULY3B57)>6K0B-@S.BC387!M
++M$S)!YJMA-!`JT[;'[Z^+^[0R-)::%H%<W@K)X=V]%EM'[L1N-/H$+/ZPK=PZ
++M90IF0PY)Q1"6)NO=H,!ANF>GHKM=7G#8VW_]:.U^;<&A9&M/6UP?W""!BY%`
++M#![EE,U-#7?W49=0ZXLS<=KZ:P-?Z3.X9G9?7W,9U.N2TLZ.@I-#Z@G7\7TV
++MWHSA0AEJ*,1,`G^Y-'RV*AEKF,/?,:P^UZ&F<"J&#J0NMG0&<\V@F>9R#G`8
++M8"2$M4:2?X:&&W[K8\*=>CQHL8G]'<]@CN1F#'"X-ZO8\(=;X+BJT=]2+C:H
++M4PL_D99">XRIU6^@S@B;6=;A"S6J!DD&;F8.@CY3\G*1J,;<LF7<C4PQ,D/U
++M<-TY*?E&G^YK2P,`]W0X8'Q->%1,\3U?C65;#&*>6O<Z/7LG$Y-:=(5M<>E!
++MFVJJJM,IDRO),/K661%M4\6#1,IBT04O9HXN64;!]\FH*H#<46AK6%-'LCF9
++MR+1L24TY4/W_$$4`;*4R6-)=-<[!3VX70!7=GKY%5A/>5U.!K<CQI^/OK%BE
++M6S8>P4`/<AR`HXY(>^X".'H%Q?;P',T8(,[(O1T\\K!%">*#TZ3L)AZ$/:3#
++MN#L_''38,`!CF+]:(8[7>H+[G4L`8'8$'2;(;A-TB>Y-?`Z0SHGO<-&]>=?1
++M.%\D]#]-"\?6"0!S,$=]"\WZJKFWW+0,KN8@H5#,P4JO+2[I8+)K.GE;OZ'7
++MW6^-;6=X]"-%4;W@V9C.#*N(]M'VAWIC7&N_#'E;W?3^T'>]-2-X=9B^4;U\
++MT'*-(H-.>>8:,Q(3.V46OUD]TQT7D-PM+!C5]1&$A5_.0$FU.WL(&AB[^J(W
++MC9_.U;3@%I%C#)%M;R_(%(ZBT`U7Z%$^2K53FF"->R$&0GTQ1HJCRC*ZNL1@
++M;F!0>FK6OK[E(YYHF^=GYS,F>9DC+2@>J2@N@/>\BL^-6Z=!H*-?OLIAZ_NK
++MLDN"E,GB8]*I2!;=UH7JBS.6AF88^:>-ZOR=_N7A"M\B,YE=CK<O+*-R,X#L
++MY9<)!(/=I<-GKYE)T>V?B(2%+;-$FTH0P@=0=)7(@D5HIYCOV$EW.MZP_:HB
++M&,OED]W=BZGUITM#NKAC8,`1SO"V/<*,?4Q+AGF/V=O(_QZ9Q08'TG;(.%W>
++M3QI"^R0+9F25\+`V81V6@)V/X&8HAATY-]YTO.V[=I1-2`X6_"5%@0JCBP0?
++M!4@"!(7#-S*G*12#Q7ISP]OR(^?&&48%!EP>;\@B($4F'_XNY(IPH2!)0!**
++`
++end
+diff --git a/gdb/testsuite/gdb.base/tab-crash.exp b/gdb/testsuite/gdb.base/tab-crash.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/tab-crash.exp
+@@ -0,0 +1,43 @@
++# This testcase is part of GDB, the GNU debugger.
++
++# Copyright 2017 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 { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
++    return
++}
++
++standard_testfile
++
++# gcc-base-debuginfo-6.3.1-1.fc25.x86_64
++# /usr/lib/debug/lib64/libgcc_s-6.3.1-20161221.so.1.debug
++# objcopy -R .debug_loc -R .debug_ranges -R .debug_info -R .debug_abbrev -R .debug_aranges -R .debug_str -R .comment ...
++
++set debugfilebz2uu ${srcdir}/${subdir}/${testfile}.bz2.uu
++set debugfile [standard_output_file ${testfile}]
++
++if {[catch "system \"uudecode -o - ${debugfilebz2uu} | bzip2 -dc >${debugfile}\""] != 0} {
++    untested "failed uudecode or bzip2"
++    return -1
++}
++file stat ${debugfile} debugfilestat
++if {$debugfilestat(size) != 71936} {
++    untested "uudecode or bzip2 produce invalid result"
++    return -1
++}
++
++clean_restart ${debugfile}
++
++gdb_test "complete p si" "complete p si\r\np size_of_encoded_value"

SOURCES/gdb-rhbz1553104-s390x-arch12-test.patch

@@ -0,0 +1,81 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date: Fri, 23 Mar 2018 20:42:44 +0100
+Subject: gdb-rhbz1553104-s390x-arch12-test.patch
+
+;; [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
+;; =fedoratest
+
+diff --git a/gdb/testsuite/gdb.arch/s390x-arch12.S b/gdb/testsuite/gdb.arch/s390x-arch12.S
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/s390x-arch12.S
+@@ -0,0 +1,4 @@
++.text
++.globl load_guarded
++load_guarded:
++.byte 0xeb,0xbf,0xf0,0x58,0x00,0x24,0xe3,0xf0,0xff,0x50,0xff,0x71,0xb9,0x04,0x00,0xbf,0xe3,0x20,0xb0,0xa0,0x00,0x24,0xe3,0x10,0xb0,0xa0,0x00,0x04,0xe3,0x10,0x10,0x00,0x00,0x4c,0xe3,0x10,0xb0,0xa8,0x00,0x24,0xe3,0x10,0xb0,0xa8,0x00,0x04,0xb9,0x04,0x00,0x21,0xe3,0x40,0xb1,0x20,0x00,0x04,0xeb,0xbf,0xb1,0x08,0x00,0x04,0x07,0xf4
+diff --git a/gdb/testsuite/gdb.arch/s390x-arch12.exp b/gdb/testsuite/gdb.arch/s390x-arch12.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/s390x-arch12.exp
+@@ -0,0 +1,34 @@
++# Copyright 2018 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 { ![istarget s390x-*linux-*] || ![is_lp64_target] } {
++#    verbose "Skipping s390x-prologue-skip.exp"
++#    return
++#}
++
++set testfile "s390x-arch12"
++set uufile "${srcdir}/${subdir}/${testfile}.o.uu"
++set ofile "${srcdir}/${subdir}/${testfile}.o"
++
++if { [catch "system \"uudecode -o ${ofile} ${uufile}\"" ] != 0 } {
++    untested "failed uudecode"
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_load $ofile
++
++gdb_test "disas load_guarded" " <\\+28>:\tlgg\t%r1,0\\(%r1\\)\r\n\[^\r\n\]* <\\+34>:\tstg\t%r1,168\\(%r11\\)\r\n.*"
+diff --git a/gdb/testsuite/gdb.arch/s390x-arch12.o.uu b/gdb/testsuite/gdb.arch/s390x-arch12.o.uu
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/s390x-arch12.o.uu
+@@ -0,0 +1,20 @@
++begin 644 s390x-arch12.o
++M?T5,1@("`0`````````````!`!8````!````````````````````````````
++M``$X``````!```````!```<`!.N_\%@`)./P_U#_<;D$`+_C(+"@`"3C$+"@
++M``3C$!```$SC$+"H`"3C$+"H``2Y!``AXT"Q(``$Z[^Q"``$!_0`+G-Y;71A
++M8@`N<W1R=&%B`"YS:'-T<G1A8@`N=&5X=``N9&%T80`N8G-S````````````
++M`````````````````````````````````P```0``````````````````````
++M`````P```@```````````````````````````P```P``````````````````
++M```````!$````0``````````````````````;&]A9%]G=6%R9&5D````````
++M````````````````````````````````````````````````````````````
++M`````````````````````````!L````!``````````8`````````````````
++M``!``````````$`````````````````````$```````````````A`````0``
++M```````#````````````````````@```````````````````````````````
++M!```````````````)P````@``````````P```````````````````(``````
++M``````````````````````````0``````````````!$````#````````````
++M``````````````````"``````````"P````````````````````!````````
++M```````!`````@``````````````````````````````L`````````!X````
++M!@````0`````````"``````````8````"0````,`````````````````````
++H`````````2@`````````#@````````````````````$`````````````
++`
++end

SOURCES/gdb-rhbz1976887-field-location-kind.patch

@@ -0,0 +1,30 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= <ahajkova@redhat.com>
+Date: Wed, 29 Sep 2021 10:58:50 +0200
+Subject: gdb-rhbz1976887-field-location-kind.patch
+
+;;Backport upstream patch which fixes internal-error: Unexpected
+;;type field location kind (RHBZ 1976887).
+
+gdbtypes.c: Add the case for FIELD_LOC_KIND_DWARF_BLOCK
+
+The case for FIELD_LOC_KIND_DWARF_BLOCK was missing for
+switch TYPE_FIELD_LOC_KIND. Thas caused an internal-error
+under some circumstances.
+
+Fixes bug 28030.
+
+diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
+--- a/gdb/gdbtypes.c
++++ b/gdb/gdbtypes.c
+@@ -5571,6 +5571,10 @@ copy_type_recursive (struct objfile *objfile,
+ 				  xstrdup (TYPE_FIELD_STATIC_PHYSNAME (type,
+ 								       i)));
+ 	      break;
++            case FIELD_LOC_KIND_DWARF_BLOCK:
++              SET_FIELD_DWARF_BLOCK (new_type->field (i),
++                                     TYPE_FIELD_DWARF_BLOCK (type, i));
++              break;
+ 	    default:
+ 	      internal_error (__FILE__, __LINE__,
+ 			      _("Unexpected type field location kind: %d"),

SOURCES/gdb-rhbz2012976-paper-over-fortran-lex-problems.patch

@@ -0,0 +1,185 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Mon, 11 Oct 2021 11:22:04 -0700
+Subject: gdb-rhbz2012976-paper-over-fortran-lex-problems.patch
+
+;; Backport gdb.fortran testsuite changes in order to avoid Fortran
+;; lexical analyzer bug.
+
+[gdb/testsuite] Fix FAIL in gdb.mi/mi-var-child-f.exp
+
+When running test-case gdb.mi/mi-var-child-f.exp on openSUSE Tumbleweed
+(with glibc 2.34) I run into:
+...
+(gdb) ^M
+PASS: gdb.mi/mi-var-child-f.exp: mi runto prog_array
+Expecting: ^(-var-create array \* array[^M
+]+)?(\^done,name="array",numchild="[0-9]+",value=".*",type=.*,has_more="0"[^M
+]+[(]gdb[)] ^M
+[ ]*)
+-var-create array * array^M
+&"Attempt to use a type name as an expression.\n"^M
+^error,msg="-var-create: unable to create variable object"^M
+(gdb) ^M
+FAIL: gdb.mi/mi-var-child-f.exp: create local variable array (unexpected output)
+...
+
+The problem is that the name array is used both:
+- as the name for a local variable
+- as the name of a type in glibc, in file malloc/dynarray-skeleton.c, as included
+  by nss/nss_files/files-hosts.c.
+
+Fix this by ignoring the shared lib symbols.
+
+Likewise in a couple of other fortran tests.
+
+Tested on x86_64-linux.
+
+diff --git a/gdb/testsuite/gdb.fortran/allocated.exp b/gdb/testsuite/gdb.fortran/allocated.exp
+--- a/gdb/testsuite/gdb.fortran/allocated.exp
++++ b/gdb/testsuite/gdb.fortran/allocated.exp
+@@ -25,11 +25,17 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
+     return -1
+ }
+ 
++# Avoid shared lib symbols.
++gdb_test_no_output "set auto-solib-add off"
++
+ if ![fortran_runto_main] {
+     untested "could not run to main"
+     return -1
+ }
+ 
++# Avoid libc symbols, in particular the 'array' type.
++gdb_test_no_output "nosharedlibrary"
++
+ # Set all the breakpoints.
+ for { set i 1 } { $i < 6 } { incr i } {
+     gdb_breakpoint [gdb_get_line_number "Breakpoint $i"]
+diff --git a/gdb/testsuite/gdb.fortran/array-slices-bad.exp b/gdb/testsuite/gdb.fortran/array-slices-bad.exp
+--- a/gdb/testsuite/gdb.fortran/array-slices-bad.exp
++++ b/gdb/testsuite/gdb.fortran/array-slices-bad.exp
+@@ -25,11 +25,17 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
+     return -1
+ }
+ 
++# Avoid shared lib symbols.
++gdb_test_no_output "set auto-solib-add off"
++
+ if ![fortran_runto_main] {
+     untested "could not run to main"
+     return -1
+ }
+ 
++# Avoid libc symbols, in particular the 'array' type.
++gdb_test_no_output "nosharedlibrary"
++
+ # gdb_breakpoint [gdb_get_line_number "Display Message Breakpoint"]
+ gdb_breakpoint [gdb_get_line_number "First Breakpoint"]
+ gdb_breakpoint [gdb_get_line_number "Second Breakpoint"]
+diff --git a/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp b/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp
+--- a/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp
++++ b/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp
+@@ -25,11 +25,17 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
+     return -1
+ }
+ 
++# Avoid shared lib symbols.
++gdb_test_no_output "set auto-solib-add off"
++
+ if ![fortran_runto_main] {
+     untested "could not run to main"
+     return -1
+ }
+ 
++# Avoid libc symbols, in particular the 'array' type.
++gdb_test_no_output "nosharedlibrary"
++
+ # gdb_breakpoint [gdb_get_line_number "Display Message Breakpoint"]
+ gdb_breakpoint [gdb_get_line_number "Stop Here"]
+ gdb_breakpoint [gdb_get_line_number "Final Breakpoint"]
+diff --git a/gdb/testsuite/gdb.fortran/array-slices.exp b/gdb/testsuite/gdb.fortran/array-slices.exp
+--- a/gdb/testsuite/gdb.fortran/array-slices.exp
++++ b/gdb/testsuite/gdb.fortran/array-slices.exp
+@@ -55,11 +55,17 @@ proc run_test { repack } {
+ 
+     clean_restart ${binfile}
+ 
++    # Avoid shared lib symbols.
++    gdb_test_no_output "set auto-solib-add off"
++
+     if ![fortran_runto_main] {
+ 	untested "could not run to main"
+ 	return -1
+     }
+ 
++    # Avoid libc symbols, in particular the 'array' type.
++    gdb_test_no_output "nosharedlibrary"
++
+     gdb_test_no_output "set fortran repack-array-slices $repack"
+ 
+     # gdb_breakpoint [gdb_get_line_number "Display Message Breakpoint"]
+diff --git a/gdb/testsuite/gdb.fortran/lbound-ubound.exp b/gdb/testsuite/gdb.fortran/lbound-ubound.exp
+--- a/gdb/testsuite/gdb.fortran/lbound-ubound.exp
++++ b/gdb/testsuite/gdb.fortran/lbound-ubound.exp
+@@ -25,12 +25,17 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
+     return -1
+ }
+ 
++# Avoid shared lib symbols.
++gdb_test_no_output "set auto-solib-add off"
+ 
+ if ![fortran_runto_main] {
+     untested "could not run to main"
+     return -1
+ }
+ 
++# Avoid libc symbols, in particular the 'array' type.
++gdb_test_no_output "nosharedlibrary"
++
+ gdb_breakpoint [gdb_get_line_number "Test Breakpoint"]
+ gdb_breakpoint [gdb_get_line_number "Final Breakpoint"]
+ 
+diff --git a/gdb/testsuite/gdb.fortran/subarray.exp b/gdb/testsuite/gdb.fortran/subarray.exp
+--- a/gdb/testsuite/gdb.fortran/subarray.exp
++++ b/gdb/testsuite/gdb.fortran/subarray.exp
+@@ -27,16 +27,17 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
+     return -1
+ }
+ 
+-gdb_exit
+-gdb_start
+-gdb_reinitialize_dir $srcdir/$subdir
+-gdb_load ${binfile}
++# Avoid shared lib symbols.
++gdb_test_no_output "set auto-solib-add off"
+ 
+ if ![fortran_runto_main] then {
+     perror "couldn't run to main"
+     continue
+ }
+ 
++# Avoid libc symbols, in particular the 'array' type.
++gdb_test_no_output "nosharedlibrary"
++
+ # Try to set breakpoint at the last write statement.
+ 
+ set bp_location [gdb_get_line_number "str(:)"]
+diff --git a/gdb/testsuite/gdb.mi/mi-var-child-f.exp b/gdb/testsuite/gdb.mi/mi-var-child-f.exp
+--- a/gdb/testsuite/gdb.mi/mi-var-child-f.exp
++++ b/gdb/testsuite/gdb.mi/mi-var-child-f.exp
+@@ -36,8 +36,14 @@ if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
+ mi_gdb_reinitialize_dir $srcdir/$subdir
+ mi_gdb_load ${binfile}
+ 
++# Avoid shared lib symbols.
++mi_gdb_test "-gdb-set auto-solib-add off" "\\^done"
++
+ mi_runto prog_array
+ 
++# Avoid libc symbols, in particular the 'array' type.
++mi_gdb_test "nosharedlibrary" ".*\\^done"
++
+ mi_create_varobj "array" "array" "create local variable array"
+ 
+ 

SOURCES/gdb-rhbz2022177-dprintf-1.patch

@@ -0,0 +1,315 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Wed, 10 Nov 2021 18:52:22 -0700
+Subject: gdb-rhbz2022177-dprintf-1.patch
+
+;; Backport fix for dprintf bug (RH BZ 2022177).
+
+Fix PR 28308 - dprintf breakpoints not working when run from script
+
+This commit fixes Bug 28308, titled "Strange interactions with
+dprintf and break/commands":
+
+Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28308
+
+Since creating that bug report, I've found a somewhat simpler way of
+reproducing the problem.  I've encapsulated it into the GDB test case
+which I've created along with this bug fix.  The name of the new test
+is gdb.base/dprintf-execution-x-script.exp, I'll demonstrate the
+problem using this test case, though for brevity, I've placed all
+relevant files in the same directory and have renamed the files to all
+start with 'dp-bug' instead of 'dprintf-execution-x-script'.
+
+The script file, named dp-bug.gdb, consists of the following commands:
+
+dprintf increment, "dprintf in increment(), vi=%d\n", vi
+break inc_vi
+commands
+  continue
+end
+run
+
+Note that the final command in this script is 'run'.  When 'run' is
+instead issued interactively, the  bug does not occur.  So, let's look
+at the interactive case first in order to see the correct/expected
+output:
+
+$ gdb -q -x dp-bug.gdb dp-bug
+... eliding buggy output which I'll discuss later ...
+(gdb) run
+Starting program: /mesquite2/sourceware-git/f34-master/bld/gdb/tmp/dp-bug
+vi=0
+dprintf in increment(), vi=0
+
+Breakpoint 2, inc_vi () at dprintf-execution-x-script.c:26
+26	in dprintf-execution-x-script.c
+vi=1
+dprintf in increment(), vi=1
+
+Breakpoint 2, inc_vi () at dprintf-execution-x-script.c:26
+26	in dprintf-execution-x-script.c
+vi=2
+dprintf in increment(), vi=2
+
+Breakpoint 2, inc_vi () at dprintf-execution-x-script.c:26
+26	in dprintf-execution-x-script.c
+vi=3
+[Inferior 1 (process 1539210) exited normally]
+
+In this run, in which 'run' was issued from the gdb prompt (instead
+of at the end of the script), there are three dprintf messages along
+with three 'Breakpoint 2' messages.  This is the correct output.
+
+Now let's look at the output that I snipped above; this is the output
+when 'run' is issued from the script loaded via GDB's -x switch:
+
+$ gdb -q -x dp-bug.gdb dp-bug
+Reading symbols from dp-bug...
+Dprintf 1 at 0x40116e: file dprintf-execution-x-script.c, line 38.
+Breakpoint 2 at 0x40113a: file dprintf-execution-x-script.c, line 26.
+vi=0
+dprintf in increment(), vi=0
+
+Breakpoint 2, inc_vi () at dprintf-execution-x-script.c:26
+26	dprintf-execution-x-script.c: No such file or directory.
+vi=1
+
+Breakpoint 2, inc_vi () at dprintf-execution-x-script.c:26
+26	in dprintf-execution-x-script.c
+vi=2
+
+Breakpoint 2, inc_vi () at dprintf-execution-x-script.c:26
+26	in dprintf-execution-x-script.c
+vi=3
+[Inferior 1 (process 1539175) exited normally]
+
+In the output shown above, only the first dprintf message is printed.
+The 2nd and 3rd dprintf messages are missing!  However, all three
+'Breakpoint 2...' messages are still printed.
+
+Why does this happen?
+
+bpstat_do_actions_1() in gdb/breakpoint.c contains the following
+comment and code near the start of the function:
+
+  /* Avoid endless recursion if a `source' command is contained
+     in bs->commands.  */
+  if (executing_breakpoint_commands)
+    return 0;
+
+  scoped_restore save_executing
+    = make_scoped_restore (&executing_breakpoint_commands, 1);
+
+Also, as described by this comment prior to the 'async' field
+in 'struct ui' in top.h, the main UI starts off in sync mode
+when processing command line arguments:
+
+  /* True if the UI is in async mode, false if in sync mode.  If in
+     sync mode, a synchronous execution command (e.g, "next") does not
+     return until the command is finished.  If in async mode, then
+     running a synchronous command returns right after resuming the
+     target.  Waiting for the command's completion is later done on
+     the top event loop.  For the main UI, this starts out disabled,
+     until all the explicit command line arguments (e.g., `gdb -ex
+     "start" -ex "next"') are processed.  */
+
+This combination of things, the state of the static global
+'executing_breakpoint_commands' plus the state of the async
+field in the main UI causes this behavior.
+
+This is a backtrace after hitting the dprintf breakpoint for
+the second time when doing 'run' from the script file, i.e.
+non-interactively:
+
+Thread 1 "gdb" hit Breakpoint 3, bpstat_do_actions_1 (bsp=0x7fffffffc2b8)
+    at /ironwood1/sourceware-git/f34-master/bld/../../worktree-master/gdb/breakpoint.c:4431
+4431	  if (executing_breakpoint_commands)
+
+ #0  bpstat_do_actions_1 (bsp=0x7fffffffc2b8)
+     at gdb/breakpoint.c:4431
+ #1  0x00000000004d8bc6 in dprintf_after_condition_true (bs=0x1538090)
+     at gdb/breakpoint.c:13048
+ #2  0x00000000004c5caa in bpstat_stop_status (aspace=0x116dbc0, bp_addr=0x40116e, thread=0x137f450, ws=0x7fffffffc718,
+     stop_chain=0x1538090) at gdb/breakpoint.c:5498
+ #3  0x0000000000768d98 in handle_signal_stop (ecs=0x7fffffffc6f0)
+     at gdb/infrun.c:6172
+ #4  0x00000000007678d3 in handle_inferior_event (ecs=0x7fffffffc6f0)
+     at gdb/infrun.c:5662
+ #5  0x0000000000763cd5 in fetch_inferior_event ()
+     at gdb/infrun.c:4060
+ #6  0x0000000000746d7d in inferior_event_handler (event_type=INF_REG_EVENT)
+     at gdb/inf-loop.c:41
+ #7  0x00000000007a702f in handle_target_event (error=0, client_data=0x0)
+     at gdb/linux-nat.c:4207
+ #8  0x0000000000b8cd6e in gdb_wait_for_event (block=block@entry=0)
+     at gdbsupport/event-loop.cc:701
+ #9  0x0000000000b8d032 in gdb_wait_for_event (block=0)
+     at gdbsupport/event-loop.cc:597
+ #10 gdb_do_one_event () at gdbsupport/event-loop.cc:212
+ #11 0x00000000009d19b6 in wait_sync_command_done ()
+     at gdb/top.c:528
+ #12 0x00000000009d1a3f in maybe_wait_sync_command_done (was_sync=0)
+     at gdb/top.c:545
+ #13 0x00000000009d2033 in execute_command (p=0x7fffffffcb18 "", from_tty=0)
+     at gdb/top.c:676
+ #14 0x0000000000560d5b in execute_control_command_1 (cmd=0x13b9bb0, from_tty=0)
+     at gdb/cli/cli-script.c:547
+ #15 0x000000000056134a in execute_control_command (cmd=0x13b9bb0, from_tty=0)
+     at gdb/cli/cli-script.c:717
+ #16 0x00000000004c3bbe in bpstat_do_actions_1 (bsp=0x137f530)
+     at gdb/breakpoint.c:4469
+ #17 0x00000000004c3d40 in bpstat_do_actions ()
+     at gdb/breakpoint.c:4533
+ #18 0x00000000006a473a in command_handler (command=0x1399ad0 "run")
+     at gdb/event-top.c:624
+ #19 0x00000000009d182e in read_command_file (stream=0x113e540)
+     at gdb/top.c:443
+ #20 0x0000000000563697 in script_from_file (stream=0x113e540, file=0x13bb0b0 "dp-bug.gdb")
+     at gdb/cli/cli-script.c:1642
+ #21 0x00000000006abd63 in source_gdb_script (extlang=0xc44e80 <extension_language_gdb>, stream=0x113e540,
+     file=0x13bb0b0 "dp-bug.gdb") at gdb/extension.c:188
+ #22 0x0000000000544400 in source_script_from_stream (stream=0x113e540, file=0x7fffffffd91a "dp-bug.gdb",
+     file_to_open=0x13bb0b0 "dp-bug.gdb")
+     at gdb/cli/cli-cmds.c:692
+ #23 0x0000000000544557 in source_script_with_search (file=0x7fffffffd91a "dp-bug.gdb", from_tty=1, search_path=0)
+     at gdb/cli/cli-cmds.c:750
+ #24 0x00000000005445cf in source_script (file=0x7fffffffd91a "dp-bug.gdb", from_tty=1)
+     at gdb/cli/cli-cmds.c:759
+ #25 0x00000000007cf6d9 in catch_command_errors (command=0x5445aa <source_script(char const*, int)>,
+     arg=0x7fffffffd91a "dp-bug.gdb", from_tty=1, do_bp_actions=false)
+     at gdb/main.c:523
+ #26 0x00000000007cf85d in execute_cmdargs (cmdarg_vec=0x7fffffffd1b0, file_type=CMDARG_FILE, cmd_type=CMDARG_COMMAND,
+     ret=0x7fffffffd18c) at gdb/main.c:615
+ #27 0x00000000007d0c8e in captured_main_1 (context=0x7fffffffd3f0)
+     at gdb/main.c:1322
+ #28 0x00000000007d0eba in captured_main (data=0x7fffffffd3f0)
+     at gdb/main.c:1343
+ #29 0x00000000007d0f25 in gdb_main (args=0x7fffffffd3f0)
+     at gdb/main.c:1368
+ #30 0x00000000004186dd in main (argc=5, argv=0x7fffffffd508)
+     at gdb/gdb.c:32
+
+There are two frames for bpstat_do_actions_1(), one at frame #16 and
+the other at frame #0.  The one at frame #16 is processing the actions
+for Breakpoint 2, which is a 'continue'.  The one at frame #0 is attempting
+to process the dprintf breakpoint action.  However, at this point,
+the value of 'executing_breakpoint_commands' is 1, forcing an early
+return, i.e. prior to executing the command(s) associated with the dprintf
+breakpoint.
+
+For the sake of comparison, this is what the stack looks like when hitting
+the dprintf breakpoint for the second time when issuing the 'run'
+command from the GDB prompt.
+
+Thread 1 "gdb" hit Breakpoint 3, bpstat_do_actions_1 (bsp=0x7fffffffccd8)
+    at /ironwood1/sourceware-git/f34-master/bld/../../worktree-master/gdb/breakpoint.c:4431
+4431	  if (executing_breakpoint_commands)
+
+ #0  bpstat_do_actions_1 (bsp=0x7fffffffccd8)
+     at gdb/breakpoint.c:4431
+ #1  0x00000000004d8bc6 in dprintf_after_condition_true (bs=0x16b0290)
+     at gdb/breakpoint.c:13048
+ #2  0x00000000004c5caa in bpstat_stop_status (aspace=0x116dbc0, bp_addr=0x40116e, thread=0x13f0e60, ws=0x7fffffffd138,
+     stop_chain=0x16b0290) at gdb/breakpoint.c:5498
+ #3  0x0000000000768d98 in handle_signal_stop (ecs=0x7fffffffd110)
+     at gdb/infrun.c:6172
+ #4  0x00000000007678d3 in handle_inferior_event (ecs=0x7fffffffd110)
+     at gdb/infrun.c:5662
+ #5  0x0000000000763cd5 in fetch_inferior_event ()
+     at gdb/infrun.c:4060
+ #6  0x0000000000746d7d in inferior_event_handler (event_type=INF_REG_EVENT)
+     at gdb/inf-loop.c:41
+ #7  0x00000000007a702f in handle_target_event (error=0, client_data=0x0)
+     at gdb/linux-nat.c:4207
+ #8  0x0000000000b8cd6e in gdb_wait_for_event (block=block@entry=0)
+     at gdbsupport/event-loop.cc:701
+ #9  0x0000000000b8d032 in gdb_wait_for_event (block=0)
+     at gdbsupport/event-loop.cc:597
+ #10 gdb_do_one_event () at gdbsupport/event-loop.cc:212
+ #11 0x00000000007cf512 in start_event_loop ()
+     at gdb/main.c:421
+ #12 0x00000000007cf631 in captured_command_loop ()
+     at gdb/main.c:481
+ #13 0x00000000007d0ebf in captured_main (data=0x7fffffffd3f0)
+     at gdb/main.c:1353
+ #14 0x00000000007d0f25 in gdb_main (args=0x7fffffffd3f0)
+     at gdb/main.c:1368
+ #15 0x00000000004186dd in main (argc=5, argv=0x7fffffffd508)
+     at gdb/gdb.c:32
+
+This relatively short backtrace is due to the current UI's async field
+being set to 1.
+
+Yet another thing to be aware of regarding this problem is the
+difference in the way that commands associated to dprintf breakpoints
+versus regular breakpoints are handled.  While they both use a command
+list associated with the breakpoint, regular breakpoints will place
+the commands to be run on the bpstat chain constructed in
+bp_stop_status().  These commands are run later on.  For dprintf
+breakpoints, commands are run via the 'after_condition_true' function
+pointer directly from bpstat_stop_status().  (The 'commands' field in
+the bpstat is cleared in dprintf_after_condition_true().  This
+prevents the dprintf commands from being run again later on when other
+commands on the bpstat chain are processed.)
+
+Another thing that I noticed is that dprintf breakpoints are the only
+type of breakpoint which use 'after_condition_true'.  This suggests
+that one possible way of fixing this problem, that of making dprintf
+breakpoints work more like regular breakpoints, probably won't work.
+(I must admit, however, that my understanding of this code isn't
+complete enough to say why.  I'll trust that whoever implemented it
+had a good reason for doing it this way.)
+
+The comment referenced earlier regarding 'executing_breakpoint_commands'
+states that the reason for checking this variable is to avoid
+potential endless recursion when a 'source' command appears in
+bs->commands.  We know that a dprintf command is constrained to either
+1) execution of a GDB printf command, 2) an inferior function call of
+a printf-like function, or 3) execution of an agent-printf command.
+Therefore, infinite recursion due to a 'source' command cannot happen
+when executing commands upon hitting a dprintf breakpoint.
+
+I chose to fix this problem by having dprintf_after_condition_true()
+directly call execute_control_commands().  This means that it no
+longer attempts to go through bpstat_do_actions_1() avoiding the
+infinite recursion check for potential 'source' commands on the
+command chain.  I think it simplifies this code a little bit too, a
+definite bonus.
+
+Summary:
+
+	* breakpoint.c (dprintf_after_condition_true): Don't call
+	bpstat_do_actions_1().  Call execute_control_commands()
+	instead.
+
+diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
+--- a/gdb/breakpoint.c
++++ b/gdb/breakpoint.c
+@@ -13043,9 +13043,6 @@ dprintf_print_recreate (struct breakpoint *tp, struct ui_file *fp)
+ static void
+ dprintf_after_condition_true (struct bpstats *bs)
+ {
+-  struct bpstats tmp_bs;
+-  struct bpstats *tmp_bs_p = &tmp_bs;
+-
+   /* dprintf's never cause a stop.  This wasn't set in the
+      check_status hook instead because that would make the dprintf's
+      condition not be evaluated.  */
+@@ -13056,14 +13053,9 @@ dprintf_after_condition_true (struct bpstats *bs)
+      bpstat_do_actions, if a breakpoint that causes a stop happens to
+      be set at same address as this dprintf, or even if running the
+      commands here throws.  */
+-  tmp_bs.commands = bs->commands;
+-  bs->commands = NULL;
+-
+-  bpstat_do_actions_1 (&tmp_bs_p);
+-
+-  /* 'tmp_bs.commands' will usually be NULL by now, but
+-     bpstat_do_actions_1 may return early without processing the whole
+-     list.  */
++  counted_command_line cmds = std::move (bs->commands);
++  gdb_assert (cmds != nullptr);
++  execute_control_commands (cmds.get (), 0);
+ }
+ 
+ /* The breakpoint_ops structure to be used on static tracepoints with

SOURCES/gdb-rhbz2022177-dprintf-2.patch

@@ -0,0 +1,194 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Wed, 10 Nov 2021 18:55:43 -0700
+Subject: gdb-rhbz2022177-dprintf-2.patch
+
+;; Backport test case for dprintf bug (RH BZ 2022177).
+
+Test case for Bug 28308
+
+The purpose of this test is described in the comments in
+dprintf-execution-x-script.exp.
+
+Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28308
+
+The name of this new test was based on that of an existing test,
+bp-cmds-execution-x-script.exp.  I started off by copying that test,
+adding to it, and then rewriting almost all of it.  It's different
+enough that I decided that listing the copyright year as 2021
+was sufficient.
+
+diff --git a/gdb/testsuite/gdb.base/dprintf-execution-x-script.c b/gdb/testsuite/gdb.base/dprintf-execution-x-script.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/dprintf-execution-x-script.c
+@@ -0,0 +1,53 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 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/>.  */
++
++#include <stdlib.h>
++#include <stdio.h>
++
++volatile int vi = 0;
++
++void
++inc_vi ()
++{
++  vi++;
++}
++
++void
++print_vi ()
++{
++  printf ("vi=%d\n", vi);
++}
++
++void
++increment ()
++{
++  inc_vi ();
++}
++
++int
++main (int argc, char **argv)
++{
++  print_vi ();
++  increment ();
++  print_vi ();
++  increment ();
++  print_vi ();
++  increment ();
++  print_vi ();
++
++  exit (0);
++}
+diff --git a/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp b/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp
+@@ -0,0 +1,85 @@
++# Copyright 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 commands in a GDB script file run via GDB's -x flag work
++# as expected.  Specifically, the script creates a dprintf breakpoint
++# as well as a normal breakpoint that has "continue" in its command
++# list, and then does "run".  Correct output from GDB is checked as
++# part of this test.
++
++# Bail out if the target can't use the 'run' command.
++if ![target_can_use_run_cmd] {
++    return 0
++}
++
++standard_testfile
++
++if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
++    return -1
++}
++
++# This is the name of the GDB script to load.
++set x_file ${srcdir}/${subdir}/$testfile.gdb
++
++# Create context in which the global, GDBFLAGS, will be restored at
++# the end of the block.  All commands run within the block are
++# actually run in the outer context.  (This is why 'res' is available
++# outside of the save_vars block.)
++save_vars { GDBFLAGS } {
++    # Set flags with which to start GDB.
++    append GDBFLAGS " -ex \"set height unlimited\""
++    append GDBFLAGS " -x \"$x_file\""
++    append GDBFLAGS " --args \"$binfile\""
++
++    # Start GDB with above flags.
++    set res [gdb_spawn]
++}
++
++set test "load and run script with -x"
++if { $res != 0} {
++    fail $test
++    return -1
++}
++
++# The script loaded via -x contains a run command; while running, GDB
++# is expected to print three messages from dprintf breakpoints along
++# with three interspersed messages from an ordinary breakpoint (which
++# was set up with a continue command).  Set up pattern D to match
++# output from hitting the dprintf breakpoint and B for the ordinary
++# breakpoint.  Then set PAT to contain the entire pattern of expected
++# output from the interspersed dprintf and ordinary breakpoints along
++# with some (additional) expected output from the dprintf breakpoints,
++# i.e. 0, 1, and 2.
++set d "dprintf in increment.., vi="
++set b "Breakpoint ., inc_vi"
++set pat "${d}0.*?$b.*?${d}1.*?$b.*?${d}2.*?$b.*?"
++
++proc do_test {cmd test} {
++    gdb_test $cmd "$::pat$::inferior_exited_re normally.*" $test
++}
++
++# Check output from running script with -x
++do_test "" $test
++
++# Restart GDB and 'source' the script; this will (still) run the program
++# due to the 'run' command in the script.
++clean_restart $binfile
++do_test "source $x_file" "load and run script using source command"
++
++# This should leave us at the gdb prompt; Run program again using
++# already established breakpoints, i.e. those loaded from the
++# script.  Prior to fixing PR 28308, this was the only test that
++# would pass.
++do_test "run" "run again"
+diff --git a/gdb/testsuite/gdb.base/dprintf-execution-x-script.gdb b/gdb/testsuite/gdb.base/dprintf-execution-x-script.gdb
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/dprintf-execution-x-script.gdb
+@@ -0,0 +1,21 @@
++# Copyright 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/>.  */
++
++dprintf increment, "dprintf in increment(), vi=%d\n", vi
++break inc_vi
++commands
++  continue
++end
++run

SOURCES/gdb-rhbz202487-rework-set-debuginfod.patch

@@ -0,0 +1,476 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= <ahajkova@redhat.com>
+Date: Tue, 11 Jan 2022 12:46:05 +0100
+Subject: gdb-rhbz202487-rework-set-debuginfod.patch
+
+;;Backport upstream commit from  Simon Marchi
+;;333f35b6315 gdb: pass/return setting setter/getter
+;;scalar values by value
+
+gdb: rework "set debuginfod" commands
+
+As discussed here [1], do some re-work in the "set debuginfod commands".
+
+First, use "set debuginfod enabled on/off/ask" instead of "set
+debuginfod on/off/ask".  This is more MI-friendly, and it gives an
+output that makes more sense in "info set", for example.
+
+Then, make the show commands not call "error" when debuginfod support is
+not compiled in.  This makes the commands "show" and "show debuginfod"
+stop early, breaking gdb.base/default.exp:
+
+    Running /home/smarchi/src/binutils-gdb/gdb/testsuite/gdb.base/default.exp ...
+    FAIL: gdb.base/default.exp: info set
+    FAIL: gdb.base/default.exp: show
+
+ - Make the "debuginfod enabled" setting default to "off" when debuginfod
+   support is not compiled in, and "ask" otherwise.
+ - Make the setter of "debuginfod enabled" error out when debuginfod
+   support is not compiled in, so that "debuginfod enabled" will always
+   remain "off" in that case.
+ - Make the setter of "debuginfod verbose" work in any case.  I don't
+   see the harm in letting the user change that setting, since the user will
+   hit an error if they try to enable the use of debuginfod.
+ - I would do the same for the "debuginfod urls" setter, but because
+   this one needs to see the DEBUGINFOD_URLS_ENV_VAR macro, provided by
+   libdebuginfod, I made that one error out as well if debuginfod
+   support is not compiled it (otherwise, I would have left it like
+   "debuginfod verbose".  Alternatively, we could hard-code
+   "DEBUGINFOD_URLS" in the code (in fact, it was prior to this patch,
+   but I think it was an oversight, as other spots use
+   DEBUGINFOD_URLS_ENV_VAR), or use a dummy string to store the setting,
+   but I don't really see the value in that.
+
+Rename debuginfod_enable to debuginfod_enabled, just so it matches the
+setting name.
+
+[1] https://sourceware.org/pipermail/gdb-patches/2021-October/182937.html
+
+Change-Id: I45fdb2993f668226a5639228951362b7800f09d5
+Co-Authored-By: Aaron Merey <amerey@redhat.com>
+
+diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c
+--- a/gdb/debuginfod-support.c
++++ b/gdb/debuginfod-support.c
+@@ -32,8 +32,22 @@ static const char debuginfod_on[] = "on";
+ static const char debuginfod_off[] = "off";
+ static const char debuginfod_ask[] = "ask";
+ 
+-static const char *debuginfod_enable = debuginfod_ask;
+-static unsigned debuginfod_verbose = 1;
++static const char *debuginfod_enabled_enum[] =
++{
++  debuginfod_on,
++  debuginfod_off,
++  debuginfod_ask,
++  nullptr
++};
++
++static const char *debuginfod_enabled =
++#if defined(HAVE_LIBDEBUGINFOD)
++  debuginfod_ask;
++#else
++  debuginfod_off;
++#endif
++
++static unsigned int debuginfod_verbose = 1;
+ 
+ /* This is never actually used.  URLs are always pulled from the
+    environment.  */
+@@ -60,64 +74,6 @@ debuginfod_debuginfo_query (const unsigned char *build_id,
+ 
+ #define NO_IMPL _("Support for debuginfod is not compiled into GDB.")
+ 
+-/* Stub set/show commands that indicate debuginfod is not supported.  */
+-
+-static void
+-set_debuginfod_on_command (const char *args, int from_tty)
+-{
+-  error (NO_IMPL);
+-  debuginfod_enable = debuginfod_off;
+-}
+-
+-static void
+-set_debuginfod_off_command (const char *args, int from_tty)
+-{
+-  error (NO_IMPL);
+-  debuginfod_enable = debuginfod_off;
+-}
+-
+-static void
+-set_debuginfod_ask_command (const char *args, int from_tty)
+-{
+-  error (NO_IMPL);
+-  debuginfod_enable = debuginfod_off;
+-}
+-
+-static void
+-show_debuginfod_status_command (const char *args, int from_tty)
+-{
+-  error (NO_IMPL);
+-}
+-
+-static void
+-set_debuginfod_urls_command (const char *ignore, int from_tty,
+-                             struct cmd_list_element *c)
+-{
+-  error (NO_IMPL);
+-}
+-
+-static void
+-show_debuginfod_urls_command (struct ui_file *file, int from_tty,
+-			      struct cmd_list_element *cmd, const char *value)
+-{
+-  error (NO_IMPL);
+-}
+-
+-static void
+-set_debuginfod_verbose_command (const char *args, int from_tty,
+-				struct cmd_list_element *c)
+-{
+-  error (NO_IMPL);
+-  debuginfod_verbose = 0;
+-}
+-
+-static void
+-show_debuginfod_verbose_command (struct ui_file *file, int from_tty,
+-				 struct cmd_list_element *cmd,
+-				 const char *value)
+-{
+-  error (NO_IMPL);
+-}
+ #else
+ #include <elfutils/debuginfod.h>
+ 
+@@ -145,82 +101,6 @@ struct debuginfod_client_deleter
+ using debuginfod_client_up
+   = std::unique_ptr<debuginfod_client, debuginfod_client_deleter>;
+ 
+-/* Enable debuginfod.  */
+-
+-static void
+-set_debuginfod_on_command (const char *args, int from_tty)
+-{
+-  debuginfod_enable = debuginfod_on;
+-}
+-
+-/* Disable debuginfod.  */
+-
+-static void
+-set_debuginfod_off_command (const char *args, int from_tty)
+-{
+-  debuginfod_enable = debuginfod_off;
+-}
+-
+-/* Before next query, ask user whether to enable debuginfod.  */
+-
+-static void
+-set_debuginfod_ask_command (const char *args, int from_tty)
+-{
+-  debuginfod_enable = debuginfod_ask;
+-}
+-
+-/* Show whether debuginfod is enabled.  */
+-
+-static void
+-show_debuginfod_status_command (const char *args, int from_tty)
+-{
+-  printf_unfiltered (_("Debuginfod functionality is currently set to " \
+-		     "\"%s\".\n"), debuginfod_enable);
+-}
+-
+-/* Set the URLs that debuginfod will query.  */
+-
+-static void
+-set_debuginfod_urls_command (const char *ignore, int from_tty,
+-                             struct cmd_list_element *c)
+-{
+-  gdb_assert (debuginfod_urls != nullptr);
+-  if (setenv ("DEBUGINFOD_URLS", debuginfod_urls, 1) != 0)
+-    warning (_("Unable to set debuginfod URLs: %s"), safe_strerror (errno));
+-}
+-
+-/* Show the URLs that debuginfod will query.  */
+-
+-static void
+-show_debuginfod_urls_command (struct ui_file *file, int from_tty,
+-			      struct cmd_list_element *cmd, const char *value)
+-{
+-  if (value == nullptr || value[0] == '\0')
+-    fprintf_unfiltered (file, _("Debuginfod URLs have not been set.\n"));
+-  else
+-    fprintf_filtered (file, _("Debuginfod URLs are currently set to:\n%s\n"),
+-		      value);
+-}
+-
+-/* No-op setter used for compatibility when gdb is built without debuginfod.  */
+-
+-static void
+-set_debuginfod_verbose_command (const char *args, int from_tty,
+-				struct cmd_list_element *c)
+-{
+-  return;
+-}
+-
+-/* Show verbosity.  */
+-
+-static void
+-show_debuginfod_verbose_command (struct ui_file *file, int from_tty,
+-				 struct cmd_list_element *cmd, const char *value)
+-{
+-  fprintf_filtered (file, _("Debuginfod verbose output is set to %s.\n"),
+-		    value);
+-}
+-
+ static int
+ progressfn (debuginfod_client *c, long cur, long total)
+ {
+@@ -277,15 +157,15 @@ get_debuginfod_client ()
+    whether to enable debuginfod.  */
+ 
+ static bool
+-debuginfod_enabled ()
++debuginfod_is_enabled ()
+ {
+   const char *urls = getenv (DEBUGINFOD_URLS_ENV_VAR);
+ 
+   if (urls == nullptr || urls[0] == '\0'
+-      || debuginfod_enable == debuginfod_off)
++      || debuginfod_enabled == debuginfod_off)
+     return false;
+ 
+-  if (debuginfod_enable == debuginfod_ask)
++  if (debuginfod_enabled == debuginfod_ask)
+     {
+       int resp = nquery (_("\nThis GDB supports auto-downloading debuginfo " \
+ 			   "from the following URLs:\n%s\nEnable debuginfod " \
+@@ -294,16 +174,16 @@ debuginfod_enabled ()
+       if (!resp)
+ 	{
+ 	  printf_filtered (_("Debuginfod has been disabled.\nTo make this " \
+-			     "setting permanent, add \'set debuginfod off\' " \
+-			     "to .gdbinit.\n"));
+-	  debuginfod_enable = debuginfod_off;
++			     "setting permanent, add \'set debuginfod " \
++			     "enabled off\' to .gdbinit.\n"));
++	  debuginfod_enabled = debuginfod_off;
+ 	  return false;
+ 	}
+ 
+       printf_filtered (_("Debuginfod has been enabled.\nTo make this " \
+-			 "setting permanent, add \'set debuginfod on\' " \
+-			 "to .gdbinit.\n"));
+-      debuginfod_enable = debuginfod_on;
++			 "setting permanent, add \'set debuginfod enabled " \
++			 "on\' to .gdbinit.\n"));
++      debuginfod_enabled = debuginfod_on;
+     }
+ 
+   return true;
+@@ -317,7 +197,7 @@ debuginfod_source_query (const unsigned char *build_id,
+ 			 const char *srcpath,
+ 			 gdb::unique_xmalloc_ptr<char> *destname)
+ {
+-  if (!debuginfod_enabled ())
++  if (!debuginfod_is_enabled ())
+     return scoped_fd (-ENOSYS);
+ 
+   debuginfod_client *c = get_debuginfod_client ();
+@@ -354,7 +234,7 @@ debuginfod_debuginfo_query (const unsigned char *build_id,
+ 			    const char *filename,
+ 			    gdb::unique_xmalloc_ptr<char> *destname)
+ {
+-  if (!debuginfod_enabled ())
++  if (!debuginfod_is_enabled ())
+     return scoped_fd (-ENOSYS);
+ 
+   debuginfod_client *c = get_debuginfod_client ();
+@@ -382,6 +262,67 @@ debuginfod_debuginfo_query (const unsigned char *build_id,
+ }
+ #endif
+ 
++/* Set callback for "set debuginfod enabled".  */
++
++static void
++set_debuginfod_enabled (const char *args, int from_tty,
++                        struct cmd_list_element *c)
++{
++#if defined(HAVE_LIBDEBUGINFOD)
++  /* Value is already set.  */
++#else
++  error (NO_IMPL);
++#endif
++}
++
++/* Show callback for "set debuginfod enabled".  */
++
++static void
++show_debuginfod_enabled (ui_file *file, int from_tty, cmd_list_element *cmd,
++			 const char *value)
++{
++  printf_unfiltered (_("Debuginfod functionality is currently set to "
++		       "\"%s\".\n"), debuginfod_enabled);
++}
++
++/* Set callback for "set debuginfod urls".  */
++
++static void
++set_debuginfod_urls (const char *args, int from_tty,
++                     struct cmd_list_element *c)
++{
++#if defined(HAVE_LIBDEBUGINFOD)
++  gdb_assert (debuginfod_urls != nullptr);
++  if (setenv (DEBUGINFOD_URLS_ENV_VAR, debuginfod_urls, 1) != 0)
++    warning (_("Unable to set debuginfod URLs: %s"), safe_strerror (errno));
++#else
++  error (NO_IMPL);
++#endif
++}
++
++/* Show callback for "set debuginfod urls".  */
++
++static void
++show_debuginfod_urls (ui_file *file, int from_tty, cmd_list_element *cmd,
++		      const char *value)
++{
++  if (value[0] == '\0')
++    fprintf_unfiltered (file, _("Debuginfod URLs have not been set.\n"));
++  else
++    fprintf_filtered (file, _("Debuginfod URLs are currently set to:\n%s\n"),
++		      value);
++}
++
++/* Show callback for "set debuginfod verbose".  */
++
++static void
++show_debuginfod_verbose_command (ui_file *file, int from_tty,
++				 cmd_list_element *cmd, const char *value)
++{
++  fprintf_filtered (file, _("Debuginfod verbose output is set to %s.\n"),
++		    value);
++}
++
+ /* Register debuginfod commands.  */
+ 
+ void _initialize_debuginfod ();
+@@ -397,23 +338,17 @@ _initialize_debuginfod ()
+                        _("Show debuginfod option."),
+                        &show_debuginfod_prefix_list, 0, &showlist);
+ 
+-  /* set debuginfod on */
+-  add_cmd ("on", class_run, set_debuginfod_on_command,
+-	   _("Enable debuginfod."), &set_debuginfod_prefix_list);
+-
+-  /* set debuginfod off */
+-  add_cmd ("off", class_run, set_debuginfod_off_command,
+-	   _("Disable debuginfod."), &set_debuginfod_prefix_list);
+-
+-  /* set debuginfod ask */
+-  add_cmd ("ask", class_run, set_debuginfod_ask_command, _("\
+-Ask the user whether to enable debuginfod before performing the next query."),
+-	   &set_debuginfod_prefix_list);
+-
+-  /* show debuginfod status */
+-  add_cmd ("status", class_run, show_debuginfod_status_command,
+-	   _("Show whether debuginfod is set to \"on\", \"off\" or \"ask\"."),
+-	   &show_debuginfod_prefix_list);
++  add_setshow_enum_cmd ("enabled", class_run, debuginfod_enabled_enum,
++                        &debuginfod_enabled,
++			_("Set whether to use debuginfod."),
++			_("Show whether to use debuginfod."),
++			_("\
++When on, enable the use of debuginfod to download missing debug info and\n\
++source files."),
++			set_debuginfod_enabled,
++			show_debuginfod_enabled,
++			&set_debuginfod_prefix_list,
++			&show_debuginfod_prefix_list);
+ 
+   /* set/show debuginfod urls */
+   add_setshow_string_noescape_cmd ("urls", class_run, &debuginfod_urls, _("\
+@@ -422,8 +357,8 @@ Show the list of debuginfod server URLs."), _("\
+ Manage the space-separated list of debuginfod server URLs that GDB will query \
+ when missing debuginfo, executables or source files.\nThe default value is \
+ copied from the DEBUGINFOD_URLS environment variable."),
+-				   set_debuginfod_urls_command,
+-				   show_debuginfod_urls_command,
++				   set_debuginfod_urls,
++				   show_debuginfod_urls,
+ 				   &set_debuginfod_prefix_list,
+ 				   &show_debuginfod_prefix_list);
+   if (getenv ("DEBUGINFOD_URLS") != nullptr)
+@@ -436,7 +371,7 @@ Set verbosity of debuginfod output."), _("\
+ Show debuginfod debugging."), _("\
+ When set to a non-zero value, display verbose output for each debuginfod \
+ query.\nTo disable, set to zero.  Verbose output is displayed by default."),
+-			     set_debuginfod_verbose_command,
++			     nullptr,
+ 			     show_debuginfod_verbose_command,
+ 			     &set_debuginfod_prefix_list,
+ 			     &show_debuginfod_prefix_list);
+diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
+--- a/gdb/doc/gdb.texinfo
++++ b/gdb/doc/gdb.texinfo
+@@ -47046,27 +47046,28 @@ regarding @code{debuginfod}.
+ @value{GDBN} provides the following commands for configuring @code{debuginfod}.
+ 
+ @table @code
+-@kindex set debuginfod
+-@anchor{set debuginfod}
+-@item set debuginfod
+-@itemx set debuginfod on
++@kindex set debuginfod enabled
++@anchor{set debuginfod enabled}
++@item set debuginfod enabled
++@itemx set debuginfod enabled on
+ @cindex enable debuginfod
+ @value{GDBN} will attempt to query @code{debuginfod} servers when missing debug
+ info or source files.
+ 
+-@item set debuginfod off
++@item set debuginfod enabled off
+ @value{GDBN} will not attempt to query @code{debuginfod} servers when missing
+-debug info or source files.  By default, @code{debuginfod} is set to @code{off}
+-for non-interactive sessions.
++debug info or source files.  By default, @code{debuginfod enabled} is set to
++@code{off} for non-interactive sessions.
+ 
+-@item set debuginfod ask
++@item set debuginfod enabled ask
+ @value{GDBN} will prompt the user to enable or disable @code{debuginfod} before
+-attempting to perform the next query.  By default, @code{debuginfod} is set to
+-@code{ask} for interactive sessions.
++attempting to perform the next query.  By default, @code{debuginfod enabled}
++is set to @code{ask} for interactive sessions.
+ 
+-@kindex show debuginfod status
+-@item show debuginfod status
+-Show whether @code{debuginfod} is set to @code{on}, @code{off} or @code{ask}.
++@kindex show debuginfod enabled
++@item show debuginfod enabled
++Display whether @code{debuginfod enabled} is set to @code{on}, @code{off} or
++@code{ask}.
+ 
+ @kindex set debuginfod urls
+ @cindex configure debuginfod URLs
+diff --git a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
+--- a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
++++ b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
+@@ -236,7 +236,7 @@ proc local_url { } {
+     clean_restart
+     gdb_test "file $binfile" ".*No debugging symbols.*" \
+ 	"file [file tail $binfile] cmd"
+-    gdb_test_no_output "set debuginfod off"
++    gdb_test_no_output "set debuginfod enabled off"
+     gdb_test_no_output "set debuginfod urls http://127.0.0.1:$port"
+ 
+     # gdb shouldn't find the debuginfo since debuginfod has been disabled
+@@ -244,7 +244,7 @@ proc local_url { } {
+ 	"file [file tail $binfile] cmd off"
+ 
+     # Enable debuginfod and fetch the debuginfo
+-    gdb_test_no_output "set debuginfod on"
++    gdb_test_no_output "set debuginfod enabled on"
+     gdb_test "file $binfile" ".*Reading symbols from.*debuginfo.*" \
+ 	"file [file tail $binfile] cmd on"
+ }

SOURCES/gdb-rhbz2024875-expand-documentation-for-debuginfod.patch

@@ -0,0 +1,152 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= <ahajkova@redhat.com>
+Date: Mon, 10 Jan 2022 13:00:50 +0100
+Subject: gdb-rhbz2024875-expand-documentation-for-debuginfod.patch
+
+;;Backport upstream commit from Aaron Merey
+;;3ea44f21299 gdb.texinfo: Expand documentation for debuginfod
+
+gdb.texinfo: Expand documentation for debuginfod
+
+Add section describing GDB's usage of debuginfod.
+
+Refer to this new section in the description of the '--with-debuginfod'
+configure option.
+
+Mention debuginfod in the 'Separate Debug Files' section.
+
+diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
+--- a/gdb/doc/gdb.texinfo
++++ b/gdb/doc/gdb.texinfo
+@@ -184,6 +184,7 @@ software in general.  We will miss him.
+                                  the operating system
+ * Trace File Format::		GDB trace file format
+ * Index Section Format::        .gdb_index section format
++* Debuginfod::                  Download debugging resources with @code{debuginfod}
+ * Man Pages::			Manual pages
+ * Copying::			GNU General Public License says
+                                 how you can copy and share GDB
+@@ -21373,7 +21374,9 @@ For the ``build ID'' method, @value{GDBN} looks in the
+ a file named @file{@var{nn}/@var{nnnnnnnn}.debug}, where @var{nn} are the
+ first 2 hex characters of the build ID bit string, and @var{nnnnnnnn}
+ are the rest of the bit string.  (Real build ID strings are 32 or more
+-hex characters, not 10.)
++hex characters, not 10.)  @value{GDBN} can automatically query
++@code{debuginfod} servers using build IDs in order to download separate debug
++files that cannot be found locally.  For more information see @ref{Debuginfod}.
+ @end itemize
+ 
+ So, for example, suppose you ask @value{GDBN} to debug
+@@ -21394,6 +21397,10 @@ debug information files, in the indicated order:
+ @file{/usr/lib/debug/usr/bin/ls.debug}.
+ @end itemize
+ 
++If the debug file still has not been found and @code{debuginfod}
++(@pxref{Debuginfod}) is enabled, @value{GDBN} will attempt to download the
++file from @code{debuginfod} servers.
++
+ @anchor{debug-file-directory}
+ Global debugging info directories default to what is set by @value{GDBN}
+ configure option @option{--with-separate-debug-dir}.  During @value{GDBN} run
+@@ -38746,12 +38753,12 @@ Use the curses library instead of the termcap library, for text-mode
+ terminal operations.
+ 
+ @item --with-debuginfod
+-Build @value{GDBN} with libdebuginfod, the debuginfod client library.
+-Used to automatically fetch source files and separate debug files from
+-debuginfod servers using the associated executable's build ID. Enabled
+-by default if libdebuginfod is installed and found at configure time.
+-debuginfod is packaged with elfutils, starting with version 0.178. You
+-can get the latest version from `https://sourceware.org/elfutils/'.
++Build @value{GDBN} with @file{libdebuginfod}, the @code{debuginfod} client
++library.  Used to automatically fetch ELF, DWARF and source files from
++@code{debuginfod} servers using build IDs associated with any missing
++files.  Enabled by default if @file{libdebuginfod} is installed and found
++at configure time.  For more information regarding @code{debuginfod} see
++@ref{Debuginfod}.
+ 
+ @item --with-libunwind-ia64
+ Use the libunwind library for unwinding function call stack on ia64
+@@ -47012,6 +47019,82 @@ switch (die->tag)
+   @}
+ @end smallexample
+ 
++@node Debuginfod
++@appendix Download debugging resources with Debuginfod
++@cindex debuginfod
++
++@code{debuginfod} is an HTTP server for distributing ELF, DWARF and source
++files.
++
++With the @code{debuginfod} client library, @file{libdebuginfod}, @value{GDBN}
++can query servers using the build IDs associated with missing debug info,
++executables and source files in order to download them on demand.
++
++For instructions on building @value{GDBN} with @file{libdebuginfod},
++@pxref{Configure Options,,--with-debuginfod}.  @code{debuginfod} is packaged
++with @code{elfutils}, starting with version 0.178.  See
++@uref{https://sourceware.org/elfutils/Debuginfod.html} for more information
++regarding @code{debuginfod}.
++
++@menu
++* Debuginfod Settings::		Configuring debuginfod with @value{GDBN}
++@end menu
++
++@node Debuginfod Settings
++@section Debuginfod Settings
++
++@value{GDBN} provides the following commands for configuring @code{debuginfod}.
++
++@table @code
++@kindex set debuginfod
++@anchor{set debuginfod}
++@item set debuginfod
++@itemx set debuginfod on
++@cindex enable debuginfod
++@value{GDBN} will attempt to query @code{debuginfod} servers when missing debug
++info or source files.
++
++@item set debuginfod off
++@value{GDBN} will not attempt to query @code{debuginfod} servers when missing
++debug info or source files.  By default, @code{debuginfod} is set to @code{off}
++for non-interactive sessions.
++
++@item set debuginfod ask
++@value{GDBN} will prompt the user to enable or disable @code{debuginfod} before
++attempting to perform the next query.  By default, @code{debuginfod} is set to
++@code{ask} for interactive sessions.
++
++@kindex show debuginfod status
++@item show debuginfod status
++Show whether @code{debuginfod} is set to @code{on}, @code{off} or @code{ask}.
++
++@kindex set debuginfod urls
++@cindex configure debuginfod URLs
++@item set debuginfod urls
++@itemx set debuginfod urls @var{urls}
++Set the space-separated list of URLs that @code{debuginfod} will attempt to
++query.  Only @code{http://}, @code{https://} and @code{file://} protocols
++should be used.  The default value of @code{debuginfod urls} is copied from
++the @var{DEBUGINFOD_URLS} environment variable.
++
++@kindex show debuginfod urls
++@item show debuginfod urls
++Display the list of URLs that @code{debuginfod} will attempt to query.
++
++@kindex set debuginfod verbose
++@cindex debuginfod verbosity
++@item set debuginfod verbose
++@itemx set debuginfod verbose @var{n}
++Enable or disable @code{debuginfod}-related output.  Use a non-zero value
++to enable and @code{0} to disable.  @code{debuginfod} output is shown by
++default.
++
++@kindex show debuginfod verbose
++@item show debuginfod verbose
++Show the current verbosity setting.
++
++@end table
++
+ @node Man Pages
+ @appendix Manual pages
+ @cindex Man pages

SOURCES/gdb-rhbz2024875-fix-unittest-failure.patch

@@ -0,0 +1,37 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= <ahajkova@redhat.com>
+Date: Tue, 11 Jan 2022 12:22:29 +0100
+Subject: gdb-rhbz2024875-fix-unittest-failure.patch
+
+;;Backport upstream commit from Tom Tromey
+;;2a8f1f47446 Fix unittest.exp failure due to 'set debuginfod' addition
+
+Fix unittest.exp failure due to 'set debuginfod' addition
+
+The 'set debuginfod' change caused a regression in unittest.exp:
+
+    Running selftest help_doc_invariants.
+    help doc broken invariant: command 'info set debuginfod' help doc first line is not terminated with a '.' character
+    help doc broken invariant: command 'set debuginfod' help doc first line is not terminated with a '.' character
+    help doc broken invariant: command 'show debuginfod' help doc first line is not terminated with a '.' character
+    Self test failed: self-test failed at ../../binutils-gdb/gdb/unittests/command-def-selftests.c:100
+
+This patch fixes the problem.  I'm checking it in.
+
+diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c
+--- a/gdb/debuginfod-support.c
++++ b/gdb/debuginfod-support.c
+@@ -390,11 +390,11 @@ _initialize_debuginfod ()
+ {
+   /* set/show debuginfod */
+   add_basic_prefix_cmd ("debuginfod", class_run,
+-                        _("Set debuginfod options"),
++                        _("Set debuginfod options."),
+                         &set_debuginfod_prefix_list, 0, &setlist);
+ 
+   add_show_prefix_cmd ("debuginfod", class_run,
+-                       _("Show debuginfod options"),
++                       _("Show debuginfod option."),
+                        &show_debuginfod_prefix_list, 0, &showlist);
+ 
+   /* set debuginfod on */

SOURCES/gdb-rhbz2024875-pr27026.patch

@@ -0,0 +1,60 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= <ahajkova@redhat.com>
+Date: Tue, 11 Jan 2022 13:22:44 +0100
+Subject: gdb-rhbz2024875-pr27026.patch
+
+;;Backport upstream commit from Aaron Merey
+;;b9db26b4c44 [PR gdb/27026] CTRL-C is ignored when debug info is downloaded
+
+[PR gdb/27026] CTRL-C is ignored when debug info is downloaded
+
+During debuginfod downloads, ctrl-c should result in the download
+being cancelled and skipped.  However in some cases, ctrl-c fails to
+get delivered to gdb during downloading.  This can result in downloads
+being unskippable.
+
+Fix this by ensuring that target_terminal::ours is in effect for the
+duration of each download.
+
+Co-authored-by: Tom de Vries <tdevries@suse.de>
+https://sourceware.org/bugzilla/show_bug.cgi?id=27026#c3
+
+diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c
+--- a/gdb/debuginfod-support.c
++++ b/gdb/debuginfod-support.c
+@@ -23,6 +23,7 @@
+ #include "gdbsupport/gdb_optional.h"
+ #include "cli/cli-cmds.h"
+ #include "cli/cli-style.h"
++#include "target.h"
+ 
+ /* Set/show debuginfod commands.  */
+ static cmd_list_element *set_debuginfod_prefix_list;
+@@ -208,6 +209,13 @@ debuginfod_source_query (const unsigned char *build_id,
+   user_data data ("source file", srcpath);
+ 
+   debuginfod_set_user_data (c, &data);
++  gdb::optional<target_terminal::scoped_restore_terminal_state> term_state;
++  if (target_supports_terminal_ours ())
++    {
++      term_state.emplace ();
++      target_terminal::ours ();
++    }
++
+   scoped_fd fd (debuginfod_find_source (c,
+ 					build_id,
+ 					build_id_len,
+@@ -246,6 +254,13 @@ debuginfod_debuginfo_query (const unsigned char *build_id,
+   user_data data ("separate debug info for", filename);
+ 
+   debuginfod_set_user_data (c, &data);
++  gdb::optional<target_terminal::scoped_restore_terminal_state> term_state;
++  if (target_supports_terminal_ours ())
++    {
++      term_state.emplace ();
++      target_terminal::ours ();
++    }
++
+   scoped_fd fd (debuginfod_find_debuginfo (c, build_id, build_id_len,
+ 					   &dname));
+   debuginfod_set_user_data (c, nullptr);

SOURCES/gdb-rhbz2024875-set_show-for-managing-debuginfod.patch

@@ -0,0 +1,414 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= <ahajkova@redhat.com>
+Date: Mon, 10 Jan 2022 13:35:45 +0100
+Subject: gdb-rhbz2024875-set_show-for-managing-debuginfod.patch
+
+;;Backport upstream commit from Aaron Merey
+;;7811fa5995f gdb: add set/show commands for managing debuginfo
+
+gdb: add set/show commands for managing debuginfod
+
+Add 'set debuginfod' command.  Accepts 'on', 'off' or 'ask' as an
+argument.  'on' enables debuginfod for the current session.  'off'
+disables debuginfod for the current session.  'ask' will prompt
+the user to either enable or disable debuginfod when the next query
+is about to be performed:
+
+    This GDB supports auto-downloading debuginfo from the following URLs:
+    <URL1> <URL2> ...
+    Enable debuginfod for this session? (y or [n]) y
+    Debuginfod has been enabled.
+    To make this setting permanent, add 'set debuginfod on' to .gdbinit.
+
+For interactive sessions, 'ask' is the default.  For non-interactive
+sessions, 'off' is the default.
+
+Add 'show debuginfod status' command.  Displays whether debuginfod
+is set to 'on', 'off' or 'ask'.
+
+Add 'set/show debuginfod urls' commands. Accepts a string of
+space-separated debuginfod server URLs to be queried.  The default
+value is copied from the DEBUGINFOD_URLS environment variable.
+
+Finally add 'set/show debuginfod verbose' commands to control whether
+debuginfod-related output is displayed.  Verbose output is enabled
+by default.
+
+    (gdb) run
+    Starting program: /bin/sleep 5
+    Download failed: No route to host.  Continuing without debug info for /lib64/libc.so.6.
+
+If GDB is not built with debuginfod then these commands will just display
+
+    Support for debuginfod is not compiled into GDB.
+
+diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c
+--- a/gdb/debuginfod-support.c
++++ b/gdb/debuginfod-support.c
+@@ -18,10 +18,26 @@
+ 
+ #include "defs.h"
+ #include <errno.h>
+-#include "cli/cli-style.h"
+ #include "gdbsupport/scoped_fd.h"
+ #include "debuginfod-support.h"
+ #include "gdbsupport/gdb_optional.h"
++#include "cli/cli-cmds.h"
++#include "cli/cli-style.h"
++
++/* Set/show debuginfod commands.  */
++static cmd_list_element *set_debuginfod_prefix_list;
++static cmd_list_element *show_debuginfod_prefix_list;
++
++static const char debuginfod_on[] = "on";
++static const char debuginfod_off[] = "off";
++static const char debuginfod_ask[] = "ask";
++
++static const char *debuginfod_enable = debuginfod_ask;
++static unsigned debuginfod_verbose = 1;
++
++/* This is never actually used.  URLs are always pulled from the
++   environment.  */
++static char *debuginfod_urls;
+ 
+ #ifndef HAVE_LIBDEBUGINFOD
+ scoped_fd
+@@ -41,6 +57,67 @@ debuginfod_debuginfo_query (const unsigned char *build_id,
+ {
+   return scoped_fd (-ENOSYS);
+ }
++
++#define NO_IMPL _("Support for debuginfod is not compiled into GDB.")
++
++/* Stub set/show commands that indicate debuginfod is not supported.  */
++
++static void
++set_debuginfod_on_command (const char *args, int from_tty)
++{
++  error (NO_IMPL);
++  debuginfod_enable = debuginfod_off;
++}
++
++static void
++set_debuginfod_off_command (const char *args, int from_tty)
++{
++  error (NO_IMPL);
++  debuginfod_enable = debuginfod_off;
++}
++
++static void
++set_debuginfod_ask_command (const char *args, int from_tty)
++{
++  error (NO_IMPL);
++  debuginfod_enable = debuginfod_off;
++}
++
++static void
++show_debuginfod_status_command (const char *args, int from_tty)
++{
++  error (NO_IMPL);
++}
++
++static void
++set_debuginfod_urls_command (const char *ignore, int from_tty,
++                             struct cmd_list_element *c)
++{
++  error (NO_IMPL);
++}
++
++static void
++show_debuginfod_urls_command (struct ui_file *file, int from_tty,
++			      struct cmd_list_element *cmd, const char *value)
++{
++  error (NO_IMPL);
++}
++
++static void
++set_debuginfod_verbose_command (const char *args, int from_tty,
++				struct cmd_list_element *c)
++{
++  error (NO_IMPL);
++  debuginfod_verbose = 0;
++}
++
++static void
++show_debuginfod_verbose_command (struct ui_file *file, int from_tty,
++				 struct cmd_list_element *cmd,
++				 const char *value)
++{
++  error (NO_IMPL);
++}
+ #else
+ #include <elfutils/debuginfod.h>
+ 
+@@ -68,6 +145,82 @@ struct debuginfod_client_deleter
+ using debuginfod_client_up
+   = std::unique_ptr<debuginfod_client, debuginfod_client_deleter>;
+ 
++/* Enable debuginfod.  */
++
++static void
++set_debuginfod_on_command (const char *args, int from_tty)
++{
++  debuginfod_enable = debuginfod_on;
++}
++
++/* Disable debuginfod.  */
++
++static void
++set_debuginfod_off_command (const char *args, int from_tty)
++{
++  debuginfod_enable = debuginfod_off;
++}
++
++/* Before next query, ask user whether to enable debuginfod.  */
++
++static void
++set_debuginfod_ask_command (const char *args, int from_tty)
++{
++  debuginfod_enable = debuginfod_ask;
++}
++
++/* Show whether debuginfod is enabled.  */
++
++static void
++show_debuginfod_status_command (const char *args, int from_tty)
++{
++  printf_unfiltered (_("Debuginfod functionality is currently set to " \
++		     "\"%s\".\n"), debuginfod_enable);
++}
++
++/* Set the URLs that debuginfod will query.  */
++
++static void
++set_debuginfod_urls_command (const char *ignore, int from_tty,
++                             struct cmd_list_element *c)
++{
++  gdb_assert (debuginfod_urls != nullptr);
++  if (setenv ("DEBUGINFOD_URLS", debuginfod_urls, 1) != 0)
++    warning (_("Unable to set debuginfod URLs: %s"), safe_strerror (errno));
++}
++
++/* Show the URLs that debuginfod will query.  */
++
++static void
++show_debuginfod_urls_command (struct ui_file *file, int from_tty,
++			      struct cmd_list_element *cmd, const char *value)
++{
++  if (value == nullptr || value[0] == '\0')
++    fprintf_unfiltered (file, _("Debuginfod URLs have not been set.\n"));
++  else
++    fprintf_filtered (file, _("Debuginfod URLs are currently set to:\n%s\n"),
++		      value);
++}
++
++/* No-op setter used for compatibility when gdb is built without debuginfod.  */
++
++static void
++set_debuginfod_verbose_command (const char *args, int from_tty,
++				struct cmd_list_element *c)
++{
++  return;
++}
++
++/* Show verbosity.  */
++
++static void
++show_debuginfod_verbose_command (struct ui_file *file, int from_tty,
++				 struct cmd_list_element *cmd, const char *value)
++{
++  fprintf_filtered (file, _("Debuginfod verbose output is set to %s.\n"),
++		    value);
++}
++
+ static int
+ progressfn (debuginfod_client *c, long cur, long total)
+ {
+@@ -120,6 +273,42 @@ get_debuginfod_client ()
+   return global_client.get ();
+ }
+ 
++/* Check if debuginfod is enabled.  If configured to do so, ask the user
++   whether to enable debuginfod.  */
++
++static bool
++debuginfod_enabled ()
++{
++  const char *urls = getenv (DEBUGINFOD_URLS_ENV_VAR);
++
++  if (urls == nullptr || urls[0] == '\0'
++      || debuginfod_enable == debuginfod_off)
++    return false;
++
++  if (debuginfod_enable == debuginfod_ask)
++    {
++      int resp = nquery (_("\nThis GDB supports auto-downloading debuginfo " \
++			   "from the following URLs:\n%s\nEnable debuginfod " \
++			   "for this session? "),
++			 urls);
++      if (!resp)
++	{
++	  printf_filtered (_("Debuginfod has been disabled.\nTo make this " \
++			     "setting permanent, add \'set debuginfod off\' " \
++			     "to .gdbinit.\n"));
++	  debuginfod_enable = debuginfod_off;
++	  return false;
++	}
++
++      printf_filtered (_("Debuginfod has been enabled.\nTo make this " \
++			 "setting permanent, add \'set debuginfod on\' " \
++			 "to .gdbinit.\n"));
++      debuginfod_enable = debuginfod_on;
++    }
++
++  return true;
++}
++
+ /* See debuginfod-support.h  */
+ 
+ scoped_fd
+@@ -128,8 +317,7 @@ debuginfod_source_query (const unsigned char *build_id,
+ 			 const char *srcpath,
+ 			 gdb::unique_xmalloc_ptr<char> *destname)
+ {
+-  const char *urls_env_var = getenv (DEBUGINFOD_URLS_ENV_VAR);
+-  if (urls_env_var == NULL || urls_env_var[0] == '\0')
++  if (!debuginfod_enabled ())
+     return scoped_fd (-ENOSYS);
+ 
+   debuginfod_client *c = get_debuginfod_client ();
+@@ -147,8 +335,7 @@ debuginfod_source_query (const unsigned char *build_id,
+ 					nullptr));
+   debuginfod_set_user_data (c, nullptr);
+ 
+-  /* TODO: Add 'set debug debuginfod' command to control when error messages are shown.  */
+-  if (fd.get () < 0 && fd.get () != -ENOENT)
++  if (debuginfod_verbose > 0 && fd.get () < 0 && fd.get () != -ENOENT)
+     printf_filtered (_("Download failed: %s.  Continuing without source file %ps.\n"),
+ 		     safe_strerror (-fd.get ()),
+ 		     styled_string (file_name_style.style (),  srcpath));
+@@ -167,8 +354,7 @@ debuginfod_debuginfo_query (const unsigned char *build_id,
+ 			    const char *filename,
+ 			    gdb::unique_xmalloc_ptr<char> *destname)
+ {
+-  const char *urls_env_var = getenv (DEBUGINFOD_URLS_ENV_VAR);
+-  if (urls_env_var == NULL || urls_env_var[0] == '\0')
++  if (!debuginfod_enabled ())
+     return scoped_fd (-ENOSYS);
+ 
+   debuginfod_client *c = get_debuginfod_client ();
+@@ -184,7 +370,7 @@ debuginfod_debuginfo_query (const unsigned char *build_id,
+ 					   &dname));
+   debuginfod_set_user_data (c, nullptr);
+ 
+-  if (fd.get () < 0 && fd.get () != -ENOENT)
++  if (debuginfod_verbose > 0 && fd.get () < 0 && fd.get () != -ENOENT)
+     printf_filtered (_("Download failed: %s.  Continuing without debug info for %ps.\n"),
+ 		     safe_strerror (-fd.get ()),
+ 		     styled_string (file_name_style.style (),  filename));
+@@ -195,3 +381,63 @@ debuginfod_debuginfo_query (const unsigned char *build_id,
+   return fd;
+ }
+ #endif
++
++/* Register debuginfod commands.  */
++
++void _initialize_debuginfod ();
++void
++_initialize_debuginfod ()
++{
++  /* set/show debuginfod */
++  add_basic_prefix_cmd ("debuginfod", class_run,
++                        _("Set debuginfod options"),
++                        &set_debuginfod_prefix_list, 0, &setlist);
++
++  add_show_prefix_cmd ("debuginfod", class_run,
++                       _("Show debuginfod options"),
++                       &show_debuginfod_prefix_list, 0, &showlist);
++
++  /* set debuginfod on */
++  add_cmd ("on", class_run, set_debuginfod_on_command,
++	   _("Enable debuginfod."), &set_debuginfod_prefix_list);
++
++  /* set debuginfod off */
++  add_cmd ("off", class_run, set_debuginfod_off_command,
++	   _("Disable debuginfod."), &set_debuginfod_prefix_list);
++
++  /* set debuginfod ask */
++  add_cmd ("ask", class_run, set_debuginfod_ask_command, _("\
++Ask the user whether to enable debuginfod before performing the next query."),
++	   &set_debuginfod_prefix_list);
++
++  /* show debuginfod status */
++  add_cmd ("status", class_run, show_debuginfod_status_command,
++	   _("Show whether debuginfod is set to \"on\", \"off\" or \"ask\"."),
++	   &show_debuginfod_prefix_list);
++
++  /* set/show debuginfod urls */
++  add_setshow_string_noescape_cmd ("urls", class_run, &debuginfod_urls, _("\
++Set the list of debuginfod server URLs."), _("\
++Show the list of debuginfod server URLs."), _("\
++Manage the space-separated list of debuginfod server URLs that GDB will query \
++when missing debuginfo, executables or source files.\nThe default value is \
++copied from the DEBUGINFOD_URLS environment variable."),
++				   set_debuginfod_urls_command,
++				   show_debuginfod_urls_command,
++				   &set_debuginfod_prefix_list,
++				   &show_debuginfod_prefix_list);
++  if (getenv ("DEBUGINFOD_URLS") != nullptr)
++    debuginfod_urls = xstrdup (getenv ("DEBUGINFOD_URLS"));
++
++  /* set/show debuginfod verbose */
++  add_setshow_zuinteger_cmd ("verbose", class_support,
++			     &debuginfod_verbose, _("\
++Set verbosity of debuginfod output."), _("\
++Show debuginfod debugging."), _("\
++When set to a non-zero value, display verbose output for each debuginfod \
++query.\nTo disable, set to zero.  Verbose output is displayed by default."),
++			     set_debuginfod_verbose_command,
++			     show_debuginfod_verbose_command,
++			     &set_debuginfod_prefix_list,
++			     &show_debuginfod_prefix_list);
++}
+diff --git a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
+--- a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
++++ b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
+@@ -217,7 +217,8 @@ proc local_url { } {
+     setenv DEBUGINFOD_URLS http://127.0.0.1:$port
+ 
+     # gdb should now find the symbol and source files
+-    clean_restart $binfile
++    clean_restart
++    gdb_test "file $binfile" "" "file [file tail $binfile]" "Enable debuginfod?.*" "y"
+     gdb_test_no_output "set substitute-path $outputdir /dev/null" \
+ 	"set substitute-path"
+     gdb_test "br main" "Breakpoint 1 at.*file.*"
+@@ -226,8 +227,26 @@ proc local_url { } {
+     # gdb should now find the debugaltlink file
+     clean_restart
+     gdb_test "file ${binfile}_alt.o" \
+-	".*Reading symbols from ${binfile}_alt.o\.\.\.*" \
+-	"file [file tail ${binfile}_alt.o]"
++	".*Downloading.*separate debug info.*" \
++	"file [file tail ${binfile}_alt.o]" \
++	".*Enable debuginfod?.*" "y"
++
++    # Configure debuginfod with commands
++    unsetenv DEBUGINFOD_URLS
++    clean_restart
++    gdb_test "file $binfile" ".*No debugging symbols.*" \
++	"file [file tail $binfile] cmd"
++    gdb_test_no_output "set debuginfod off"
++    gdb_test_no_output "set debuginfod urls http://127.0.0.1:$port"
++
++    # gdb shouldn't find the debuginfo since debuginfod has been disabled
++    gdb_test "file $binfile" ".*No debugging symbols.*" \
++	"file [file tail $binfile] cmd off"
++
++    # Enable debuginfod and fetch the debuginfo
++    gdb_test_no_output "set debuginfod on"
++    gdb_test "file $binfile" ".*Reading symbols from.*debuginfo.*" \
++	"file [file tail $binfile] cmd on"
+ }
+ 
+ set envlist \

SOURCES/gdb-rhbz2042257-ftbs-updates.patch

@@ -0,0 +1,101 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Keith Seitz <keiths@redhat.com>
+Date: Wed, 26 Jan 2022 08:56:18 -0800
+Subject: gdb-rhbz2042257-ftbs-updates.patch
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+;; Fix build problems.
+;; (RHBZ 2042257, Keith Seitz, Andrew Burgess)
+
+1) Reference array of structs instead of first member during memcpy
+
+aarch64-tdep.c defines the following macro:
+
+        do  \
+          { \
+            unsigned int mem_len = LENGTH; \
+            if (mem_len) \
+              { \
+                MEMS =  XNEWVEC (struct aarch64_mem_r, mem_len);  \
+                memcpy(&MEMS->len, &RECORD_BUF[0], \
+                       sizeof(struct aarch64_mem_r) * LENGTH); \
+              } \
+          } \
+          while (0)
+
+This is simlpy allocating a new array and copying it. However, for
+the destination address, it is actually copying into the first member
+of the first element of the array (`&MEMS->len"). This elicits a
+warning with GCC 12:
+
+../../binutils-gdb/gdb/aarch64-tdep.c: In function ‘int aarch64_process_record(gdbarch*, regcache*, CORE_ADDR)’:
+../../binutils-gdb/gdb/aarch64-tdep.c:3711:23: error: writing 16 bytes into a region of size 8 [-Werror=stringop-overflow=]
+ 3711 |                 memcpy(&MEMS->len, &RECORD_BUF[0], \
+      |                       ^
+../../binutils-gdb/gdb/aarch64-tdep.c:4394:3: note: in expansion of macro ‘MEM_ALLOC’
+ 4394 |   MEM_ALLOC (aarch64_insn_r->aarch64_mems, aarch64_insn_r->mem_rec_count,
+      |   ^~~~~~~~~
+../../binutils-gdb/gdb/aarch64-tdep.c:3721:12: note: destination object ‘aarch64_mem_r::len’ of size 8
+ 3721 |   uint64_t len;    /* Record length.  */
+      |            ^~~
+
+The simple fix is to reference the array, `MEMS' as the destination of the copy.
+
+Tested by rebuilding.
+
+2)     Fix build with current GCC: EL_EXPLICIT(location) always non-NULL
+
+    Compiling GDB with current GCC (1b4a63593b) runs into this:
+
+      src/gdb/location.c: In function 'int event_location_empty_p(const event_location*)':
+      src/gdb/location.c:963:38: error: the address of 'event_location::<unnamed union>::explicit_loc' will never be NULL [-Werror=address]
+        963 |       return (EL_EXPLICIT (location) == NULL
+            |                                      ^
+      src/gdb/location.c:57:30: note: 'event_location::<unnamed union>::explicit_loc' declared here
+         57 |     struct explicit_location explicit_loc;
+            |                              ^~~~~~~~~~~~
+
+    GCC is right, EL_EXPLICIT is defined as returning the address of an
+    union field:
+
+          /* An explicit location.  */
+          struct explicit_location explicit_loc;
+      #define EL_EXPLICIT(P) (&((P)->u.explicit_loc))
+
+    and thus must always be non-NULL.
+
+diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
+--- a/gdb/aarch64-tdep.c
++++ b/gdb/aarch64-tdep.c
+@@ -3666,7 +3666,7 @@ When on, AArch64 specific debugging is enabled."),
+ 	    if (mem_len) \
+ 	      { \
+ 		MEMS =  XNEWVEC (struct aarch64_mem_r, mem_len);  \
+-		memcpy(&MEMS->len, &RECORD_BUF[0], \
++		memcpy(MEMS, &RECORD_BUF[0], \
+ 		       sizeof(struct aarch64_mem_r) * LENGTH); \
+ 	      } \
+ 	  } \
+diff --git a/gdb/location.c b/gdb/location.c
+--- a/gdb/location.c
++++ b/gdb/location.c
+@@ -960,12 +960,11 @@ event_location_empty_p (const struct event_location *location)
+       return 0;
+ 
+     case EXPLICIT_LOCATION:
+-      return (EL_EXPLICIT (location) == NULL
+-	      || (EL_EXPLICIT (location)->source_filename == NULL
+-		  && EL_EXPLICIT (location)->function_name == NULL
+-		  && EL_EXPLICIT (location)->label_name == NULL
+-		  && (EL_EXPLICIT (location)->line_offset.sign
+-		      == LINE_OFFSET_UNKNOWN)));
++      return (EL_EXPLICIT (location)->source_filename == NULL
++	      && EL_EXPLICIT (location)->function_name == NULL
++	      && EL_EXPLICIT (location)->label_name == NULL
++	      && (EL_EXPLICIT (location)->line_offset.sign
++		  == LINE_OFFSET_UNKNOWN));
+ 
+     case PROBE_LOCATION:
+       return EL_PROBE (location) == NULL;

SOURCES/gdb-rhbz2042664-fix-sect_index_data-internal-error.patch

@@ -0,0 +1,128 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Tue, 1 Feb 2022 11:32:48 -0700
+Subject: gdb-rhbz2042664-fix-sect_index_data-internal-error.patch
+
+;; Backport fix which fixes internal error due to libcc_s lacking a
+;; .data section.
+
+Fix GDB internal error by using text (instead of data) section offset
+
+Fedora Rawhide is now using gcc-12.0.  As part of updating to the
+gcc-12.0 package set, Rawhide is also now using a version of libgcc_s
+which lacks a .data section.  This causes gdb to fail in the following
+fashion while debugging a program (such as gdb) which uses libgcc_s:
+
+    (top-gdb) run
+    Starting program: rawhide-master/bld/gdb/gdb
+    ...
+    objfiles.h:467: internal-error: sect_index_data not initialized
+    A problem internal to GDB has been detected,
+    further debugging may prove unreliable.
+    ...
+
+I snipped the backtrace from the above output.  Instead, here's a
+portion of a backtrace obtained using GDB's backtrace command.
+(Obviously, in order to obtain it, I used a GDB which has been patched
+with this commit.)
+
+    #0  internal_error (
+	file=0xc6a508 "gdb/objfiles.h", line=467,
+	fmt=0xc6a4e8 "sect_index_data not initialized")
+	at gdbsupport/errors.cc:51
+    #1  0x00000000005f9651 in objfile::data_section_offset (this=0x4fa48f0)
+	at gdb/objfiles.h:467
+    #2  0x000000000097c5f8 in relocate_address (address=0x17244, objfile=0x4fa48f0)
+	at gdb/stap-probe.c:1333
+    #3  0x000000000097c630 in stap_probe::get_relocated_address (this=0xa1a17a0,
+	objfile=0x4fa48f0)
+	at gdb/stap-probe.c:1341
+    #4  0x00000000004d7025 in create_exception_master_breakpoint_probe (
+	objfile=0x4fa48f0)
+	at gdb/breakpoint.c:3505
+    #5  0x00000000004d7426 in create_exception_master_breakpoint ()
+	at gdb/breakpoint.c:3575
+    #6  0x00000000004efcc1 in breakpoint_re_set ()
+	at gdb/breakpoint.c:13407
+    #7  0x0000000000956998 in solib_add (pattern=0x0, from_tty=0, readsyms=1)
+	at gdb/solib.c:1001
+    #8  0x00000000009576a8 in handle_solib_event ()
+	at gdb/solib.c:1269
+    ...
+
+The function 'relocate_address' in gdb/stap-probe.c attempts to do
+its "relocation" by using objfile->data_section_offset().  That
+method, data_section_offset() is defined as follows in objfiles.h:
+
+  CORE_ADDR data_section_offset () const
+  {
+    return section_offsets[SECT_OFF_DATA (this)];
+  }
+
+The internal error occurs when the SECT_OFF_DATA macro finds that the
+'sect_index_data' field is -1:
+
+    #define SECT_OFF_DATA(objfile) \
+	 ((objfile->sect_index_data == -1) \
+	  ? (internal_error (__FILE__, __LINE__, \
+			     _("sect_index_data not initialized")), -1)	\
+	  : objfile->sect_index_data)
+
+relocate_address() is obtaining the section offset in order to compute
+a relocated address.  For some ABIs, such as the System V ABI, the
+section offsets will all be the same.  So for those ABIs, it doesn't
+matter which offset is used.  However, other ABIs, such as the FDPIC
+ABI, will have different offsets for the various sections.  Thus, for
+those ABIs, it is vital that this and other relocation code use the
+correct offset.
+
+In stap_probe::get_relocated_address, the address to which to add the
+offset (thus forming the relocated address) is obtained via
+this->get_address (); get_address is a getter for m_address in
+probe.h.  It's documented/defined as follows (also in probe.h):
+
+  /* The address where the probe is inserted, relative to
+     SECT_OFF_TEXT.  */
+  CORE_ADDR m_address;
+
+(Thanks to Tom Tromey for this observation.)
+
+So, based on this, the current use of data_section_offset /
+SECT_OFF_DATA is wrong.  This relocation code should have been using
+text_section_offset / SECT_OFF_TEXT all along.  That being the
+case, I've adjusted the stap-probe.c relocation code accordingly.
+
+Searching the sources turned up one other use of data_section_offset,
+in gdb/dtrace-probe.c, so I've updated that code as well.  The same
+reasoning presented above applies to this case too.
+
+Summary:
+
+	* gdb/dtrace-probe.c (dtrace_probe::get_relocated_address):
+	Use method text_section_offset instead of data_section_offset.
+	* gdb/stap-probe.c (relocate_address): Likewise.
+
+diff --git a/gdb/dtrace-probe.c b/gdb/dtrace-probe.c
+--- a/gdb/dtrace-probe.c
++++ b/gdb/dtrace-probe.c
+@@ -684,7 +684,7 @@ dtrace_probe::is_enabled () const
+ CORE_ADDR
+ dtrace_probe::get_relocated_address (struct objfile *objfile)
+ {
+-  return this->get_address () + objfile->data_section_offset ();
++  return this->get_address () + objfile->text_section_offset ();
+ }
+ 
+ /* Implementation of the get_argument_count method.  */
+diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
+--- a/gdb/stap-probe.c
++++ b/gdb/stap-probe.c
+@@ -1330,7 +1330,7 @@ stap_probe::parse_arguments (struct gdbarch *gdbarch)
+ static CORE_ADDR
+ relocate_address (CORE_ADDR address, struct objfile *objfile)
+ {
+-  return address + objfile->data_section_offset ();
++  return address + objfile->text_section_offset ();
+ }
+ 
+ /* Implementation of the get_relocated_address method.  */

SOURCES/gdb-rhbz2068280-debuginfod-unavailable-size.patch

@@ -0,0 +1,94 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Wed, 30 Mar 2022 13:28:26 -0700
+Subject: gdb-rhbz2068280-debuginfod-unavailable-size.patch
+
+;; Backport upstream patch from Aaron Merey which suppresses debuginfod
+;; progress messages when size is zero.  (RH BZ 2068280).
+
+Remove download size from debuginfod progress messages if unavailable
+
+Currently debuginfod progress update messages include the size of
+each download:
+
+  Downloading 7.5 MB separate debug info for /lib/libxyz.so.0
+
+This value originates from the Content-Length HTTP header of the
+transfer.  However this header is not guaranteed to be present for
+each download.  This can happen when debuginfod servers compress files
+on-the-fly at the time of transfer.  In this case gdb wrongly prints
+"-0.00 MB" as the size.
+
+This patch removes download sizes from progress messages when they are
+not available.  It also removes usage of the progress bar until
+a more thorough reworking of progress updating is implemented. [1]
+
+[1] https://sourceware.org/pipermail/gdb-patches/2022-February/185798.html
+
+diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c
+--- a/gdb/debuginfod-support.c
++++ b/gdb/debuginfod-support.c
+@@ -81,12 +81,12 @@ debuginfod_debuginfo_query (const unsigned char *build_id,
+ struct user_data
+ {
+   user_data (const char *desc, const char *fname)
+-    : desc (desc), fname (fname)
++    : desc (desc), fname (fname), has_printed (false)
+   { }
+ 
+   const char * const desc;
+   const char * const fname;
+-  gdb::optional<ui_out::progress_meter> meter;
++  bool has_printed;
+ };
+ 
+ /* Deleter for a debuginfod_client.  */
+@@ -116,24 +116,32 @@ progressfn (debuginfod_client *c, long cur, long total)
+       return 1;
+     }
+ 
+-  if (total == 0)
+-    return 0;
+-
+-  if (!data->meter.has_value ())
++  if (!data->has_printed)
+     {
+-      float size_in_mb = 1.0f * total / (1024 * 1024);
+-      string_file styled_filename (current_uiout->can_emit_style_escape ());
+-      fprintf_styled (&styled_filename,
+-		      file_name_style.style (),
+-		      "%s",
+-		      data->fname);
+-      std::string message
+-	= string_printf ("Downloading %.2f MB %s %s", size_in_mb, data->desc,
+-			 styled_filename.c_str());
+-      data->meter.emplace (current_uiout, message, 1);
+-    }
++      /* Include the transfer size, if available.  */
++      if (total > 0)
++	{
++	  float size = 1.0f * total / 1024;
++	  const char *unit = "KB";
++
++	  /* If size is greater than 0.01 MB, set unit to MB.  */
++	  if (size > 10.24)
++	    {
++	      size /= 1024;
++	      unit = "MB";
++	    }
++
++	  printf_filtered ("Downloading %.2f %s %s %ps...\n",
++			   size, unit, data->desc,
++			   styled_string (file_name_style.style (),
++					  data->fname));
++	}
++      else
++	printf_filtered ("Downloading %s %ps...\n", data->desc,
++			 styled_string (file_name_style.style (), data->fname));
+ 
+-  current_uiout->progress ((double)cur / (double)total);
++      data->has_printed = true;
++    }
+ 
+   return 0;
+ }

SOURCES/gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch

@@ -0,0 +1,147 @@
+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-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+
+;; Import regression test for `gdb/findvar.c:417: internal-error:
+;; read_var_value: Assertion `frame' failed.' (RH BZ 947564) from RHEL 6.5.
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.threads/tls-rhbz947564.cc b/gdb/testsuite/gdb.threads/tls-rhbz947564.cc
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/tls-rhbz947564.cc
+@@ -0,0 +1,53 @@
++#include <iostream>
++#include <pthread.h>
++
++class x
++  {
++  public:
++    int n;
++
++    x() : n(0) {}
++  };
++
++class y
++  {
++  public:
++    int v;
++
++    y() : v(0) {}
++    static __thread x *xp;
++  };
++
++__thread x *y::xp;
++
++static void
++foo (y *yp)
++{
++  yp->v = 1;   /* foo_marker */
++}
++
++static void *
++bar (void *unused)
++{
++  x xinst;
++  y::xp= &xinst;
++
++  y yy;
++  foo(&yy);
++
++  return NULL;
++}
++
++int
++main(int argc, char *argv[])
++{
++  pthread_t t[2];
++
++  pthread_create (&t[0], NULL, bar, NULL);
++  pthread_create (&t[1], NULL, bar, NULL);
++
++  pthread_join (t[0], NULL);
++  pthread_join (t[1], NULL);
++
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.threads/tls-rhbz947564.exp b/gdb/testsuite/gdb.threads/tls-rhbz947564.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/tls-rhbz947564.exp
+@@ -0,0 +1,75 @@
++# Copyright (C) 2013 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 tls-rhbz947564
++set srcfile ${testfile}.cc
++set binfile [standard_output_file ${testfile}]
++
++if [istarget "*-*-linux"] then {
++    set target_cflags "-D_MIT_POSIX_THREADS"
++} else {
++    set target_cflags ""
++}
++
++if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list c++ debug]] != "" } {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++
++gdb_load ${binfile}
++
++if { ![runto_main] } {
++    fail "Can't run to function main"
++    return 0
++}
++
++gdb_breakpoint "foo"
++gdb_continue_to_breakpoint "foo" ".* foo_marker .*"
++
++proc get_xp_val {try} {
++    global expect_out
++    global gdb_prompt
++    global hex
++
++    set xp_val ""
++    gdb_test_multiple "print *yp" "print yp value" {
++	-re { = \{v = 0, static xp = (0x[0-9a-f]+)\}.* } {
++	    pass "print $try value of *yp"
++	    set xp_val $expect_out(1,string)
++	}
++	-re "$gdb_prompt $" {
++	    fail "print $try value of *yp"
++	}
++	timeout {
++	    fail "print $try value of *yp (timeout)"
++	}
++    }
++    return $xp_val
++}
++
++set first_run [get_xp_val "first"]
++
++gdb_test "continue" "Breakpoint \[0-9\]+, foo \\\(yp=$hex\\\) at.*"
++
++set second_run [get_xp_val "second"]
++
++if { $first_run != $second_run } {
++    pass "different values for TLS variable"
++} else {
++    fail "different values for TLS variable"
++}

SOURCES/gdb-rhel5.9-testcase-xlf-var-inside-mod.patch

@@ -0,0 +1,731 @@
+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-rhel5.9-testcase-xlf-var-inside-mod.patch
+
+;; Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789).
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.fortran/xlf-variable.S b/gdb/testsuite/gdb.fortran/xlf-variable.S
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.fortran/xlf-variable.S
+@@ -0,0 +1,638 @@
++/* Copyright (C) 2012 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/>.  */
++
++/* This file has been generated from the file named `xlf-variable.f', which
++   should be present in this directory.  The command used to generate this
++   file was:
++
++     xlf -qnoopt -g9 -S xlf-variable.f -o xlf-variable.S
++
++   After issuing this command, you must hand-edit this file and remove the
++   mentions for `_xlfExit', since it is only present in XLF-specific
++   libraries.  You must also make sure to remove the file named `mod1.mod'
++   which will be created in the compilation directory.
++
++   In order to generated this file, the following XLF package was used:
++
++     xlf.14.1.0.0.linux.eval.tar.gz
++
++   These instructions may be different for different versions of the XLF
++   compiler.  */
++
++.set r0,0; .set SP,1; .set RTOC,2; .set r3,3; .set r4,4
++.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
++.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
++.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
++.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
++.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
++.set r30,30; .set r31,31
++.set fp0,0; .set fp1,1; .set fp2,2; .set fp3,3; .set fp4,4
++.set fp5,5; .set fp6,6; .set fp7,7; .set fp8,8; .set fp9,9
++.set fp10,10; .set fp11,11; .set fp12,12; .set fp13,13; .set fp14,14
++.set fp15,15; .set fp16,16; .set fp17,17; .set fp18,18; .set fp19,19
++.set fp20,20; .set fp21,21; .set fp22,22; .set fp23,23; .set fp24,24
++.set fp25,25; .set fp26,26; .set fp27,27; .set fp28,28; .set fp29,29
++.set fp30,30; .set fp31,31
++.set v0,0; .set v1,1; .set v2,2; .set v3,3; .set v4,4
++.set v5,5; .set v6,6; .set v7,7; .set v8,8; .set v9,9
++.set v10,10; .set v11,11; .set v12,12; .set v13,13; .set v14,14
++.set v15,15; .set v16,16; .set v17,17; .set v18,18; .set v19,19
++.set v20,20; .set v21,21; .set v22,22; .set v23,23; .set v24,24
++.set v25,25; .set v26,26; .set v27,27; .set v28,28; .set v29,29
++.set v30,30; .set v31,31
++.set q0,0; .set q1,1; .set q2,2; .set q3,3; .set q4,4
++.set q5,5; .set q6,6; .set q7,7; .set q8,8; .set q9,9
++.set q10,10; .set q11,11; .set q12,12; .set q13,13; .set q14,14
++.set q15,15; .set q16,16; .set q17,17; .set q18,18; .set q19,19
++.set q20,20; .set q21,21; .set q22,22; .set q23,23; .set q24,24
++.set q25,25; .set q26,26; .set q27,27; .set q28,28; .set q29,29
++.set q30,30; .set q31,31
++.set MQ,0; .set XER,1; .set FROM_RTCU,4; .set FROM_RTCL,5; .set FROM_DEC,6
++.set LR,8; .set CTR,9; .set TID,17; .set DSISR,18; .set DAR,19; .set TO_RTCU,20
++.set TO_RTCL,21; .set TO_DEC,22; .set SDR_0,24; .set SDR_1,25; .set SRR_0,26
++.set SRR_1,27
++.set BO_dCTR_NZERO_AND_NOT,0; .set BO_dCTR_NZERO_AND_NOT_1,1
++.set BO_dCTR_ZERO_AND_NOT,2; .set BO_dCTR_ZERO_AND_NOT_1,3
++.set BO_IF_NOT,4; .set BO_IF_NOT_1,5; .set BO_IF_NOT_2,6
++.set BO_IF_NOT_3,7; .set BO_dCTR_NZERO_AND,8; .set BO_dCTR_NZERO_AND_1,9
++.set BO_dCTR_ZERO_AND,10; .set BO_dCTR_ZERO_AND_1,11; .set BO_IF,12
++.set BO_IF_1,13; .set BO_IF_2,14; .set BO_IF_3,15; .set BO_dCTR_NZERO,16
++.set BO_dCTR_NZERO_1,17; .set BO_dCTR_ZERO,18; .set BO_dCTR_ZERO_1,19
++.set BO_ALWAYS,20; .set BO_ALWAYS_1,21; .set BO_ALWAYS_2,22
++.set BO_ALWAYS_3,23; .set BO_dCTR_NZERO_8,24; .set BO_dCTR_NZERO_9,25
++.set BO_dCTR_ZERO_8,26; .set BO_dCTR_ZERO_9,27; .set BO_ALWAYS_8,28
++.set BO_ALWAYS_9,29; .set BO_ALWAYS_10,30; .set BO_ALWAYS_11,31
++.set CR0_LT,0; .set CR0_GT,1; .set CR0_EQ,2; .set CR0_SO,3
++.set CR1_FX,4; .set CR1_FEX,5; .set CR1_VX,6; .set CR1_OX,7
++.set CR2_LT,8; .set CR2_GT,9; .set CR2_EQ,10; .set CR2_SO,11
++.set CR3_LT,12; .set CR3_GT,13; .set CR3_EQ,14; .set CR3_SO,15
++.set CR4_LT,16; .set CR4_GT,17; .set CR4_EQ,18; .set CR4_SO,19
++.set CR5_LT,20; .set CR5_GT,21; .set CR5_EQ,22; .set CR5_SO,23
++.set CR6_LT,24; .set CR6_GT,25; .set CR6_EQ,26; .set CR6_SO,27
++.set CR7_LT,28; .set CR7_GT,29; .set CR7_EQ,30; .set CR7_SO,31
++.set TO_LT,16; .set TO_GT,8; .set TO_EQ,4; .set TO_LLT,2; .set TO_LGT,1
++
++	.file	"xlf-variable.f"
++	.globl	__mod1_NMOD_____mod1
++	.type	__mod1_NMOD_____mod1,@function
++	.size	__mod1_NMOD_____mod1,32
++	.globl	main
++	.type	main,@function
++	.size	main,68
++	.globl	__mod1_NMOD_sub1
++	.type	__mod1_NMOD_sub1,@function
++	.size	__mod1_NMOD_sub1,136
++	.globl	_main
++	.type	_main,@function
++	.size	_main,68
++
++	.section	".text"
++	.align	7
++.LC.text:
++__mod1_NMOD_____mod1:
++	stwu       SP,-32(SP)
++	stw        r31,28(SP)
++	or         r31,SP,SP
++	b          $+0x4
++	addi       r11,r31,32
++	lwz        r31,-4(r11)
++	or         SP,r11,r11
++	bclr       BO_ALWAYS,CR0_LT
++.LC.text32:
++
++__mod1_NMOD_sub1:
++	stwu       SP,-32(SP)
++	stw        r31,28(SP)
++	stw        r30,24(SP)
++	or         r31,SP,SP
++	addis      r30,r0,.const_dr@ha
++	addi       r30,r30,.const_dr@l
++	addis      r3,r0,__N_mod1@ha
++	addi       r3,r3,__N_mod1@l
++	addi       r0,r0,1
++	stb        r0,4(r3)
++	addi       r4,r0,14
++	stb        r4,5(r3)
++	stb        r0,7(r3)
++	addis      r5,r0,__N__mod1@ha
++	addi       r5,r5,__N__mod1@l
++	stw        r5,0(r3)
++	lbz        r5,6(r3)
++	rlwinm     r5,r5,0,25,25
++	ori        r5,r5,0x0040
++	stb        r5,6(r3)
++	lwz        r5,0(r3)
++	lfs        fp0,0(r30)
++	stfs       fp0,0(r5)
++	stb        r0,4(r3)
++	stb        r4,5(r3)
++	addi       r4,r0,0
++	stb        r4,6(r3)
++	stb        r0,7(r3)
++	b          $+0x4
++	addi       r11,r31,32
++	lwz        r30,-8(r11)
++	lwz        r31,-4(r11)
++	or         SP,r11,r11
++	bclr       BO_ALWAYS,CR0_LT
++.LC.text168:
++	.long 0
++	.skip 0x54
++.LC.text256:
++
++main:
++_main:
++	mfspr      r0,LR
++	stwu       SP,-32(SP)
++	stw        r31,28(SP)
++	stw        r0,36(SP)
++	or         r31,SP,SP
++	bl         __mod1_NMOD_sub1
++	addi       r3,r0,0
++.LC.text288:
++
++	tw         TO_EQ,r14,r14
++	addi       r3,r0,0
++	b          $+0x4
++	addi       r11,r31,32
++	lwz        r31,-4(r11)
++	lwz        r0,4(r11)
++	mtspr      LR,r0
++	or         SP,r11,r11
++	bclr       BO_ALWAYS,CR0_LT
++.LC.text324:
++
++
++	.section	".rodata","a"
++	.align	2
++.LC.rodata:
++	.type    .const_dr,@object
++	.size    .const_dr,4
++.const_dr:
++	.long 0x40400000
++
++	.section	".eh_frame","wa"
++	.align	2
++.LC.eh_frame:
++	.long 0x0000000c
++	.long 0x00000000
++	.long 0x0100047c
++	.long 0x410c0100
++	.long 0x0000001c
++	.long 0x00000014
++	.long .LC.text
++	.long 0x00000020
++	.long 0x410e2041
++	.long 0x9f01410d
++	.long 0x1f410a42
++	.long 0xdf420b00
++	.long 0x00000020
++	.long 0x00000034
++	.long .LC.text32
++	.long 0x00000088
++	.long 0x410e2041
++	.long 0x9f01419e
++	.long 0x02410d1f
++	.long 0x590a42de
++	.long 0x41df420b
++	.long 0x0000000c
++	.long 0x00000000
++	.long 0x0100047c
++	.long 0x410c0100
++	.long 0x00000020
++	.long 0x00000014
++	.long .LC.text256
++	.long 0x00000044
++	.long 0x420e2041
++	.long 0x9f014111
++	.long 0x417f410d
++	.long 0x1f460a42
++	.long 0xdf440b00
++
++	.section	".data","wa"
++	.align	4
++.LC.data:
++	.globl __N_mod1
++	.type    __N_mod1,@object
++	.size    __N_mod1,8
++__N_mod1:
++	.long 0x00000000
++	.long 0x01000001
++
++	.section	".except.1","wa"
++	.align	1
++.LC.except.1:
++	.long .LC.text288
++	.byte 0x01
++	.byte 0x09
++
++	.ident  "Fri Jun 15 16:35:45 2012 .IBM XL Fortran for Linux, V14.1 (5765-J05, 5725-C75) Version 14.01.0000.0000.Fri Jun 15 16:35:45 2012 .IBM XL Fortran for Linux, V14.1 (5765-J05, 5725-C75) Version 14.01.0000.0000."
++
++	.section	".debug_aranges"
++	.align	0
++.LC.debug_aranges:
++	.long 0x0000001c
++	.byte 0x00
++	.byte 0x02
++	.long .LC.debug_info
++	.long 0x04000000
++	.byte 0x00
++	.byte 0x00
++	.long .LC.text
++	.long 0x000000a8
++	.long 0x00000000
++	.long 0x00000000
++	.long 0x0000001c
++	.byte 0x00
++	.byte 0x02
++	.long .LC.debug_info273
++	.long 0x04000000
++	.byte 0x00
++	.byte 0x00
++	.long .LC.text256
++	.long 0x00000044
++	.long 0x00000000
++	.long 0x00000000
++
++	.section	".debug_pubnames"
++	.align	0
++.LC.debug_pubnames:
++	.long 0x0000002f
++	.byte 0x00
++	.byte 0x02
++	.long .LC.debug_info
++	.long 0x00000111
++	.long 0x000000dc
++	.long 0x79000000
++	.long 0x00ec7a00
++	.long 0x000000fc
++	.long 0x5f5f6d6f
++	.long 0x64315f4e
++	.long 0x4d4f445f
++	.long 0x73756231
++	.long 0x00000000
++	.long 0x00000000
++	.byte 0x18
++	.byte 0x00
++	.byte 0x02
++	.long .LC.debug_info273
++	.long 0x00000127
++	.long 0x0000010f
++	.long 0x5f6d6169
++	.long 0x6e000000
++	.byte 0x00
++	.byte 0x00
++
++	.section	".debug_info"
++	.align	0
++.LC.debug_info:
++	.long 0x0000010d
++	.byte 0x00
++	.byte 0x02
++	.long .LC.debug_abbrev
++	.long 0x0401786c
++	.long 0x662d7661
++	.long 0x72696162
++	.long 0x6c652e66
++	.byte 0x00
++	.long .LC.debug_line
++	.long .LC.text
++	.long .LC.text168
++	.long 0x082f726f
++	.long 0x6f742f73
++	.long 0x65726769
++	.long 0x6f646a2f
++	.long 0x6764622d
++	.long 0x372e302e
++	.long 0x312d3432
++	.long 0x2e656c35
++	.long 0x2f676462
++	.long 0x2d372e30
++	.long 0x2e312f67
++	.long 0x64622f74
++	.long 0x65737473
++	.long 0x75697465
++	.long 0x2f676462
++	.long 0x2e666f72
++	.long 0x7472616e
++	.long 0x0049424d
++	.long 0x20584c20
++	.long 0x466f7274
++	.long 0x72616e20
++	.long 0x666f7220
++	.long 0x4c696e75
++	.long 0x782c2056
++	.long 0x31342e31
++	.long 0x20283537
++	.long 0x36352d4a
++	.long 0x30352c20
++	.long 0x35373235
++	.long 0x2d433735
++	.long 0x29205665
++	.long 0x7273696f
++	.long 0x6e203134
++	.long 0x2e30312e
++	.long 0x30303030
++	.long 0x2e303030
++	.long 0x30000249
++	.long 0x4e544547
++	.long 0x45520004
++	.long 0x05030005
++	.long 0x02524541
++	.long 0x4c000404
++	.long 0x04050000
++	.long 0x0000c706
++	.long 0x6d6f6431
++	.long 0x00070503
++	.long __N_mod1
++	.long 0x79000100
++	.long 0x01000000
++	.long 0xd0070503
++	.long __N__mod1
++	.long 0x7a000100
++	.long 0x01000000
++	.long 0xc7087375
++	.byte 0x62
++	.byte 0x31
++	.byte 0x00
++	.long .LC.text32
++	.long .LC.text168
++	.long 0x01180101
++	.byte 0x6f
++	.byte 0x00
++	.byte 0x00
++.LC.debug_info273:
++	.long 0x00000123
++	.byte 0x00
++	.byte 0x02
++	.long .LC.debug_abbrev97
++	.long 0x0401786c
++	.long 0x662d7661
++	.long 0x72696162
++	.long 0x6c652e66
++	.byte 0x00
++	.long .LC.debug_line98
++	.long .LC.text256
++	.long .LC.text324
++	.long 0x082f726f
++	.long 0x6f742f73
++	.long 0x65726769
++	.long 0x6f646a2f
++	.long 0x6764622d
++	.long 0x372e302e
++	.long 0x312d3432
++	.long 0x2e656c35
++	.long 0x2f676462
++	.long 0x2d372e30
++	.long 0x2e312f67
++	.long 0x64622f74
++	.long 0x65737473
++	.long 0x75697465
++	.long 0x2f676462
++	.long 0x2e666f72
++	.long 0x7472616e
++	.long 0x0049424d
++	.long 0x20584c20
++	.long 0x466f7274
++	.long 0x72616e20
++	.long 0x666f7220
++	.long 0x4c696e75
++	.long 0x782c2056
++	.long 0x31342e31
++	.long 0x20283537
++	.long 0x36352d4a
++	.long 0x30352c20
++	.long 0x35373235
++	.long 0x2d433735
++	.long 0x29205665
++	.long 0x7273696f
++	.long 0x6e203134
++	.long 0x2e30312e
++	.long 0x30303030
++	.long 0x2e303030
++	.long 0x30000249
++	.long 0x4e544547
++	.long 0x45520004
++	.long 0x05030005
++	.long 0x02524541
++	.long 0x4c000404
++	.long 0x04000000
++	.long 0xb9050000
++	.long 0x0000c706
++	.long 0x000000f4
++	.long 0x26264e26
++	.long 0x6d6f6431
++	.long 0x00080779
++	.long 0x00022300
++	.long 0x000000d4
++	.long 0x00060000
++	.long 0x010f2626
++	.long 0x4e26266d
++	.long 0x6f643100
++	.long 0x04077a00
++	.long 0x02230000
++	.long 0x0000c700
++	.long 0x085f6d61
++	.byte 0x69
++	.byte 0x6e
++	.byte 0x00
++	.long .LC.text256
++	.long .LC.text324
++	.long 0x0201016f
++	.long 0x000000b9
++	.byte 0x00
++
++	.section	".debug_abbrev"
++	.align	0
++.LC.debug_abbrev:
++	.long 0x01110103
++	.long 0x08100611
++	.long 0x01120113
++	.long 0x0b1b0825
++	.long 0x08000002
++	.long 0x24000308
++	.long 0x0b0b3e0b
++	.long 0x00000324
++	.long 0x000b0b3e
++	.long 0x0b000004
++	.long 0x15000000
++	.long 0x050f0033
++	.long 0x0b491300
++	.long 0x00061e01
++	.long 0x03080000
++	.long 0x07340002
++	.long 0x0a03083a
++	.long 0x0b3b0b3f
++	.long 0x0c491300
++	.long 0x00082e00
++	.long 0x03081101
++	.long 0x12013a0b
++	.long 0x3b0b3f0c
++	.long 0x400a0000
++	.byte 0x00
++.LC.debug_abbrev97:
++	.long 0x01110103
++	.long 0x08100611
++	.long 0x01120113
++	.long 0x0b1b0825
++	.long 0x08000002
++	.long 0x24000308
++	.long 0x0b0b3e0b
++	.long 0x00000324
++	.long 0x000b0b3e
++	.long 0x0b000004
++	.long 0x15004913
++	.long 0x0000050f
++	.long 0x00330b49
++	.long 0x13000006
++	.long 0x13010113
++	.long 0x03080b0b
++	.long 0x0000070d
++	.long 0x00030838
++	.long 0x0a491300
++	.long 0x00082e00
++	.long 0x03081101
++	.long 0x1201360b
++	.long 0x3f0c400a
++	.long 0x49130000
++	.byte 0x00
++
++	.section	".debug_line"
++	.align	0
++.LC.debug_line:
++	.long 0x0000005e
++	.long 0x00020000
++	.long 0x00220101
++	.long 0x9cdc0a00
++	.long 0x01010101
++	.long 0x00000001
++	.long 0x00786c66
++	.long 0x2d766172
++	.long 0x6961626c
++	.long 0x652e6600
++	.long 0x00000000
++	.long 0x04010005
++	.byte 0x02
++	.long .LC.text
++	.long 0x03130109
++	.long 0x000c0309
++	.long 0x01090014
++	.long 0x037b0109
++	.long 0x00180301
++	.long 0x01090038
++	.long 0x03010109
++	.long 0x000c0301
++	.long 0x01090014
++	.long 0x03010109
++	.long 0x00180001
++	.byte 0x01
++.LC.debug_line98:
++	.long 0x00000046
++	.long 0x00020000
++	.long 0x00220101
++	.long 0x9cdc0a00
++	.long 0x01010101
++	.long 0x00000001
++	.long 0x00786c66
++	.long 0x2d766172
++	.long 0x6961626c
++	.long 0x652e6600
++	.long 0x00000000
++	.long 0x04010005
++	.byte 0x02
++	.long .LC.text256
++	.long 0x031f0109
++	.long 0x00140300
++	.long 0x01090004
++	.long 0x03010109
++	.long 0x002c0001
++	.byte 0x01
++
++	.section	".debug_frame"
++	.align	0
++.LC.debug_frame:
++	.long 0x0000000c
++	.long 0xffffffff
++	.long 0x0100047c
++	.long 0x410c0100
++	.long 0x0000001c
++	.long .LC.debug_frame
++	.long .LC.text
++	.long 0x00000020
++	.long 0x410e2041
++	.long 0x9f01410d
++	.long 0x1f410a42
++	.long 0xdf420b00
++	.long 0x00000020
++	.long .LC.debug_frame
++	.long .LC.text32
++	.long 0x00000088
++	.long 0x410e2041
++	.long 0x9f01419e
++	.long 0x02410d1f
++	.long 0x590a42de
++	.long 0x41df420b
++.LC.debug_frame84:
++	.long 0x0000000c
++	.long 0xffffffff
++	.long 0x0100047c
++	.long 0x410c0100
++	.long 0x00000020
++	.long .LC.debug_frame84
++	.long .LC.text256
++	.long 0x00000044
++	.long 0x420e2041
++	.long 0x9f014111
++	.long 0x417f410d
++	.long 0x1f460a42
++	.long 0xdf440b00
++
++	.section	".debug_pubtypes"
++	.align	0
++.LC.debug_pubtypes:
++	.long 0x00000023
++	.byte 0x00
++	.byte 0x02
++	.long .LC.debug_info
++	.long 0x00000111
++	.long 0x000000b9
++	.long 0x494e5445
++	.long 0x47455200
++	.long 0x000000c7
++	.long 0x5245414c
++	.long 0x00000000
++	.long 0x00000000
++	.byte 0x3e
++	.byte 0x00
++	.byte 0x02
++	.long .LC.debug_info273
++	.long 0x00000127
++	.long 0x000000b9
++	.long 0x494e5445
++	.long 0x47455200
++	.long 0x000000c7
++	.long 0x5245414c
++	.long 0x00000000
++	.long 0xda26264e
++	.long 0x266d6f64
++	.long 0x31000000
++	.long 0x00f42626
++	.long 0x4e26266d
++	.long 0x6f643100
++	.long 0x00000000
++
++	.comm   __N__mod1,4,16
+diff --git a/gdb/testsuite/gdb.fortran/xlf-variable.exp b/gdb/testsuite/gdb.fortran/xlf-variable.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.fortran/xlf-variable.exp
+@@ -0,0 +1,37 @@
++# Copyright 2012 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/>.
++
++# This test can only be run on PPC64 machines.
++
++if { ![istarget powerpc64-*] || ![is_ilp32_target] } {
++    return -1
++}
++
++set testfile "xlf-variable"
++set srcfile ${testfile}.S
++
++if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
++    return -1
++}
++
++if { ![runto_main] } {
++    return -1
++}
++
++gdb_test "step" ".*y => z.*" "y => z"
++gdb_test "step" ".*y = 3\.0.*" "y = 3.0"
++gdb_test "step" ".*nullify \\(y\\).*" "nullify (y)"
++gdb_test "print z" "= 3" "z = 3"
++gdb_test "ptype z" "= REAL" "z is REAL"
+diff --git a/gdb/testsuite/gdb.fortran/xlf-variable.f b/gdb/testsuite/gdb.fortran/xlf-variable.f
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.fortran/xlf-variable.f
+@@ -0,0 +1,33 @@
++c Copyright 2012 Free Software Foundation, Inc.
++c
++c This program is free software; you can redistribute it and/or modify
++c it under the terms of the GNU General Public License as published by
++c the Free Software Foundation; either version 3 of the License, or
++c (at your option) any later version.
++c
++c This program is distributed in the hope that it will be useful,
++c but WITHOUT ANY WARRANTY; without even the implied warranty of
++c MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++c GNU General Public License for more details.
++c
++c You should have received a copy of the GNU General Public License
++c along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++c This file is the Fortran source file for xlf-variable.f.
++c It was used to generate the assembly output called xlf-variable.S,
++c which was generated using IBM's XLF compiler.
++
++        module mod1
++          real, pointer :: y
++          real, target :: z
++        contains
++          subroutine sub1
++            y => z
++            y = 3.0
++            nullify (y)
++          end subroutine
++        end module
++
++        use mod1
++        call sub1
++        end

SOURCES/gdb-runtest-pie-override.patch

@@ -0,0 +1,49 @@
+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-runtest-pie-override.patch
+
+;; Hack for proper PIE run of the testsuite.
+;;=fedoratest
+
+make check//unix/-fPIE/-pie RUNTESTFLAGS=solib-display.exp
+
+gcc -fpic -c  -fPIE -pie -o x.o x.c
+/usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../../../lib64/Scrt1.o: In function `_start':
+(.text+0x20): undefined reference to `main'
+
+=> Change the order for overrides.
+
+One has to also use -fPIC rather than -fPIE, -fPIC is stronger.
+
+The correct way would be:
+make check//unix RUNTESTFLAGS='CC_FOR_TARGET=gcc\ -fPIC\ -pie CXX_FOR_TARGET=g++\ -fPIC\ -pie solib-display.exp'
+
+But there is a problem with testsuite.unix non-unique subdir name and also
+a problem with make -j parallelization of the testsuite.
+
+diff --git a/gdb/testsuite/lib/future.exp b/gdb/testsuite/lib/future.exp
+--- a/gdb/testsuite/lib/future.exp
++++ b/gdb/testsuite/lib/future.exp
+@@ -197,6 +197,10 @@ proc gdb_default_target_compile_1 {source destfile type options} {
+     set ldflags ""
+     set dest [target_info name]
+ 
++    if {[board_info $dest exists multilib_flags]} {
++	append add_flags " [board_info $dest multilib_flags]"
++    }
++
+     if {[info exists CFLAGS_FOR_TARGET]} {
+ 	append add_flags " $CFLAGS_FOR_TARGET"
+     }
+@@ -531,10 +535,6 @@ proc gdb_default_target_compile_1 {source destfile type options} {
+ 	}
+     }
+ 
+-    if {[board_info $dest exists multilib_flags]} {
+-	append add_flags " [board_info $dest multilib_flags]"
+-    }
+-
+     verbose "doing compile"
+ 
+     set sources ""

SOURCES/gdb-simultaneous-step-resume-breakpoint-test.patch

@@ -0,0 +1,162 @@
+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-simultaneous-step-resume-breakpoint-test.patch
+
+;; New test for step-resume breakpoint placed in multiple threads at once.
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.c b/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.c
+@@ -0,0 +1,79 @@
++/* Copyright 2009 Free Software Foundation, Inc.
++
++   Written by Fred Fish of Cygnus Support
++   Contributed by Cygnus Support
++
++   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/>.  */
++
++/* Test multiple threads stepping into a .debug_line-less function with
++   a breakpoint placed on its return-to-caller point.  */
++
++#include <pthread.h>
++#include <assert.h>
++#include <unistd.h>
++#include <errno.h>
++#include <stdio.h>
++
++#define THREADS 3
++
++static void *
++func (void *unused)
++{
++  int i;
++
++  errno = 0;
++  i = 0xdeadf00d;
++  i = sleep (THREADS);	/* sleep-call */
++  if (errno != 0)	/* sleep-after */
++    perror ("sleep");
++
++  /* The GDB bug with forgotten step-resume breakpoint could leave stale
++     breakpoint on the I assignment making it a nop.  */
++  if (i == 0xdeadf00d)
++    assert (0);
++
++  assert (i == 0);
++
++  pthread_exit (NULL);
++}
++
++int
++main (void)
++{
++  pthread_t threads[THREADS];
++  int threadi;
++
++  for (threadi = 0; threadi < THREADS; threadi++)
++    {
++      int i;
++
++      i = pthread_create (&threads[threadi], NULL, func, NULL);
++      assert (i == 0);
++
++      i = sleep (1);
++      assert (i == 0);
++    }
++
++  for (threadi = 0; threadi < THREADS; threadi++)
++    {
++      int i;
++
++      i = pthread_join (threads[threadi], NULL);
++      assert (i == 0);
++    }
++
++  return 0;	/* final-exit */
++}
+diff --git a/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.exp b/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.exp
+@@ -0,0 +1,65 @@
++# Copyright (C) 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/>.  */
++
++# Test multiple threads stepping into a .debug_line-less function with
++# a breakpoint placed on its return-to-caller point.
++
++set testfile simultaneous-step-resume-breakpoint
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++
++if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++
++# Ensure we have no debuginfo for the `sleep' call itself (=for libc).
++gdb_test "set debug-file-directory /DoesNotExist"
++
++gdb_load ${binfile}
++if ![runto_main] {
++   return -1
++}
++
++# Red Hat vendor patch does set it to "step" by default.
++gdb_test "set scheduler-locking off"
++
++gdb_breakpoint [gdb_get_line_number "final-exit"]
++
++gdb_breakpoint [gdb_get_line_number "sleep-call"]
++gdb_continue_to_breakpoint "sleep-call"
++
++gdb_test "step" "sleep-call.*" "step thread 1"
++gdb_test "step" "sleep-call.*" "step thread 2"
++gdb_test "step" "sleep-after.*" "step thread 3"
++
++set test "first continue"
++gdb_test_multiple "continue" $test {
++    -re "final-exit.*$gdb_prompt $" {
++	# gdb-7.0.
++	pass $test
++	return
++    }
++    -re "sleep-after.*$gdb_prompt $" {
++	# Fedora/RHEL branch.
++	pass $test
++    }
++}
++
++gdb_test "continue" "sleep-after.*" "second continue"
++gdb_test "continue" "final-exit.*" "third continue"

SOURCES/gdb-test-bt-cfi-without-die.patch

@@ -0,0 +1,214 @@
+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-test-bt-cfi-without-die.patch
+
+;; [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
+;;=fedoratest
+
+http://sourceware.org/ml/archer/2010-q3/msg00028.html
+
+On Wed, 25 Feb 2009 00:14:29 +0100, Jan Kratochvil wrote:
+> commit 6a37c2b9962258ecf9299cc34a650e64a06acaa5
+>
+> There was a regression on gdb.base/savedregs.exp.
+>
+> quick_addrmap/require_partial_symbols should be used even for the unwind debug
+> info checking as its load has been also delayed by this branch.
+[...]
+> --- a/gdb/dwarf2-frame.c
+> +++ b/gdb/dwarf2-frame.c
+[...]
+> @@ -1499,6 +1500,14 @@ dwarf2_frame_find_fde (CORE_ADDR *pc)
+>        struct dwarf2_fde *fde;
+>        CORE_ADDR offset;
+>
+> +      if (objfile->quick_addrmap)
+> +	{
+> +	  if (!addrmap_find (objfile->quick_addrmap, *pc))
+> +	    continue;
+> +	}
+> +      /* FIXME: Read-in only .debug_frame/.eh_frame without .debug_info?  */
+> +      require_partial_symbols (objfile);
+> +
+
+but this has caused a different regression (as discussed in the confcall).
+
+QUICK_ADDRMAP is built only from .debug_aranges.  But we can have existing
+built .debug_aranges for CUs in OBJFILE but still some CUs do not need to have
+DWARF at all while they can feature CFIs (.eh_frame or .debug_frame).
+It has been described by Daniel Jacobowitz at:
+	Re: [2/4] RFC: check psymtabs_addrmap before reading FDEs
+	http://sourceware.org/ml/gdb-patches/2010-07/msg00012.html
+
+Sorry for this regression by me (in that fix of a different regression).
+
+Fixed it the "slow way" as this branch is now obsoleted by .gdb-index.
+
+No regressions on {x86_64,x86_64-m32,i686}-fedora13-linux-gnu.
+
+Checked-in.
+
+Thanks,
+Jan
+
+eb8df8566acc1ed963e3e9b77c13b9c2c3db03fb
+
+Test CFI is parsed even for range (function) not described by any DIE.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=614028
+
+gdb/
+	* dwarf2-frame.c (dwarf2_frame_find_fde): Remove the
+	OBJFILE->QUICK_ADDRMAP check.  New comment why.
+
+gdb/testsuite/
+	* gdb.base/cfi-without-die.exp, gdb.base/cfi-without-die-main.c,
+	gdb.base/cfi-without-die-caller.c: New files.
+
+diff --git a/gdb/testsuite/gdb.base/cfi-without-die-caller.c b/gdb/testsuite/gdb.base/cfi-without-die-caller.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/cfi-without-die-caller.c
+@@ -0,0 +1,28 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2005, 2007, 2008, 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/>.  */
++
++typedef int (*callback_t) (void);
++
++int
++caller (callback_t callback)
++{
++  /* Ensure some frame content to push away the return address.  */
++  volatile const long one = 1;
++
++  /* Modify the return value to prevent any tail-call optimization.  */
++  return (*callback) () - one;
++}
+diff --git a/gdb/testsuite/gdb.base/cfi-without-die-main.c b/gdb/testsuite/gdb.base/cfi-without-die-main.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/cfi-without-die-main.c
+@@ -0,0 +1,32 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2005, 2007, 2008, 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/>.  */
++
++typedef int (*callback_t) (void);
++
++extern int caller (callback_t callback);
++
++int
++callback (void)
++{
++  return 1;
++}
++
++int
++main (void)
++{
++  return caller (callback);
++}
+diff --git a/gdb/testsuite/gdb.base/cfi-without-die.exp b/gdb/testsuite/gdb.base/cfi-without-die.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/cfi-without-die.exp
+@@ -0,0 +1,71 @@
++# Copyright 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/>.
++
++# Test CFI is parsed even for range (function) not described by any DIE.
++
++set testfile cfi-without-die
++set srcmainfile ${testfile}-main.c
++set srccallerfile ${testfile}-caller.c
++set executable ${testfile}
++set objmainfile [standard_output_file ${testfile}-main.o]
++set objcallerfile [standard_output_file ${testfile}-caller.o]
++set binfile [standard_output_file ${executable}]
++
++if { [gdb_compile "${srcdir}/${subdir}/${srccallerfile}" ${objcallerfile} \
++      object [list {additional_flags=-fomit-frame-pointer -fno-unwind-tables -fno-asynchronous-unwind-tables}]] != ""
++     || [gdb_compile "${srcdir}/${subdir}/${srcmainfile}" ${objmainfile} object {debug}] != ""
++     || [gdb_compile "${objmainfile} ${objcallerfile}" ${binfile} executable {}] != "" } {
++     untested ${testfile}.exp
++     return -1
++}
++
++clean_restart $executable
++
++if ![runto callback] then {
++   fail "verify unwinding: Can't run to callback"
++   return 0
++}
++set test "verify unwinding breaks without CFI"
++gdb_test_multiple "bt" $test {
++    -re " in \[?\]\[?\] .*\r\n$gdb_prompt $" {
++	# It may backtrace through some random frames even to main().
++	pass $test
++    }
++    -re " in main .*\r\n$gdb_prompt $" {
++	fail $test
++    }
++    -re "\r\n$gdb_prompt $" {
++	pass $test
++    }
++}
++
++if { [gdb_compile "${srcdir}/${subdir}/${srccallerfile}" ${objcallerfile} \
++      object [list {additional_flags=-fomit-frame-pointer -funwind-tables -fasynchronous-unwind-tables}]] != ""
++     || [gdb_compile "${srcdir}/${subdir}/${srcmainfile}" ${objmainfile} object {debug}] != ""
++     || [gdb_compile "${objmainfile} ${objcallerfile}" ${binfile} executable {}] != "" } {
++     untested ${testfile}.exp
++     return -1
++}
++
++clean_restart $executable
++
++if ![runto callback] then {
++   fail "test CFI without DIEs: Can't run to callback"
++   return 0
++}
++# #0  callback () at ...
++# #1  0x00000000004004e9 in caller ()
++# #2  0x00000000004004cd in main () at ...
++gdb_test "bt" "#0 +callback \[^\r\n\]+\r\n#1 \[^\r\n\]+ in caller \[^\r\n\]+\r\n#2 \[^\r\n\]+ in main \[^\r\n\]+" "verify unwindin works for CFI without DIEs"

SOURCES/gdb-test-dw2-aranges.patch

@@ -0,0 +1,220 @@
+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-test-dw2-aranges.patch
+
+;; [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
+;;=fedoratest
+
+[archer-tromey-delayed-symfile]
+
+commit 77fa7778a37b0d28a7e4e5235f074a10ecf1815d
+Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
+Date:   Sat Aug 15 15:05:54 2009 +0200
+
+    Test for "handle incorrect aranges".
+
+    readelf:
+    Contents of the .debug_aranges section:
+
+      Length:                   8
+      Version:                  2
+      Offset into .debug_info:  0x0
+      Pointer Size:             0
+      Segment Size:             0
+
+        Address    Length
+    Floating point exception
+
+    	* gdb.dwarf2/dw2-aranges.exp, gdb.dwarf2/dw2-aranges.S: New files.
+
+diff --git a/gdb/testsuite/gdb.dwarf2/dw2-aranges.S b/gdb/testsuite/gdb.dwarf2/dw2-aranges.S
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/dw2-aranges.S
+@@ -0,0 +1,140 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2004, 2007, 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/>.  */
++
++/* Test .debug_aranges containing zero address_size.  */
++
++/* Dummy function to provide debug information for.  */
++
++	.text
++.Lbegin_text1:
++	.globl main
++	.type main, %function
++main:
++.Lbegin_main:
++	.int 0
++.Lend_main:
++	.size main, .-main
++.Lend_text1:
++
++/* Debug information */
++
++	.section .debug_info
++.Lcu1_begin:
++	/* CU header */
++	.4byte	.Lcu1_end - .Lcu1_start		/* Length of Compilation Unit */
++.Lcu1_start:
++	.2byte	2				/* DWARF Version */
++	.4byte	.Labbrev1_begin			/* Offset into abbrev section */
++	.byte	4				/* Pointer size */
++
++	/* CU die */
++	.uleb128 1				/* Abbrev: DW_TAG_compile_unit */
++	.4byte	.Lend_text1			/* DW_AT_high_pc */
++	.4byte	.Lbegin_text1			/* DW_AT_low_pc */
++	.ascii	"file1.txt\0"			/* DW_AT_name */
++	.ascii	"GNU C 3.3.3\0"			/* DW_AT_producer */
++	.byte	1				/* DW_AT_language (C) */
++
++	/* main */
++	.uleb128	2			/* Abbrev: DW_TAG_subprogram */
++	.byte		1			/* DW_AT_external */
++	.byte		1			/* DW_AT_decl_file */
++	.byte		2			/* DW_AT_decl_line */
++	.ascii		"main\0"		/* DW_AT_name */
++	.4byte		.Ltype_int-.Lcu1_begin	/* DW_AT_type */
++	.4byte		.Lbegin_main	/* DW_AT_low_pc */
++	.4byte		.Lend_main		/* DW_AT_high_pc */
++	.byte		1			/* DW_AT_frame_base: length */
++	.byte		0x55			/* DW_AT_frame_base: DW_OP_reg5 */
++
++.Ltype_int:
++	.uleb128	3			/* Abbrev: DW_TAG_base_type */
++	.ascii		"int\0"			/* DW_AT_name */
++	.byte		4			/* DW_AT_byte_size */
++	.byte		5			/* DW_AT_encoding */
++
++	.byte		0			/* End of children of CU */
++
++.Lcu1_end:
++
++/* Abbrev table */
++	.section .debug_abbrev
++.Labbrev1_begin:
++	.uleb128	1			/* Abbrev code */
++	.uleb128	0x11			/* DW_TAG_compile_unit */
++	.byte		1			/* has_children */
++	.uleb128	0x12			/* DW_AT_high_pc */
++	.uleb128	0x1			/* DW_FORM_addr */
++	.uleb128	0x11			/* DW_AT_low_pc */
++	.uleb128	0x1			/* DW_FORM_addr */
++	.uleb128	0x3			/* DW_AT_name */
++	.uleb128	0x8			/* DW_FORM_string */
++	.uleb128	0x25			/* DW_AT_producer */
++	.uleb128	0x8			/* DW_FORM_string */
++	.uleb128	0x13			/* DW_AT_language */
++	.uleb128	0xb			/* DW_FORM_data1 */
++	.byte		0x0			/* Terminator */
++	.byte		0x0			/* Terminator */
++
++	.uleb128	2			/* Abbrev code */
++	.uleb128	0x2e			/* DW_TAG_subprogram */
++	.byte		0			/* has_children */
++	.uleb128	0x3f			/* DW_AT_external */
++	.uleb128	0xc			/* DW_FORM_flag */
++	.uleb128	0x3a			/* DW_AT_decl_file */
++	.uleb128	0xb			/* DW_FORM_data1 */
++	.uleb128	0x3b			/* DW_AT_decl_line */
++	.uleb128	0xb			/* DW_FORM_data1 */
++	.uleb128	0x3			/* DW_AT_name */
++	.uleb128	0x8			/* DW_FORM_string */
++	.uleb128	0x49			/* DW_AT_type */
++	.uleb128	0x13			/* DW_FORM_ref4 */
++	.uleb128	0x11			/* DW_AT_low_pc */
++	.uleb128	0x1			/* DW_FORM_addr */
++	.uleb128	0x12			/* DW_AT_high_pc */
++	.uleb128	0x1			/* DW_FORM_addr */
++	.uleb128	0x40			/* DW_AT_frame_base */
++	.uleb128	0xa			/* DW_FORM_block1 */
++	.byte		0x0			/* Terminator */
++	.byte		0x0			/* Terminator */
++
++	.uleb128	3			/* Abbrev code */
++	.uleb128	0x24			/* DW_TAG_base_type */
++	.byte		0			/* has_children */
++	.uleb128	0x3			/* DW_AT_name */
++	.uleb128	0x8			/* DW_FORM_string */
++	.uleb128	0xb			/* DW_AT_byte_size */
++	.uleb128	0xb			/* DW_FORM_data1 */
++	.uleb128	0x3e			/* DW_AT_encoding */
++	.uleb128	0xb			/* DW_FORM_data1 */
++	.byte		0x0			/* Terminator */
++	.byte		0x0			/* Terminator */
++
++	.byte		0x0			/* Terminator */
++	.byte		0x0			/* Terminator */
++
++/* aranges table */
++	.section .debug_aranges
++	.long	.Laranges_end - 1f
++1:
++	.2byte	2				/* aranges Version */
++	.4byte	.Lcu1_begin - .debug_info	/* Offset into .debug_info section */
++	/* The GDB crasher is this zero value.  */
++	.byte		0			/* aranges address_size */
++	.byte		0			/* aranges segment_size */
++
++.Laranges_end:
+diff --git a/gdb/testsuite/gdb.dwarf2/dw2-aranges.exp b/gdb/testsuite/gdb.dwarf2/dw2-aranges.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/dw2-aranges.exp
+@@ -0,0 +1,40 @@
++# Copyright 2004, 2005, 2007, 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/>.
++
++# Test .debug_aranges containing zero address_size.
++
++# This test can only be run on targets which support DWARF-2 and use gas.
++# For now pick a sampling of likely targets.
++if {![istarget *-*-linux*]
++    && ![istarget *-*-gnu*]
++    && ![istarget *-*-elf*]
++    && ![istarget *-*-openbsd*]
++    && ![istarget arm-*-eabi*]
++    && ![istarget powerpc-*-eabi*]} {
++    return 0
++}
++
++set testfile "dw2-aranges"
++set srcfile ${testfile}.S
++set binfile [standard_output_file ${testfile}]
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {nodebug}] != "" } {
++    return -1
++}
++
++clean_restart $testfile
++
++# Failed gdb_load would abort the testcase execution earlier.
++pass "file loaded"

SOURCES/gdb-test-expr-cumulative-archer.patch

@@ -0,0 +1,223 @@
+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-test-expr-cumulative-archer.patch
+
+;; [archer-keiths-expr-cumulative+upstream] Import C++ testcases.
+;;=fedoratest
+
+archer archer-keiths-expr-cumulative
+b5a7497340b24199f0c7ba7fdf0d54d4df44d6bc
+
+diff --git a/gdb/testsuite/gdb.cp/namespace-nested-imports.cc b/gdb/testsuite/gdb.cp/namespace-nested-imports.cc
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/namespace-nested-imports.cc
+@@ -0,0 +1,36 @@
++namespace A
++{
++  namespace B
++  {
++    int ab = 11;
++  }
++}
++
++namespace C
++{
++  namespace D
++  {
++    using namespace A::B;
++
++    int
++    second()
++    {
++      ab;
++      return 0;
++    }
++  }
++
++  int
++  first()
++  {
++    //ab;
++    return D::second();
++  }
++}
++
++int
++main()
++{
++  //ab;
++  return C::first();
++}
+diff --git a/gdb/testsuite/gdb.cp/namespace-nested-imports.exp b/gdb/testsuite/gdb.cp/namespace-nested-imports.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/namespace-nested-imports.exp
+@@ -0,0 +1,50 @@
++# 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 namespace-nested-imports
++set srcfile ${testfile}.cc
++set binfile [standard_output_file ${testfile}]
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
++    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] then {
++    perror "couldn't run to breakpoint main"
++    continue
++}
++
++gdb_test "print ab" "No symbol .* in current context."
++
++############################################
++gdb_breakpoint C::first
++gdb_continue_to_breakpoint "C::first"
++
++gdb_test "print ab" "No symbol .* in current context."
++gdb_test "print C::D::ab" "= 11"
++
++############################################
++gdb_breakpoint C::D::second
++gdb_continue_to_breakpoint "C::D::second"
++
++gdb_test "print ab" "= 11"
+diff --git a/gdb/testsuite/gdb.cp/namespace-no-imports.cc b/gdb/testsuite/gdb.cp/namespace-no-imports.cc
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/namespace-no-imports.cc
+@@ -0,0 +1,37 @@
++
++namespace A
++{
++  int _a = 11;
++
++  namespace B{
++
++    int ab = 22;
++
++    namespace C{
++
++      int abc = 33;
++
++      int second(){
++        return 0;
++      }
++
++    }
++
++    int first(){
++      _a;
++      ab;
++      C::abc;
++      return C::second();
++    }
++  }
++}
++
++
++int
++main()
++{
++  A::_a;
++  A::B::ab;
++  A::B::C::abc;
++  return A::B::first();
++}
+diff --git a/gdb/testsuite/gdb.cp/namespace-no-imports.exp b/gdb/testsuite/gdb.cp/namespace-no-imports.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/namespace-no-imports.exp
+@@ -0,0 +1,69 @@
++# 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 namespace-no-imports
++set srcfile ${testfile}.cc
++set binfile [standard_output_file ${testfile}]
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
++    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] then {
++    perror "couldn't run to breakpoint main"
++    continue
++}
++
++gdb_test "print A::_a" "= 11"
++gdb_test "print A::B::ab" "= 22"
++gdb_test "print A::B::C::abc" "= 33"
++
++gdb_test "print _a" "No symbol .* in current context."
++gdb_test "print ab" "No symbol .* in current context."
++gdb_test "print abc" "No symbol .* in current context."
++
++############################################
++gdb_breakpoint A::B::first
++gdb_continue_to_breakpoint "A::B::first"
++
++gdb_test "print A::_a" "= 11"
++gdb_test "print A::B::ab" "= 22"
++gdb_test "print A::B::C::abc" "= 33"
++
++gdb_test "print _a" "= 11"
++gdb_test "print ab" "= 22"
++gdb_test "print C::abc" "= 33"
++
++gdb_test "print abc" "No symbol .* in current context."
++
++############################################
++gdb_breakpoint A::B::C::second
++gdb_continue_to_breakpoint "A::B::C::second"
++
++gdb_test "print A::_a" "= 11"
++gdb_test "print A::B::ab" "= 22"
++gdb_test "print A::B::C::abc" "= 33"
++
++gdb_test "print _a" "= 11"
++gdb_test "print ab" "= 22"
++gdb_test "print abc" "= 33"

SOURCES/gdb-test-for-rhbz1976887.patch

@@ -0,0 +1,592 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= <ahajkova@redhat.com>
+Date: Wed, 29 Sep 2021 11:14:51 +0200
+Subject: gdb-test-for-rhbz1976887.patch
+
+;; Backport test for RHBZ 1976887 (Kevin Buettner).
+
+Test case reproducing PR28030 bug
+
+The original reproducer for PR28030 required use of a specific
+compiler version - gcc-c++-11.1.1-3.fc34 is mentioned in the PR,
+though it seems probable that other gcc versions might also be able to
+reproduce the bug as well.  This commit introduces a test case which,
+using the DWARF assembler, provides a reproducer which is independent
+of the compiler version.  (Well, it'll work with whatever compilers
+the DWARF assembler works with.)
+
+To the best of my knowledge, it's also the first test case which uses
+the DWARF assembler to provide debug info for a shared object.  That
+being the case, I provided more than the usual commentary which should
+allow this case to be used as a template when a combo shared
+library / DWARF assembler test case is required in the future.
+
+I provide some details regarding the bug in a comment near the
+beginning of locexpr-dml.exp.
+
+This problem was difficult to reproduce; I found myself constantly
+referring to the backtrace while trying to figure out what (else) I
+might be missing while trying to create a reproducer.  Below is a
+partial backtrace which I include for posterity.
+
+ #0  internal_error (
+    file=0xc50110 "/ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdb/gdbtypes.c", line=5575,
+    fmt=0xc520c0 "Unexpected type field location kind: %d")
+    at /ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdbsupport/errors.cc:51
+ #1  0x00000000006ef0c5 in copy_type_recursive (objfile=0x1635930,
+    type=0x274c260, copied_types=0x30bb290)
+    at /ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdb/gdbtypes.c:5575
+ #2  0x00000000006ef382 in copy_type_recursive (objfile=0x1635930,
+    type=0x274ca10, copied_types=0x30bb290)
+    at /ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdb/gdbtypes.c:5602
+ #3  0x0000000000a7409a in preserve_one_value (value=0x24269f0,
+    objfile=0x1635930, copied_types=0x30bb290)
+    at /ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdb/value.c:2529
+ #4  0x000000000072012a in gdbscm_preserve_values (
+    extlang=0xc55720 <extension_language_guile>, objfile=0x1635930,
+    copied_types=0x30bb290)
+    at /ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdb/guile/scm-value.c:94
+ #5  0x00000000006a3f82 in preserve_ext_lang_values (objfile=0x1635930,
+    copied_types=0x30bb290)
+    at /ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdb/extension.c:568
+ #6  0x0000000000a7428d in preserve_values (objfile=0x1635930)
+    at /ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdb/value.c:2579
+ #7  0x000000000082d514 in objfile::~objfile (this=0x1635930,
+    __in_chrg=<optimized out>)
+    at /ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdb/objfiles.c:549
+ #8  0x0000000000831cc8 in std::_Sp_counted_ptr<objfile*, (__gnu_cxx::_Lock_policy)2>::_M_dispose (this=0x1654580)
+    at /usr/include/c++/11/bits/shared_ptr_base.h:348
+ #9  0x00000000004e6617 in std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_release (this=0x1654580) at /usr/include/c++/11/bits/shared_ptr_base.h:168
+ #10 0x00000000004e1d2f in std::__shared_count<(__gnu_cxx::_Lock_policy)2>::~__shared_count (this=0x190bb88, __in_chrg=<optimized out>)
+    at /usr/include/c++/11/bits/shared_ptr_base.h:705
+ #11 0x000000000082feee in std::__shared_ptr<objfile, (__gnu_cxx::_Lock_policy)2>::~__shared_ptr (this=0x190bb80, __in_chrg=<optimized out>)
+    at /usr/include/c++/11/bits/shared_ptr_base.h:1154
+ #12 0x000000000082ff0a in std::shared_ptr<objfile>::~shared_ptr (
+    this=0x190bb80, __in_chrg=<optimized out>)
+    at /usr/include/c++/11/bits/shared_ptr.h:122
+ #13 0x000000000085ed7e in __gnu_cxx::new_allocator<std::_List_node<std::shared_ptr<objfile> > >::destroy<std::shared_ptr<objfile> > (this=0x114bc00,
+    __p=0x190bb80) at /usr/include/c++/11/ext/new_allocator.h:168
+ #14 0x000000000085e88d in std::allocator_traits<std::allocator<std::_List_node<std::shared_ptr<objfile> > > >::destroy<std::shared_ptr<objfile> > (__a=...,
+    __p=0x190bb80) at /usr/include/c++/11/bits/alloc_traits.h:531
+ #15 0x000000000085e50c in std::__cxx11::list<std::shared_ptr<objfile>, std::allocator<std::shared_ptr<objfile> > >::_M_erase (this=0x114bc00, __position=
+  std::shared_ptr<objfile> (expired, weak count 1) = {get() = 0x1635930})
+    at /usr/include/c++/11/bits/stl_list.h:1925
+ #16 0x000000000085df0e in std::__cxx11::list<std::shared_ptr<objfile>, std::allocator<std::shared_ptr<objfile> > >::erase (this=0x114bc00, __position=
+  std::shared_ptr<objfile> (expired, weak count 1) = {get() = 0x1635930})
+    at /usr/include/c++/11/bits/list.tcc:158
+ #17 0x000000000085c748 in program_space::remove_objfile (this=0x114bbc0,
+    objfile=0x1635930)
+    at /ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdb/progspace.c:210
+ #18 0x000000000082d3ae in objfile::unlink (this=0x1635930)
+    at /ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdb/objfiles.c:487
+ #19 0x000000000082e68c in objfile_purge_solibs ()
+    at /ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdb/objfiles.c:875
+ #20 0x000000000092dd37 in no_shared_libraries (ignored=0x0, from_tty=1)
+    at /ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdb/solib.c:1236
+ #21 0x00000000009a37fe in target_pre_inferior (from_tty=1)
+    at /ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdb/target.c:2496
+ #22 0x00000000007454d6 in run_command_1 (args=0x0, from_tty=1,
+    run_how=RUN_NORMAL)
+    at /ironwood1/sourceware-git/f34-pr28030/bld/../../worktree-pr28030/gdb/infcmd.c:437
+
+I'll note a few points regarding this backtrace:
+
+Frame #1 is where the internal error occurs.  It's caused by an
+unhandled case for FIELD_LOC_KIND_DWARF_BLOCK.  The fix for this bug
+adds support for this case.
+
+Frame #22 - it's a partial backtrace - shows that GDB is attempting to
+(re)run the program.  You can see the exact command sequence that was
+used for reproducing this problem in the PR (at
+https://sourceware.org/bugzilla/show_bug.cgi?id=28030), but in a
+nutshell, after starting the program and advancing to the appropriate
+source line, GDB was asked to step into libstdc++; a "finish" command
+was issued, returning a value.  The fact that a value was returned is
+very important.  GDB was then used to step back into libstdc++.  A
+breakpoint was set on a source line in the library after which a "run"
+command was issued.
+
+Frame #19 shows a call to objfile_purge_solibs.  It's aptly named.
+
+Frame #7 is a call to the destructor for one of the objfile solibs; it
+turned out to be the one for libstdc++.
+
+Frames #6 thru #3 show various value preservation frames.  If you look
+at preserve_values() in gdb/value.c, the value history is preserved
+first, followed by internal variables, followed by values for the
+extension languages (python and guile).
+
+diff --git a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location-lib.c b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location-lib.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location-lib.c
+@@ -0,0 +1,48 @@
++/* Copyright (C) 2021 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/>.  */
++
++#include "locexpr-data-member-location.h"
++
++struct A g_A = {3, 4};
++struct B g_B = { {8, 9}, 10, 11 };
++
++B *
++foo ()
++{						/* foo prologue */
++  asm ("foo_label: .globl foo_label");
++  return &g_B;					/* foo return */
++}						/* foo end */
++
++B *
++bar (B *v)
++{						/* bar prologue */
++  asm ("bar_label: .globl bar_label");
++  return v;					/* bar return */
++}						/* bar end */
++
++/* Some of the DWARF assembler procs (e.g. function_range) compile
++   this file, expecting it to be a complete program with a main()
++   function.  When IS_SHAREDLIB is NOT defined, we have main() as
++   defined below.  */
++
++#ifndef IS_SHAREDLIB
++int
++main ()
++{
++  B *b = foo ();
++}
++#endif
+diff --git a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location-main.c b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location-main.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location-main.c
+@@ -0,0 +1,27 @@
++/* Copyright (C) 2021 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/>.  */
++
++#include "locexpr-data-member-location.h"
++
++int
++main (void)
++{
++  B *v1;
++  v1 = bar (foo ());
++
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp
+@@ -0,0 +1,349 @@
++# Copyright 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/>.
++
++# This test case uses the DWARF assembler to reproduce the problem
++# described by PR28030.  The bug turned out to be that
++# FIELD_LOC_KIND_DWARF_BLOCK was not handled when recursively copying
++# a value's type when preserving the value history during the freeing
++# up of objfiles associated with a shared object.  (Yes, figuring out
++# how to make this happen in a concise test case turned out to be
++# challenging.)
++#
++# The following elements proved to be necessary for reproducing the
++# problem:
++#
++# 1) A location expression needed to be used with
++#    DW_AT_data_member_location rather than a simple offset.
++#    Moreover, this location expression needed to use opcodes
++#    which GDB's DWARF reader could not convert to a simple
++#    offset.  (Note, however, that GDB could probably be improved
++#    to handle the opcodes chosen for this test; if decode_locdesc()
++#    in dwarf2/read.c is ever updated to handle both DW_OP_pick and
++#    DW_OP_drop, then this test could end up passing even if
++#    the bug it's intended to test has not been fixed.)
++#
++# 2) The debug info containing the above DWARF info needed
++#    to be associated with a shared object since the problem
++#    occurred while GDB was preserving values during the
++#    purging of shared objects.
++#
++# 3) After performing some simple gdb commands, the program is
++#    run again.  In the course of running the objfile destructor
++#    associated with the shared object, values are preserved
++#    along with their types.  As noted earlier, it was during
++#    the recursive type copy that the bug was observed.
++#
++# Therefore, due to #2 above, this test case creates debug info
++# which is then used by a shared object.
++
++# This test can't be run on targets lacking shared library support.
++if [skip_shlib_tests] {
++    return 0
++}
++
++load_lib dwarf.exp
++
++# This test can only be run on targets which support DWARF-2 and use gas.
++if ![dwarf2_support] {
++    return 0
++}
++
++# gdb_test_file_name is the name of this file without the .exp
++# extension.  Use it to form basenames for the main program
++# and shared object.
++set main_basename ${::gdb_test_file_name}-main
++set lib_basename ${::gdb_test_file_name}-lib
++
++# We're generating DWARF assembly for the shared object; therefore,
++# the source file for the library / shared object must be listed first
++# (in the standard_testfile invocation) since ${srcfile} is used by
++# get_func_info (for determining the start, end, and length of a
++# function).
++#
++# The output of Dwarf::assemble will be placed in $lib_basename.S
++# which will be ${srcfile3} after the execution of standard_testfile.
++
++standard_testfile $lib_basename.c $main_basename.c $lib_basename.S
++
++set libsrc "${::srcdir}/${::subdir}/${::srcfile}"
++set lib_so [standard_output_file ${lib_basename}.so]
++set asm_file [standard_output_file ${::srcfile3}]
++
++# We need to know the size of some types in order to write some of the
++# debugging info that we're about to generate.  For that, we ask GDB
++# by debugging the shared object associated with this test case.
++
++# Compile the shared library: -DIS_SHAREDLIB prevents main() from
++# being defined.  Note that debugging symbols will be present for
++# this compilation.
++if {[gdb_compile_shlib $libsrc $lib_so \
++                       {additional_flags=-DIS_SHAREDLIB debug}] != ""} {
++    untested "failed to compile shared library"
++    return
++}
++
++# Start a fresh GDB and load the shared library.
++clean_restart $lib_so
++
++# Using our running GDB session, determine sizes of several types.
++set long_size [get_sizeof "long" -1]
++set addr_size [get_sizeof "void *" -1]
++set struct_A_size [get_sizeof "g_A" -1]
++set struct_B_size [get_sizeof "g_B" -1]
++
++if { $long_size == -1 || $addr_size == -1 \
++     || $struct_A_size == -1 || $struct_B_size == -1} {
++    perror "Can't determine type sizes"
++    return
++}
++
++# Retrieve struct offset of MBR in struct TP
++proc get_offsetof { tp mbr } {
++    return [get_integer_valueof "&((${tp} *) 0)->${mbr}" -1]
++}
++
++# Use running GDB session to get struct offsets
++set A_a [get_offsetof A a]
++set A_x [get_offsetof A x]
++set B_a [get_offsetof B a]
++set B_b [get_offsetof B b]
++set B_x2 [get_offsetof B x2]
++
++# Create the DWARF.
++Dwarf::assemble ${asm_file} {
++    declare_labels L
++
++    # Find start, end, and length of functions foo and bar.
++    # These calls to get_func_info will create and set variables
++    # foo_start, bar_start, foo_end, bar_end, foo_len, and
++    # bar_len.
++    #
++    # In order to get the right answers, get_func_info (and,
++    # underneath, function_range) should use the same compiler flags
++    # as those used to make a shared object.  For any targets that get
++    # this far, -fpic is probably correct.
++    #
++    # Also, it should be noted that IS_SHAREDLIB is NOT defined as one
++    # of the additional flags.  Not defining IS_SHAREDLIB will cause a
++    # main() to be defined for the compilation of the shared library
++    # source file which happens as a result of using get_func_info;
++    # this is currently required in order to this facility.
++    set flags {additional_flags=-fpic debug}
++    get_func_info foo $flags
++    get_func_info bar $flags
++
++    cu {} {
++	DW_TAG_compile_unit {
++	    {DW_AT_language @DW_LANG_C_plus_plus}
++	    {name ${::srcfile}}
++	    {stmt_list $L DW_FORM_sec_offset}
++        } {
++	    declare_labels int_label class_A_label class_B_label \
++	                   B_ptr_label
++
++	    int_label: DW_TAG_base_type {
++		{DW_AT_byte_size ${::long_size} DW_FORM_udata}
++		{DW_AT_encoding @DW_ATE_signed}
++		{DW_AT_name "int"}
++	    }
++
++	    class_A_label: DW_TAG_class_type {
++		{DW_AT_name "A"}
++		{DW_AT_byte_size ${::struct_A_size} DW_FORM_sdata}
++	    } {
++		DW_TAG_member {
++		    {DW_AT_name "a"}
++		    {DW_AT_type :$int_label}
++		    {DW_AT_data_member_location ${::A_a} DW_FORM_udata}
++		}
++		DW_TAG_member {
++		    {DW_AT_name "x"}
++		    {DW_AT_type :$int_label}
++		    {DW_AT_data_member_location ${::A_x} DW_FORM_udata}
++		}
++	    }
++
++	    class_B_label: DW_TAG_class_type {
++		{DW_AT_name "B"}
++		{DW_AT_byte_size ${::struct_B_size} DW_FORM_sdata}
++	    } {
++		# While there are easier / better ways to specify an
++		# offset used by DW_AT_data_member_location than that
++		# used below, we need a location expression here in
++		# order to reproduce the bug.  Moreover, this location
++		# expression needs to use opcodes that aren't handled
++		# by decode_locdesc() in dwarf2/read.c; if we use
++		# opcodes that _are_ handled by that function, the
++		# location expression will be converted into a simple
++		# offset - which will then (again) not reproduce the
++		# bug.  At the time that this test was written,
++		# neither DW_OP_pick nor DW_OP_drop were being handled
++		# by decode_locdesc(); this is why those opcodes were
++		# chosen.
++		DW_TAG_inheritance {
++		    {DW_AT_type :$class_A_label}
++		    {DW_AT_data_member_location {
++			DW_OP_constu ${::B_a}
++			DW_OP_plus
++			DW_OP_pick 0
++			DW_OP_drop} SPECIAL_expr}
++		    {DW_AT_accessibility 1 DW_FORM_data1}
++		}
++		DW_TAG_member {
++		    {DW_AT_name "b"}
++		    {DW_AT_type :$int_label}
++		    {DW_AT_data_member_location ${::B_b} DW_FORM_udata}
++		}
++		DW_TAG_member {
++		    {DW_AT_name "x2"}
++		    {DW_AT_type :$int_label}
++		    {DW_AT_data_member_location ${::B_x2} DW_FORM_udata}
++		}
++	    }
++
++	    B_ptr_label: DW_TAG_pointer_type {
++		{DW_AT_type :$class_B_label}
++		{DW_AT_byte_size ${::addr_size} DW_FORM_sdata}
++	    }
++
++	    DW_TAG_variable {
++		{DW_AT_name "g_A"}
++		{DW_AT_type :$class_A_label}
++		{DW_AT_external 1 flag}
++		{DW_AT_location {DW_OP_addr [gdb_target_symbol "g_A"]} \
++		                 SPECIAL_expr}
++	    }
++
++	    DW_TAG_variable {
++		{DW_AT_name "g_B"}
++		{DW_AT_type :$class_B_label}
++		{DW_AT_external 1 flag}
++		{DW_AT_location {DW_OP_addr [gdb_target_symbol "g_B"]} \
++		                 SPECIAL_expr}
++	    }
++
++	    # We can't use MACRO_AT for the definitions of foo and bar
++	    # because it doesn't provide a way to pass the appropriate
++	    # flags.  Therefore, we list the name, low_pc, and high_pc
++	    # explicitly.
++	    DW_TAG_subprogram {
++		{DW_AT_name foo}
++		{DW_AT_low_pc $foo_start DW_FORM_addr}
++		{DW_AT_high_pc $foo_end DW_FORM_addr}
++		{DW_AT_type :${B_ptr_label}}
++		{DW_AT_external 1 flag}
++	    }
++
++	    DW_TAG_subprogram {
++		{DW_AT_name bar}
++		{DW_AT_low_pc $bar_start DW_FORM_addr}
++		{DW_AT_high_pc $bar_end DW_FORM_addr}
++		{DW_AT_type :${B_ptr_label}}
++		{DW_AT_external 1 flag}
++	    } {
++		DW_TAG_formal_parameter {
++		    {DW_AT_name v}
++		    {DW_AT_type :${B_ptr_label}}
++		}
++	    }
++	}
++    }
++
++    lines {version 2} L {
++	include_dir "${::srcdir}/${::subdir}"
++	file_name "${::srcfile}" 1
++
++	# Generate a line table program.
++	program {
++	    {DW_LNE_set_address $foo_start}
++	    {line [gdb_get_line_number "foo prologue"]}
++	    {DW_LNS_copy}
++	    {DW_LNE_set_address foo_label}
++	    {line [gdb_get_line_number "foo return"]}
++	    {DW_LNS_copy}
++	    {line [gdb_get_line_number "foo end"]}
++	    {DW_LNS_copy}
++	    {DW_LNE_set_address $foo_end}
++	    {DW_LNS_advance_line 1}
++	    {DW_LNS_copy}
++	    {DW_LNE_end_sequence}
++
++	    {DW_LNE_set_address $bar_start}
++	    {line [gdb_get_line_number "bar prologue"]}
++	    {DW_LNS_copy}
++	    {DW_LNE_set_address bar_label}
++	    {line [gdb_get_line_number "bar return"]}
++	    {DW_LNS_copy}
++	    {line [gdb_get_line_number "bar end"]}
++	    {DW_LNS_copy}
++	    {DW_LNE_set_address $bar_end}
++	    {DW_LNS_advance_line 1}
++	    {DW_LNS_copy}
++	    {DW_LNE_end_sequence}
++	}
++    }
++}
++
++# Compile the shared object again, but this time include / use the
++# DWARF info that we've created above.  Note that (again)
++# -DIS_SHAREDLIB is used to prevent inclusion of main() in the shared
++# object.  Also note the use of the "nodebug" option.  Any debugging
++# information that we need will be provided by the DWARF info created
++# above.
++if {[gdb_compile_shlib [list $libsrc $asm_file] $lib_so \
++                       {additional_flags=-DIS_SHAREDLIB nodebug}] != ""} {
++    untested "failed to compile shared library"
++    return
++}
++
++# Compile the main program for use with the shared object.
++if [prepare_for_testing "failed to prepare" ${testfile} \
++                        ${::srcfile2} [list debug shlib=$lib_so]] {
++    return -1
++}
++
++# Do whatever is necessary to make sure that the shared library is
++# loaded for remote targets.
++gdb_load_shlib ${lib_so}
++
++if ![runto_main] then {
++    fail "can't run to main"
++    return
++}
++
++# Step into foo so that we can finish out of it.
++gdb_test "step" "foo .. at .* foo end.*" "step into foo"
++
++# Finishing out of foo will create a value that will later need to
++# be preserved when restarting the program.
++gdb_test "finish" "= \\(class B \\*\\) ${::hex} .*" "finish out of foo"
++
++# Dereferencing and printing the return value isn't necessary
++# for reproducing the bug, but we should make sure that the
++# return value is what we expect it to be.
++gdb_test "p *$" { = {<A> = {a = 8, x = 9}, b = 10, x2 = 11}} \
++         "dereference return value"
++
++# The original PR28030 reproducer stepped back into the shared object,
++# so we'll do the same here:
++gdb_test "step" "bar \\(.*" "step into bar"
++
++# We don't want a clean restart here since that will be too clean.
++# The original reproducer for PR28030 set a breakpoint in the shared
++# library and then restarted via "run".  The command below does roughly
++# the same thing.  It's at this step that an internal error would
++# occur for PR28030.  The "message" argument tells runto to turn on
++# the printing of PASSes while runto is doing its job.
++runto "bar" message
+diff --git a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.h b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.h
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.h
+@@ -0,0 +1,30 @@
++/* Copyright (C) 2021 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/>.  */
++
++typedef struct A {
++    long a;
++    long x;
++} A;
++
++typedef struct B {
++    A a;
++    long b;
++    long x2;
++} B;
++
++extern B *foo ();
++extern B *bar (B *v);

SOURCES/gdb-test-ivy-bridge.patch

@@ -0,0 +1,468 @@
+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-test-ivy-bridge.patch
+
+;; Test GDB opcodes/ disassembly of Intel Ivy Bridge instructions (BZ 696890).
+;;=fedoratest
+
+diff --git a/gdb/testsuite/gdb.arch/amd64-ivy-bridge.S b/gdb/testsuite/gdb.arch/amd64-ivy-bridge.S
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/amd64-ivy-bridge.S
+@@ -0,0 +1,98 @@
++/* Copyright 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/>.
++
++   This file is part of the gdb testsuite.  */
++
++	.globl _start
++_start:	.text
++
++/* gas/i386/x86-64-rdrnd.s */
++	.att_syntax prefix
++	rdrand %bx
++	rdrand %ebx
++	rdrand %rbx
++	rdrand %r8w
++	rdrand %r8d
++	rdrand %r8
++
++	.intel_syntax noprefix
++	rdrand bx
++	rdrand ebx
++	rdrand rbx
++	rdrand r8w
++	rdrand r8d
++	rdrand r8
++
++/* gas/i386/x86-64-f16c.s */
++	.att_syntax prefix
++	vcvtph2ps %xmm4,%ymm4
++	vcvtph2ps (%r8),%ymm8
++	vcvtph2ps %xmm4,%xmm6
++	vcvtph2ps (%rcx),%xmm4
++	vcvtps2ph $0x2,%ymm4,%xmm4
++	vcvtps2ph $0x2,%ymm8,(%r8)
++	vcvtps2ph $0x2,%xmm4,%xmm4
++	vcvtps2ph $0x2,%xmm4,(%rcx)
++
++	.intel_syntax noprefix
++	vcvtph2ps ymm4,xmm4
++	vcvtph2ps ymm8,XMMWORD PTR [r8]
++	vcvtph2ps ymm4,[rcx]
++	vcvtph2ps xmm6,xmm4
++	vcvtph2ps xmm4,QWORD PTR [rcx]
++	vcvtph2ps xmm4,[rcx]
++	vcvtps2ph xmm4,ymm4,0x2
++	vcvtps2ph XMMWORD PTR [rcx],ymm4,0x2
++	vcvtps2ph [rcx],ymm4,0x2
++	vcvtps2ph xmm4,xmm4,0x2
++	vcvtps2ph QWORD PTR [r8],xmm8,0x2
++	vcvtps2ph [rcx],xmm4,0x2
++
++/* gas/i386/x86-64-fsgs.s */
++	.att_syntax prefix
++	rdfsbase %ebx
++	rdfsbase %rbx
++	rdfsbase %r8d
++	rdfsbase %r8
++	rdgsbase %ebx
++	rdgsbase %rbx
++	rdgsbase %r8d
++	rdgsbase %r8
++	wrfsbase %ebx
++	wrfsbase %rbx
++	wrfsbase %r8d
++	wrfsbase %r8
++	wrgsbase %ebx
++	wrgsbase %rbx
++	wrgsbase %r8d
++	wrgsbase %r8
++
++	.intel_syntax noprefix
++	rdfsbase ebx
++	rdfsbase rbx
++	rdfsbase r8d
++	rdfsbase r8
++	rdgsbase ebx
++	rdgsbase rbx
++	rdgsbase r8d
++	rdgsbase r8
++	wrfsbase ebx
++	wrfsbase rbx
++	wrfsbase r8d
++	wrfsbase r8
++	wrgsbase ebx
++	wrgsbase rbx
++	wrgsbase r8d
++	wrgsbase r8
+diff --git a/gdb/testsuite/gdb.arch/amd64-ivy-bridge.exp b/gdb/testsuite/gdb.arch/amd64-ivy-bridge.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/amd64-ivy-bridge.exp
+@@ -0,0 +1,170 @@
++# Copyright 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/>.
++
++if {![istarget "x86_64-*-*"]} then {
++    return
++}
++
++set testfile amd64-ivy-bridge
++set test compilation
++if [prepare_for_testing ${testfile}.exp ${testfile}.x ${testfile}.S [list debug "additional_flags=-m64 -nostdlib"]] {
++    unsupported $test
++    return -1
++}
++pass $test
++
++gdb_test_no_output "set disassembly-flavor att"
++# gas/i386/x86-64-rdrnd.d
++# gas/i386/x86-64-f16c.d
++# gas/i386/x86-64-fsgs.d
++gdb_test "disassemble/r _start" "\r
++Dump of assembler code for function _start:\r
++\[^\r\n\]+:\t66 0f c7 f3\t\(             \)?rdrand %bx\r
++\[^\r\n\]+:\t0f c7 f3\t\(                \)?rdrand %ebx\r
++\[^\r\n\]+:\t48 0f c7 f3\t\(             \)?rdrand %rbx\r
++\[^\r\n\]+:\t66 41 0f c7 f0\t\(          \)?rdrand %r8w\r
++\[^\r\n\]+:\t41 0f c7 f0\t\(             \)?rdrand %r8d\r
++\[^\r\n\]+:\t49 0f c7 f0\t\(             \)?rdrand %r8\r
++\[^\r\n\]+:\t66 0f c7 f3\t\(             \)?rdrand %bx\r
++\[^\r\n\]+:\t0f c7 f3\t\(                \)?rdrand %ebx\r
++\[^\r\n\]+:\t48 0f c7 f3\t\(             \)?rdrand %rbx\r
++\[^\r\n\]+:\t66 41 0f c7 f0\t\(          \)?rdrand %r8w\r
++\[^\r\n\]+:\t41 0f c7 f0\t\(             \)?rdrand %r8d\r
++\[^\r\n\]+:\t49 0f c7 f0\t\(             \)?rdrand %r8\r
++\[^\r\n\]+:\tc4 e2 7d 13 e4\t\(          \)?vcvtph2ps %xmm4,%ymm4\r
++\[^\r\n\]+:\tc4 42 7d 13 00\t\(          \)?vcvtph2ps \\(%r8\\),%ymm8\r
++\[^\r\n\]+:\tc4 e2 79 13 f4\t\(          \)?vcvtph2ps %xmm4,%xmm6\r
++\[^\r\n\]+:\tc4 e2 79 13 21\t\(          \)?vcvtph2ps \\(%rcx\\),%xmm4\r
++\[^\r\n\]+:\tc4 e3 7d 1d e4 02\t\(       \)?vcvtps2ph \\\$0x2,%ymm4,%xmm4\r
++\[^\r\n\]+:\tc4 43 7d 1d 00 02\t\(       \)?vcvtps2ph \\\$0x2,%ymm8,\\(%r8\\)\r
++\[^\r\n\]+:\tc4 e3 79 1d e4 02\t\(       \)?vcvtps2ph \\\$0x2,%xmm4,%xmm4\r
++\[^\r\n\]+:\tc4 e3 79 1d 21 02\t\(       \)?vcvtps2ph \\\$0x2,%xmm4,\\(%rcx\\)\r
++\[^\r\n\]+:\tc4 e2 7d 13 e4\t\(          \)?vcvtph2ps %xmm4,%ymm4\r
++\[^\r\n\]+:\tc4 42 7d 13 00\t\(          \)?vcvtph2ps \\(%r8\\),%ymm8\r
++\[^\r\n\]+:\tc4 e2 7d 13 21\t\(          \)?vcvtph2ps \\(%rcx\\),%ymm4\r
++\[^\r\n\]+:\tc4 e2 79 13 f4\t\(          \)?vcvtph2ps %xmm4,%xmm6\r
++\[^\r\n\]+:\tc4 e2 79 13 21\t\(          \)?vcvtph2ps \\(%rcx\\),%xmm4\r
++\[^\r\n\]+:\tc4 e2 79 13 21\t\(          \)?vcvtph2ps \\(%rcx\\),%xmm4\r
++\[^\r\n\]+:\tc4 e3 7d 1d e4 02\t\(       \)?vcvtps2ph \\\$0x2,%ymm4,%xmm4\r
++\[^\r\n\]+:\tc4 e3 7d 1d 21 02\t\(       \)?vcvtps2ph \\\$0x2,%ymm4,\\(%rcx\\)\r
++\[^\r\n\]+:\tc4 e3 7d 1d 21 02\t\(       \)?vcvtps2ph \\\$0x2,%ymm4,\\(%rcx\\)\r
++\[^\r\n\]+:\tc4 e3 79 1d e4 02\t\(       \)?vcvtps2ph \\\$0x2,%xmm4,%xmm4\r
++\[^\r\n\]+:\tc4 43 79 1d 00 02\t\(       \)?vcvtps2ph \\\$0x2,%xmm8,\\(%r8\\)\r
++\[^\r\n\]+:\tc4 e3 79 1d 21 02\t\(       \)?vcvtps2ph \\\$0x2,%xmm4,\\(%rcx\\)\r
++\[^\r\n\]+:\tf3 0f ae c3\t\(             \)?rdfsbase %ebx\r
++\[^\r\n\]+:\tf3 48 0f ae c3\t\(          \)?rdfsbase %rbx\r
++\[^\r\n\]+:\tf3 41 0f ae c0\t\(          \)?rdfsbase %r8d\r
++\[^\r\n\]+:\tf3 49 0f ae c0\t\(          \)?rdfsbase %r8\r
++\[^\r\n\]+:\tf3 0f ae cb\t\(             \)?rdgsbase %ebx\r
++\[^\r\n\]+:\tf3 48 0f ae cb\t\(          \)?rdgsbase %rbx\r
++\[^\r\n\]+:\tf3 41 0f ae c8\t\(          \)?rdgsbase %r8d\r
++\[^\r\n\]+:\tf3 49 0f ae c8\t\(          \)?rdgsbase %r8\r
++\[^\r\n\]+:\tf3 0f ae d3\t\(             \)?wrfsbase %ebx\r
++\[^\r\n\]+:\tf3 48 0f ae d3\t\(          \)?wrfsbase %rbx\r
++\[^\r\n\]+:\tf3 41 0f ae d0\t\(          \)?wrfsbase %r8d\r
++\[^\r\n\]+:\tf3 49 0f ae d0\t\(          \)?wrfsbase %r8\r
++\[^\r\n\]+:\tf3 0f ae db\t\(             \)?wrgsbase %ebx\r
++\[^\r\n\]+:\tf3 48 0f ae db\t\(          \)?wrgsbase %rbx\r
++\[^\r\n\]+:\tf3 41 0f ae d8\t\(          \)?wrgsbase %r8d\r
++\[^\r\n\]+:\tf3 49 0f ae d8\t\(          \)?wrgsbase %r8\r
++\[^\r\n\]+:\tf3 0f ae c3\t\(             \)?rdfsbase %ebx\r
++\[^\r\n\]+:\tf3 48 0f ae c3\t\(          \)?rdfsbase %rbx\r
++\[^\r\n\]+:\tf3 41 0f ae c0\t\(          \)?rdfsbase %r8d\r
++\[^\r\n\]+:\tf3 49 0f ae c0\t\(          \)?rdfsbase %r8\r
++\[^\r\n\]+:\tf3 0f ae cb\t\(             \)?rdgsbase %ebx\r
++\[^\r\n\]+:\tf3 48 0f ae cb\t\(          \)?rdgsbase %rbx\r
++\[^\r\n\]+:\tf3 41 0f ae c8\t\(          \)?rdgsbase %r8d\r
++\[^\r\n\]+:\tf3 49 0f ae c8\t\(          \)?rdgsbase %r8\r
++\[^\r\n\]+:\tf3 0f ae d3\t\(             \)?wrfsbase %ebx\r
++\[^\r\n\]+:\tf3 48 0f ae d3\t\(          \)?wrfsbase %rbx\r
++\[^\r\n\]+:\tf3 41 0f ae d0\t\(          \)?wrfsbase %r8d\r
++\[^\r\n\]+:\tf3 49 0f ae d0\t\(          \)?wrfsbase %r8\r
++\[^\r\n\]+:\tf3 0f ae db\t\(             \)?wrgsbase %ebx\r
++\[^\r\n\]+:\tf3 48 0f ae db\t\(          \)?wrgsbase %rbx\r
++\[^\r\n\]+:\tf3 41 0f ae d8\t\(          \)?wrgsbase %r8d\r
++\[^\r\n\]+:\tf3 49 0f ae d8\t\(          \)?wrgsbase %r8\r
++End of assembler dump\\." "att"
++
++gdb_test_no_output "set disassembly-flavor intel"
++# gas/i386/x86-64-rdrnd-intel.d
++# gas/i386/x86-64-f16c-intel.d
++# gas/i386/x86-64-fsgs-intel.d
++gdb_test "disassemble/r _start" "\r
++Dump of assembler code for function _start:\r
++\[^\r\n\]+:\t66 0f c7 f3\t\(             \)?rdrand bx\r
++\[^\r\n\]+:\t0f c7 f3\t\(                \)?rdrand ebx\r
++\[^\r\n\]+:\t48 0f c7 f3\t\(             \)?rdrand rbx\r
++\[^\r\n\]+:\t66 41 0f c7 f0\t\(          \)?rdrand r8w\r
++\[^\r\n\]+:\t41 0f c7 f0\t\(             \)?rdrand r8d\r
++\[^\r\n\]+:\t49 0f c7 f0\t\(             \)?rdrand r8\r
++\[^\r\n\]+:\t66 0f c7 f3\t\(             \)?rdrand bx\r
++\[^\r\n\]+:\t0f c7 f3\t\(                \)?rdrand ebx\r
++\[^\r\n\]+:\t48 0f c7 f3\t\(             \)?rdrand rbx\r
++\[^\r\n\]+:\t66 41 0f c7 f0\t\(          \)?rdrand r8w\r
++\[^\r\n\]+:\t41 0f c7 f0\t\(             \)?rdrand r8d\r
++\[^\r\n\]+:\t49 0f c7 f0\t\(             \)?rdrand r8\r
++\[^\r\n\]+:\tc4 e2 7d 13 e4\t\(          \)?vcvtph2ps ymm4,xmm4\r
++\[^\r\n\]+:\tc4 42 7d 13 00\t\(          \)?vcvtph2ps ymm8,XMMWORD PTR \\\[r8\\\]\r
++\[^\r\n\]+:\tc4 e2 79 13 f4\t\(          \)?vcvtph2ps xmm6,xmm4\r
++\[^\r\n\]+:\tc4 e2 79 13 21\t\(          \)?vcvtph2ps xmm4,QWORD PTR \\\[rcx\\\]\r
++\[^\r\n\]+:\tc4 e3 7d 1d e4 02\t\(       \)?vcvtps2ph xmm4,ymm4,0x2\r
++\[^\r\n\]+:\tc4 43 7d 1d 00 02\t\(       \)?vcvtps2ph XMMWORD PTR \\\[r8\\\],ymm8,0x2\r
++\[^\r\n\]+:\tc4 e3 79 1d e4 02\t\(       \)?vcvtps2ph xmm4,xmm4,0x2\r
++\[^\r\n\]+:\tc4 e3 79 1d 21 02\t\(       \)?vcvtps2ph QWORD PTR \\\[rcx\\\],xmm4,0x2\r
++\[^\r\n\]+:\tc4 e2 7d 13 e4\t\(          \)?vcvtph2ps ymm4,xmm4\r
++\[^\r\n\]+:\tc4 42 7d 13 00\t\(          \)?vcvtph2ps ymm8,XMMWORD PTR \\\[r8\\\]\r
++\[^\r\n\]+:\tc4 e2 7d 13 21\t\(          \)?vcvtph2ps ymm4,XMMWORD PTR \\\[rcx\\\]\r
++\[^\r\n\]+:\tc4 e2 79 13 f4\t\(          \)?vcvtph2ps xmm6,xmm4\r
++\[^\r\n\]+:\tc4 e2 79 13 21\t\(          \)?vcvtph2ps xmm4,QWORD PTR \\\[rcx\\\]\r
++\[^\r\n\]+:\tc4 e2 79 13 21\t\(          \)?vcvtph2ps xmm4,QWORD PTR \\\[rcx\\\]\r
++\[^\r\n\]+:\tc4 e3 7d 1d e4 02\t\(       \)?vcvtps2ph xmm4,ymm4,0x2\r
++\[^\r\n\]+:\tc4 e3 7d 1d 21 02\t\(       \)?vcvtps2ph XMMWORD PTR \\\[rcx\\\],ymm4,0x2\r
++\[^\r\n\]+:\tc4 e3 7d 1d 21 02\t\(       \)?vcvtps2ph XMMWORD PTR \\\[rcx\\\],ymm4,0x2\r
++\[^\r\n\]+:\tc4 e3 79 1d e4 02\t\(       \)?vcvtps2ph xmm4,xmm4,0x2\r
++\[^\r\n\]+:\tc4 43 79 1d 00 02\t\(       \)?vcvtps2ph QWORD PTR \\\[r8\\\],xmm8,0x2\r
++\[^\r\n\]+:\tc4 e3 79 1d 21 02\t\(       \)?vcvtps2ph QWORD PTR \\\[rcx\\\],xmm4,0x2\r
++\[^\r\n\]+:\tf3 0f ae c3\t\(             \)?rdfsbase ebx\r
++\[^\r\n\]+:\tf3 48 0f ae c3\t\(          \)?rdfsbase rbx\r
++\[^\r\n\]+:\tf3 41 0f ae c0\t\(          \)?rdfsbase r8d\r
++\[^\r\n\]+:\tf3 49 0f ae c0\t\(          \)?rdfsbase r8\r
++\[^\r\n\]+:\tf3 0f ae cb\t\(             \)?rdgsbase ebx\r
++\[^\r\n\]+:\tf3 48 0f ae cb\t\(          \)?rdgsbase rbx\r
++\[^\r\n\]+:\tf3 41 0f ae c8\t\(          \)?rdgsbase r8d\r
++\[^\r\n\]+:\tf3 49 0f ae c8\t\(          \)?rdgsbase r8\r
++\[^\r\n\]+:\tf3 0f ae d3\t\(             \)?wrfsbase ebx\r
++\[^\r\n\]+:\tf3 48 0f ae d3\t\(          \)?wrfsbase rbx\r
++\[^\r\n\]+:\tf3 41 0f ae d0\t\(          \)?wrfsbase r8d\r
++\[^\r\n\]+:\tf3 49 0f ae d0\t\(          \)?wrfsbase r8\r
++\[^\r\n\]+:\tf3 0f ae db\t\(             \)?wrgsbase ebx\r
++\[^\r\n\]+:\tf3 48 0f ae db\t\(          \)?wrgsbase rbx\r
++\[^\r\n\]+:\tf3 41 0f ae d8\t\(          \)?wrgsbase r8d\r
++\[^\r\n\]+:\tf3 49 0f ae d8\t\(          \)?wrgsbase r8\r
++\[^\r\n\]+:\tf3 0f ae c3\t\(             \)?rdfsbase ebx\r
++\[^\r\n\]+:\tf3 48 0f ae c3\t\(          \)?rdfsbase rbx\r
++\[^\r\n\]+:\tf3 41 0f ae c0\t\(          \)?rdfsbase r8d\r
++\[^\r\n\]+:\tf3 49 0f ae c0\t\(          \)?rdfsbase r8\r
++\[^\r\n\]+:\tf3 0f ae cb\t\(             \)?rdgsbase ebx\r
++\[^\r\n\]+:\tf3 48 0f ae cb\t\(          \)?rdgsbase rbx\r
++\[^\r\n\]+:\tf3 41 0f ae c8\t\(          \)?rdgsbase r8d\r
++\[^\r\n\]+:\tf3 49 0f ae c8\t\(          \)?rdgsbase r8\r
++\[^\r\n\]+:\tf3 0f ae d3\t\(             \)?wrfsbase ebx\r
++\[^\r\n\]+:\tf3 48 0f ae d3\t\(          \)?wrfsbase rbx\r
++\[^\r\n\]+:\tf3 41 0f ae d0\t\(          \)?wrfsbase r8d\r
++\[^\r\n\]+:\tf3 49 0f ae d0\t\(          \)?wrfsbase r8\r
++\[^\r\n\]+:\tf3 0f ae db\t\(             \)?wrgsbase ebx\r
++\[^\r\n\]+:\tf3 48 0f ae db\t\(          \)?wrgsbase rbx\r
++\[^\r\n\]+:\tf3 41 0f ae d8\t\(          \)?wrgsbase r8d\r
++\[^\r\n\]+:\tf3 49 0f ae d8\t\(          \)?wrgsbase r8\r
++End of assembler dump\\." "intel"
+diff --git a/gdb/testsuite/gdb.arch/i386-ivy-bridge.S b/gdb/testsuite/gdb.arch/i386-ivy-bridge.S
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/i386-ivy-bridge.S
+@@ -0,0 +1,66 @@
++/* Copyright 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/>.
++
++   This file is part of the gdb testsuite.  */
++
++	.globl _start
++_start:	.text
++
++/* gas/i386/rdrnd.s */
++	.att_syntax prefix
++	rdrand %bx
++	rdrand %ebx
++
++	.intel_syntax noprefix
++	rdrand bx
++	rdrand ebx
++
++/* gas/i386/f16c.s */
++	.att_syntax prefix
++	vcvtph2ps %xmm4,%ymm4
++	vcvtph2ps (%ecx),%ymm4
++	vcvtph2ps %xmm4,%xmm6
++	vcvtph2ps (%ecx),%xmm4
++	vcvtps2ph $0x2,%ymm4,%xmm4
++	vcvtps2ph $0x2,%ymm4,(%ecx)
++	vcvtps2ph $0x2,%xmm4,%xmm4
++	vcvtps2ph $0x2,%xmm4,(%ecx)
++
++	.intel_syntax noprefix
++	vcvtph2ps ymm4,xmm4
++	vcvtph2ps ymm4,XMMWORD PTR [ecx]
++	vcvtph2ps ymm4,[ecx]
++	vcvtph2ps xmm6,xmm4
++	vcvtph2ps xmm4,QWORD PTR [ecx]
++	vcvtph2ps xmm4,[ecx]
++	vcvtps2ph xmm4,ymm4,0x2
++	vcvtps2ph XMMWORD PTR [ecx],ymm4,0x2
++	vcvtps2ph [ecx],ymm4,0x2
++	vcvtps2ph xmm4,xmm4,0x2
++	vcvtps2ph QWORD PTR [ecx],xmm4,0x2
++	vcvtps2ph [ecx],xmm4,0x2
++
++/* gas/i386/fsgs.s */
++	.att_syntax prefix
++	rdfsbase %ebx
++	rdgsbase %ebx
++	wrfsbase %ebx
++	wrgsbase %ebx
++
++	.intel_syntax noprefix
++	rdfsbase ebx
++	rdgsbase ebx
++	wrfsbase ebx
++	wrgsbase ebx
+diff --git a/gdb/testsuite/gdb.arch/i386-ivy-bridge.exp b/gdb/testsuite/gdb.arch/i386-ivy-bridge.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/i386-ivy-bridge.exp
+@@ -0,0 +1,106 @@
++# Copyright 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/>.
++
++if {![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"]} then {
++    return
++}
++
++set testfile i386-ivy-bridge
++set test compilation
++if [prepare_for_testing ${testfile}.exp ${testfile}.x ${testfile}.S [list debug "additional_flags=-m32 -nostdlib"]] {
++    fail $test
++    return -1
++}
++pass $test
++
++gdb_test_no_output "set disassembly-flavor att"
++# gas/i386/rdrnd.d
++# gas/i386/f16c.d
++# gas/i386/fsgs.d
++gdb_test "disassemble/r _start" "\r
++Dump of assembler code for function _start:\r
++\[^\r\n\]+:\t66 0f c7 f3\t\(             \)?rdrand %bx\r
++\[^\r\n\]+:\t0f c7 f3\t\(                \)?rdrand %ebx\r
++\[^\r\n\]+:\t66 0f c7 f3\t\(             \)?rdrand %bx\r
++\[^\r\n\]+:\t0f c7 f3\t\(                \)?rdrand %ebx\r
++\[^\r\n\]+:\tc4 e2 7d 13 e4\t\(          \)?vcvtph2ps %xmm4,%ymm4\r
++\[^\r\n\]+:\tc4 e2 7d 13 21\t\(          \)?vcvtph2ps \\(%ecx\\),%ymm4\r
++\[^\r\n\]+:\tc4 e2 79 13 f4\t\(          \)?vcvtph2ps %xmm4,%xmm6\r
++\[^\r\n\]+:\tc4 e2 79 13 21\t\(          \)?vcvtph2ps \\(%ecx\\),%xmm4\r
++\[^\r\n\]+:\tc4 e3 7d 1d e4 02\t\(       \)?vcvtps2ph \\\$0x2,%ymm4,%xmm4\r
++\[^\r\n\]+:\tc4 e3 7d 1d 21 02\t\(       \)?vcvtps2ph \\\$0x2,%ymm4,\\(%ecx\\)\r
++\[^\r\n\]+:\tc4 e3 79 1d e4 02\t\(       \)?vcvtps2ph \\\$0x2,%xmm4,%xmm4\r
++\[^\r\n\]+:\tc4 e3 79 1d 21 02\t\(       \)?vcvtps2ph \\\$0x2,%xmm4,\\(%ecx\\)\r
++\[^\r\n\]+:\tc4 e2 7d 13 e4\t\(          \)?vcvtph2ps %xmm4,%ymm4\r
++\[^\r\n\]+:\tc4 e2 7d 13 21\t\(          \)?vcvtph2ps \\(%ecx\\),%ymm4\r
++\[^\r\n\]+:\tc4 e2 7d 13 21\t\(          \)?vcvtph2ps \\(%ecx\\),%ymm4\r
++\[^\r\n\]+:\tc4 e2 79 13 f4\t\(          \)?vcvtph2ps %xmm4,%xmm6\r
++\[^\r\n\]+:\tc4 e2 79 13 21\t\(          \)?vcvtph2ps \\(%ecx\\),%xmm4\r
++\[^\r\n\]+:\tc4 e2 79 13 21\t\(          \)?vcvtph2ps \\(%ecx\\),%xmm4\r
++\[^\r\n\]+:\tc4 e3 7d 1d e4 02\t\(       \)?vcvtps2ph \\\$0x2,%ymm4,%xmm4\r
++\[^\r\n\]+:\tc4 e3 7d 1d 21 02\t\(       \)?vcvtps2ph \\\$0x2,%ymm4,\\(%ecx\\)\r
++\[^\r\n\]+:\tc4 e3 7d 1d 21 02\t\(       \)?vcvtps2ph \\\$0x2,%ymm4,\\(%ecx\\)\r
++\[^\r\n\]+:\tc4 e3 79 1d e4 02\t\(       \)?vcvtps2ph \\\$0x2,%xmm4,%xmm4\r
++\[^\r\n\]+:\tc4 e3 79 1d 21 02\t\(       \)?vcvtps2ph \\\$0x2,%xmm4,\\(%ecx\\)\r
++\[^\r\n\]+:\tc4 e3 79 1d 21 02\t\(       \)?vcvtps2ph \\\$0x2,%xmm4,\\(%ecx\\)\r
++\[^\r\n\]+:\tf3 0f ae c3\t\(             \)?rdfsbase %ebx\r
++\[^\r\n\]+:\tf3 0f ae cb\t\(             \)?rdgsbase %ebx\r
++\[^\r\n\]+:\tf3 0f ae d3\t\(             \)?wrfsbase %ebx\r
++\[^\r\n\]+:\tf3 0f ae db\t\(             \)?wrgsbase %ebx\r
++\[^\r\n\]+:\tf3 0f ae c3\t\(             \)?rdfsbase %ebx\r
++\[^\r\n\]+:\tf3 0f ae cb\t\(             \)?rdgsbase %ebx\r
++\[^\r\n\]+:\tf3 0f ae d3\t\(             \)?wrfsbase %ebx\r
++\[^\r\n\]+:\tf3 0f ae db\t\(             \)?wrgsbase %ebx\r
++End of assembler dump\\." "att"
++
++gdb_test_no_output "set disassembly-flavor intel"
++# gas/i386/rdrnd-intel.d
++# gas/i386/f16c-intel.d
++# gas/i386/fsgs-intel.d
++gdb_test "disassemble/r _start" "\r
++Dump of assembler code for function _start:\r
++\[^\r\n\]+:\t66 0f c7 f3\t\(             \)?rdrand bx\r
++\[^\r\n\]+:\t0f c7 f3\t\(                \)?rdrand ebx\r
++\[^\r\n\]+:\t66 0f c7 f3\t\(             \)?rdrand bx\r
++\[^\r\n\]+:\t0f c7 f3\t\(                \)?rdrand ebx\r
++\[^\r\n\]+:\tc4 e2 7d 13 e4\t\(          \)?vcvtph2ps ymm4,xmm4\r
++\[^\r\n\]+:\tc4 e2 7d 13 21\t\(          \)?vcvtph2ps ymm4,XMMWORD PTR \\\[ecx\\\]\r
++\[^\r\n\]+:\tc4 e2 79 13 f4\t\(          \)?vcvtph2ps xmm6,xmm4\r
++\[^\r\n\]+:\tc4 e2 79 13 21\t\(          \)?vcvtph2ps xmm4,QWORD PTR \\\[ecx\\\]\r
++\[^\r\n\]+:\tc4 e3 7d 1d e4 02\t\(       \)?vcvtps2ph xmm4,ymm4,0x2\r
++\[^\r\n\]+:\tc4 e3 7d 1d 21 02\t\(       \)?vcvtps2ph XMMWORD PTR \\\[ecx\\\],ymm4,0x2\r
++\[^\r\n\]+:\tc4 e3 79 1d e4 02\t\(       \)?vcvtps2ph xmm4,xmm4,0x2\r
++\[^\r\n\]+:\tc4 e3 79 1d 21 02\t\(       \)?vcvtps2ph QWORD PTR \\\[ecx\\\],xmm4,0x2\r
++\[^\r\n\]+:\tc4 e2 7d 13 e4\t\(          \)?vcvtph2ps ymm4,xmm4\r
++\[^\r\n\]+:\tc4 e2 7d 13 21\t\(          \)?vcvtph2ps ymm4,XMMWORD PTR \\\[ecx\\\]\r
++\[^\r\n\]+:\tc4 e2 7d 13 21\t\(          \)?vcvtph2ps ymm4,XMMWORD PTR \\\[ecx\\\]\r
++\[^\r\n\]+:\tc4 e2 79 13 f4\t\(          \)?vcvtph2ps xmm6,xmm4\r
++\[^\r\n\]+:\tc4 e2 79 13 21\t\(          \)?vcvtph2ps xmm4,QWORD PTR \\\[ecx\\\]\r
++\[^\r\n\]+:\tc4 e2 79 13 21\t\(          \)?vcvtph2ps xmm4,QWORD PTR \\\[ecx\\\]\r
++\[^\r\n\]+:\tc4 e3 7d 1d e4 02\t\(       \)?vcvtps2ph xmm4,ymm4,0x2\r
++\[^\r\n\]+:\tc4 e3 7d 1d 21 02\t\(       \)?vcvtps2ph XMMWORD PTR \\\[ecx\\\],ymm4,0x2\r
++\[^\r\n\]+:\tc4 e3 7d 1d 21 02\t\(       \)?vcvtps2ph XMMWORD PTR \\\[ecx\\\],ymm4,0x2\r
++\[^\r\n\]+:\tc4 e3 79 1d e4 02\t\(       \)?vcvtps2ph xmm4,xmm4,0x2\r
++\[^\r\n\]+:\tc4 e3 79 1d 21 02\t\(       \)?vcvtps2ph QWORD PTR \\\[ecx\\\],xmm4,0x2\r
++\[^\r\n\]+:\tc4 e3 79 1d 21 02\t\(       \)?vcvtps2ph QWORD PTR \\\[ecx\\\],xmm4,0x2\r
++\[^\r\n\]+:\tf3 0f ae c3\t\(             \)?rdfsbase ebx\r
++\[^\r\n\]+:\tf3 0f ae cb\t\(             \)?rdgsbase ebx\r
++\[^\r\n\]+:\tf3 0f ae d3\t\(             \)?wrfsbase ebx\r
++\[^\r\n\]+:\tf3 0f ae db\t\(             \)?wrgsbase ebx\r
++\[^\r\n\]+:\tf3 0f ae c3\t\(             \)?rdfsbase ebx\r
++\[^\r\n\]+:\tf3 0f ae cb\t\(             \)?rdgsbase ebx\r
++\[^\r\n\]+:\tf3 0f ae d3\t\(             \)?wrfsbase ebx\r
++\[^\r\n\]+:\tf3 0f ae db\t\(             \)?wrgsbase ebx\r
++End of assembler dump\\." "intel"

SOURCES/gdb-test-pid0-core.patch

@@ -0,0 +1,92 @@
+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-test-pid0-core.patch
+
+;; New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435).
+;;=fedoratest
+
+https://bugzilla.redhat.com/show_bug.cgi?id=611435
+
+Fix:
+Re: [RFA]corelow.c: Add tid to add_to_thread_list
+http://sourceware.org/ml/gdb-patches/2010-08/msg00085.html
+http://sourceware.org/ml/gdb-cvs/2010-08/msg00026.html
+2e5bcfdef1ec3883d48c3f87a4be5c0dff25e17e
+
+diff --git a/gdb/testsuite/gdb.arch/x86_64-pid0-core.core.bz2.uu b/gdb/testsuite/gdb.arch/x86_64-pid0-core.core.bz2.uu
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/x86_64-pid0-core.core.bz2.uu
+@@ -0,0 +1,20 @@
++begin 600 x86_64-pid0-core.core.bz2
++M0EIH.3%!629362,CA>P!$/'_____^*#EZ-A!SP36P&_:G0#=14``04A&8,'U
++M2*9`>$$)P`*RN"#*;#4R()IJ8C$TT&FC3$&@`T`#:C1H8C0T,@,FC,D"4T2!
++M"/2CU'B90]31ZAD#U`&AZF@/4:``!HT&F@!H<`#0-`-#0``#3$-&F@```#0R
++M``#")2FD]2>4]0TTT-!HTT--,0,"#$`R!I@AD`#1H,3&GZT.4TO$#H40/`0C
++M2$IRXS,<55!8T,&&,R.Z441"?J9I%G6GUA2!.[]Z"C5S[&19,%VS7E6[3"60
++M@`-*2G)QEQ(;?0Y<=MK]/U?Q)LB%+F37TJ9BI*46)H'*Z@V"`"$"P7]&<Q<?
++M>XZ:JE0E<*:#1M$P3G]>VCI)(A!O$64`5$4`E$$-.``7&(09`8HO`B6K!Q^&
++M562%N)2+0@*HB@%D@5$%!*0!L1&0D4D6\:-$A`)`+<6D82PP*H(J(H!?F;0$
++M%PXB7N!2D4!44`W7"ADEQM6<B]J<B(%1GF'5*0;_00KO55=43LPR0,Q?N72`
++M8"W*_;DV<AN#,XRU]Q-J2FDAFKAQ(9A+ZK$MCY#EI8:W-(15>O9TBO5,_]1)
++M($Q2))#),UE,QQK)E$,3D\W.>!4)QO8A_@^Z_SXS<OEHM*+"M8I1)-C(=DIJ
++MW+@WN)O)YO;3:I9YW-A$)N'2<A`F3),R3"3-'"S3E1;6VE*_95KD<!0050(G
++M,JV"N(Z:@0E#)50BSF)$T6_IN)#"Z8PLQ4UQ9]@Z'+;T]990-:Y:2`P26#!D
++MV+0L6"X@C9`GHAGSY7)%LWOY+E[2/>4;Q8=HV6[:&$@2$@$R29IBW)K%3"O`
++M9^Y0YJ&BXY1U2HTZ5)2H-V\_(.DZHWE+C#WS($(!I"3CUH2#(+(OWUV"*<<9
++MJ%A!J[%O.P&V%GI.`L7<1@0>,^1F\MY=V5UT,&NOG%7TTZ[03!@BHB@&)<A^
++4B.Z!/,0-IZ^W_Q=R13A0D",CA>P`
++`
++end
+diff --git a/gdb/testsuite/gdb.arch/x86_64-pid0-core.exp b/gdb/testsuite/gdb.arch/x86_64-pid0-core.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/x86_64-pid0-core.exp
+@@ -0,0 +1,46 @@
++# This testcase is part of GDB, the GNU debugger.
++#
++# Copyright 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 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.
++
++# Some kernel core files have PID 0 - for the idle task.
++
++if ![istarget "x86_64-*-*"] {
++    verbose "Skipping x86_64-pid0-core test."
++    return
++}
++
++set testfile "x86_64-pid0-core"
++set corebz2uufile ${srcdir}/${subdir}/${testfile}.core.bz2.uu
++set corefile [standard_output_file ${testfile}.core]
++
++if {[catch "system \"uudecode -o - ${corebz2uufile} | bzip2 -dc >${corefile}\""] != 0} {
++    untested "failed uudecode or bzip2"
++    return -1
++}
++file stat ${corefile} corestat
++if {$corestat(size) != 8798208} {
++    untested "uudecode or bzip2 produce invalid result"
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++
++# Former crash was:
++# thread.c:884: internal-error: switch_to_thread: Assertion `inf != NULL' failed.
++gdb_test "core-file ${corefile}" "Program terminated with signal (11|SIGSEGV), Segmentation fault\\.\r\n.*"

SOURCES/gdbinit

@@ -0,0 +1,9 @@
+# System-wide GDB initialization file.
+python
+import glob
+# glob.iglob is not available in python-2.4 (RHEL-5).
+for f in glob.glob('%{_sysconfdir}/gdbinit.d/*.gdb'):
+  gdb.execute('source %s' % f)
+for f in glob.glob('%{_sysconfdir}/gdbinit.d/*.py'):
+  gdb.execute('source %s' % f)
+end

SOURCES/gdbtui

@@ -0,0 +1,2 @@
+#! /bin/sh
+exec gdb -tui "$@"