import gdb-10.2-10.el9

.gdb.metadata

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

.gitignore

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

SOURCES/_gdb.spec.Patch.include

@@ -0,0 +1,465 @@
+# 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
+
+# Notify observers that the inferior has been created
+#=fedoratest
+Patch006: gdb-6.3-inferior-notification-20050721.patch
+
+# Verify printing of inherited members test
+#=fedoratest
+Patch007: 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.
+Patch008: 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.
+Patch009: 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.
+Patch010: gdb-6.5-BEA-testsuite.patch
+
+# Testcase for deadlocking on last address space byte; for corrupted backtraces.
+#=fedoratest
+Patch011: gdb-6.5-last-address-space-byte-test.patch
+
+# Fix readline segfault on excessively long hand-typed lines.
+#=fedoratest
+Patch012: gdb-6.5-readline-long-line-crash-test.patch
+
+# Fix lockup on trampoline vs. its function lookup; unreproducible (BZ 218379).
+#=fedora
+Patch013: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
+
+# Find symbols properly at their original (included) file (BZ 109921).
+#=fedoratest
+Patch014: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
+
+# Update PPC unwinding patches to their upstream variants (BZ 140532).
+#=fedoratest
+Patch015: gdb-6.3-bz140532-ppc-unwinding-test.patch
+
+# Testcase for exec() from threaded program (BZ 202689).
+#=fedoratest
+Patch016: gdb-6.3-bz202689-exec-from-pthread-test.patch
+
+# Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
+#=fedoratest
+Patch017: gdb-6.6-bz230000-power6-disassembly-test.patch
+
+# Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
+#=fedoratest
+Patch018: gdb-6.6-bz229517-gcore-without-terminal.patch
+
+# Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
+#=fedoratest
+Patch019: gdb-6.6-testsuite-timeouts.patch
+
+# Support for stepping over PPC atomic instruction sequences (BZ 237572).
+#=fedoratest
+Patch020: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
+
+# Test kernel VDSO decoding while attaching to an i386 process.
+#=fedoratest
+Patch021: gdb-6.3-attach-see-vdso-test.patch
+
+# Test leftover zombie process (BZ 243845).
+#=fedoratest
+Patch022: gdb-6.5-bz243845-stale-testing-zombie-test.patch
+
+# New locating of the matching binaries from the pure core file (build-id).
+#=push+jan
+Patch023: 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
+Patch024: gdb-6.6-buildid-locate-solib-missing-ids.patch
+
+#=push+jan
+Patch025: 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.
+Patch026: gdb-6.7-charsign-test.patch
+
+# Test PPC hiding of call-volatile parameter register.
+#=fedoratest
+Patch027: gdb-6.7-ppc-clobbered-registers-O2-test.patch
+
+# Testsuite fixes for more stable/comparable results.
+#=fedoratest
+Patch028: gdb-6.7-testsuite-stable-results.patch
+
+# Test ia64 memory leaks of the code using libunwind.
+#=fedoratest
+Patch029: gdb-6.5-ia64-libunwind-leak-test.patch
+
+# Test hiding unexpected breakpoints on intentional step commands.
+#=fedoratest
+Patch030: gdb-6.5-missed-trap-on-step-test.patch
+
+# Test gcore memory and time requirements for large inferiors.
+#=fedoratest
+Patch031: 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.
+Patch032: gdb-6.3-mapping-zero-inode-test.patch
+
+# Test a crash on `focus cmd', `focus prev' commands.
+#=fedoratest
+Patch033: gdb-6.3-focus-cmd-prev-test.patch
+
+# Test various forms of threads tracking across exec() (BZ 442765).
+#=fedoratest
+Patch034: gdb-6.8-bz442765-threaded-exec-test.patch
+
+# Test a crash on libraries missing the .text section.
+#=fedoratest
+Patch035: gdb-6.5-section-num-fixup-test.patch
+
+# Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
+#=fedoratest
+Patch036: gdb-6.8-bz466901-backtrace-full-prelinked.patch
+
+# New test for step-resume breakpoint placed in multiple threads at once.
+#=fedoratest
+Patch037: 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@.*>
+Patch038: 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.
+Patch039: gdb-ccache-workaround.patch
+
+# Testcase for "Do not make up line information" fix by Daniel Jacobowitz.
+#=fedoratest
+Patch040: gdb-lineno-makeup-test.patch
+
+# Test power7 ppc disassembly.
+#=fedoratest
+Patch041: gdb-ppc-power7-test.patch
+
+# Fix follow-exec for C++ programs (bugreported by Martin Stransky).
+#=fedoratest
+Patch042: gdb-archer-next-over-throw-cxx-exec.patch
+
+# Backport DWARF-4 support (BZ 601887, Tom Tromey).
+#=fedoratest
+Patch043: gdb-bz601887-dwarf4-rh-test.patch
+
+# Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
+#=push+jan
+Patch044: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+
+# [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
+#=fedoratest
+Patch045: gdb-test-bt-cfi-without-die.patch
+
+# Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
+#=fedoratest
+Patch046: gdb-bz634108-solib_address.patch
+
+# New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435).
+#=fedoratest
+Patch047: gdb-test-pid0-core.patch
+
+# [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
+#=fedoratest
+Patch048: gdb-test-dw2-aranges.patch
+
+# [archer-keiths-expr-cumulative+upstream] Import C++ testcases.
+#=fedoratest
+Patch049: gdb-test-expr-cumulative-archer.patch
+
+# Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
+#=fedoratest
+Patch050: gdb-physname-pr11734-test.patch
+
+# Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
+#=fedoratest
+Patch051: gdb-physname-pr12273-test.patch
+
+# Test GDB opcodes/ disassembly of Intel Ivy Bridge instructions (BZ 696890).
+#=fedoratest
+Patch052: gdb-test-ivy-bridge.patch
+
+# Hack for proper PIE run of the testsuite.
+#=fedoratest
+Patch053: gdb-runtest-pie-override.patch
+
+# Workaround PR libc/14166 for inferior calls of strstr.
+#=fedoratest: Compatibility with RHELs (unchecked which ones).
+Patch054: gdb-glibc-strstr-workaround.patch
+
+# Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789).
+#=fedoratest
+Patch055: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
+
+# Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
+#=fedoratest
+Patch056: 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
+Patch057: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+
+# Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
+#=fedoratest
+Patch058: 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
+Patch059: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+
+# Display Fortran strings in backtraces.
+#=fedoratest
+Patch060: gdb-fortran-frame-string.patch
+
+# Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
+# crash.' (RH BZ 1156192).
+#=fedoratest
+Patch061: gdb-rhbz1156192-recursive-dlopen-test.patch
+
+# Fix '`catch syscall' doesn't work for parent after `fork' is called'
+# (Philippe Waroquiers, RH BZ 1149205).
+#=fedoratest
+Patch062: 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
+Patch063: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+
+# Test 'info type-printers' Python error (RH BZ 1350436).
+#=fedoratest
+Patch064: gdb-rhbz1350436-type-printers-error.patch
+
+# Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
+# Kratochvil, RH BZ 1084404).
+#=fedoratest
+Patch065: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+
+# Force libncursesw over libncurses to match the includes (RH BZ 1270534).
+#=push+jan
+Patch066: gdb-fedora-libncursesw.patch
+
+# Test clflushopt instruction decode (for RH BZ 1262471).
+#=fedoratest
+Patch067: gdb-opcodes-clflushopt-test.patch
+
+# [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
+#=push+jan
+Patch068: gdb-6.6-buildid-locate-rpm-scl.patch
+
+# [aarch64] Fix hardware watchpoints (RH BZ 1261564).
+#=fedoratest
+Patch069: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+
+# Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
+#=fedora
+Patch070: gdb-container-rh-pkg.patch
+
+# New test for Python "Cannot locate object file for block" (for RH BZ 1325795).
+#=fedoratest
+Patch071: gdb-rhbz1325795-framefilters-test.patch
+
+# [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
+#=fedora
+Patch072: 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
+Patch073: gdb-libexec-add-index.patch
+
+# New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
+#=fedoratest
+Patch074: gdb-rhbz1398387-tab-crash-test.patch
+
+# [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
+# =fedoratest
+Patch075: gdb-rhbz1553104-s390x-arch12-test.patch
+
+# Fix off-by-one error in ada_fold_name.patch (RH BZ 1905996)
+# Upstream patch proposal: https://sourceware.org/pipermail/gdb-patches/2020-December/173935.html
+# =fedoratest
+Patch076: gdb-rhbz1905996-fix-off-by-one-error-in-ada_fold_name.patch
+
+# Backport fix for libstdc++ assert when performing tab completion
+# (RH BZ 1912985).
+Patch077: gdb-rhbz1912985-libstdc++-assert.patch
+
+# Backport fix for frame_id_p assertion failure (RH BZ 1909902).
+Patch078: gdb-rhbz1909902-frame_id_p-assert-1.patch
+
+# Backport patch #2 which fixes a frame_id_p assertion failure (RH BZ 1909902).
+Patch079: gdb-rhbz1909902-frame_id_p-assert-2.patch
+
+# Backport change which fixes gdbserver testing hang on f34 and rawhide.
+Patch080: gdb-rhbz1941080-fix-gdbserver-hang.patch
+
+# Backport "Disable bracketed paste mode in GDB tests"
+# (Tom Tromey)
+Patch081: testing-custom-inputrc.patch
+
+# Backport "Save/restore file offset while reading notes in core file"
+# (Keith Seitz, RHBZ 1931344)
+Patch082: gdb-rhbz1931344-bfd_seek-elf_read_notes.patch
+
+# [fortran] Backport Andrew Burgess's commit which cleans up
+# array/string expression evaluation.
+Patch083: gdb-rhbz1964167-fortran-clean-up-array-expression-evaluation.patch
+
+# [fortran] Backport Andrew Burgess's commit which moves Fortran
+# expression handling to f-lang.c.
+Patch084: gdb-rhbz1964167-move-fortran-expr-handling.patch
+
+# [fortran] Backport Andrew Burgess's commit which eliminates undesirable
+# whitespace when printing arrays.
+Patch085: gdb-rhbz1964167-fortran-whitespace_array.patch
+
+# [fortran] Backport Andrew Burgess's commit which changes enum
+# range_type into a bit field enum.
+Patch086: gdb-rhbz1964167-convert-enum-range_type.patch
+
+# [fortran] Backport Andrew Burgess's commit which renames enum
+# range_type to enum range_flag.
+Patch087: gdb-rhbz1964167-fortran-range_type-to-range_flag.patch
+
+# [fortran] Backport Andrew Burgess's commit which adds support
+# for array strides in expressions.
+Patch088: gdb-rhbz1964167-fortran-array-strides-in-expressions.patch
+
+# [fortran] Backport Andrew Burgess's commit for Fortran array
+# slice support
+Patch089: gdb-rhbz1964167-fortran-array-slices-at-prompt.patch
+
+# [fortran] Backport Simon Marchi's commit which fixes a 32-bit build
+# problem in gdb/f-lang.c.
+Patch090: gdb-rhbz1964167-fortran-fix-type-format-mismatch-in-f-lang.c.patch
+
+# Backport of "Exclude debuginfo files from 'outside of ELF segments'
+# warning"  (Keith Seitz)
+Patch091: gdb-rhbz1898252-loadable-section-outside-ELF-segments.patch
+
+# Backport of "Correct recording of 'store on condition' insns"
+# Andreas Arnaz (RH BZ 1903374)
+Patch092: gdb-rhbz1903375-s390x-store-on-condition.patch
+
+# Backport "Fix crash when expanding partial symtabs with DW_TAG_imported_unit"
+# (Tom Tromey, gdb/27743)
+Patch093: gdb-gdb27743-psymtab-imported-unit.patch
+
+# Backport "[gdb/server] Don't overwrite fs/gs_base with -m32"
+# (Tom de Vries)
+Patch094: gdb-dont-overwrite-fsgsbase-m32.patch
+
+# Backport "Fix gdb.fortran/array-slices.exp with -m32"
+# (Tom de Vres)
+Patch095: gdb-testsuite26997-fix-array-slices-m32.patch
+
+# Backport "adjust gdb.python/flexible-array-member.exp expected pattern"
+# (Simon Marchi)
+Patch096: gdb-flexible-array-member-expected-pattern.patch
+
+# Backport "gdb: try to load libthread_db only after reading all
+# shared libraries when attaching / handling a fork child"
+# (Simon Marchi, RH BZ 1971095)
+Patch097: gdb-rhbz1971095-libthread_db-update-1of5.patch
+
+# Backport "libthread_db initialization changes related to upcoming
+# glibc-2.34"
+# (Kevin Buettner, RH BZ 19710950
+Patch098: gdb-rhbz1971095-libthread_db-update-2of5.patch
+
+# Backport "testsuite/glib-2.34: Match/consume optional libthread_db
+# related output"
+# (Kevin Buettner, RH BZ 19710950
+Patch099: gdb-rhbz1971095-libthread_db-update-3of5.patch
+
+# Backport "print-symbol-loading.exp: Allow libc symbols to be already loaded"
+# (Kevin Buettner, RH BZ 1971095)
+Patch100: gdb-rhbz1971095-libthread_db-update-4of5.patch
+
+# Backport "mi-sym-info.exp: Increase timeout for 114-symbol-info-functions"
+# (Kevin Buettner, RH BZ 1971095)
+Patch101: gdb-rhbz1971095-libthread_db-update-5of5.patch
+
+# Backport "PowerPC remove 512 bytes region limit if 2nd DAWR is available"
+# (Rogerio Alves, RHBZ 1870029)
+Patch102: gdb-rhbz1870029-powerpc-remove-region-limit-dawr.patch
+
+# Backport "displaced stepping across addpcis/lnia"
+# (Will Schmidt, RHBZ 1870031)
+Patch103: gdb-rhbz1870031-p10-prefixed-insn-1of3.patch
+
+# Backport "gdb-power10-single-step"
+# (Will Schmidt, RHBZ 1870031)
+Patch104: gdb-rhbz1870031-p10-prefixed-insn-2of3.patch
+
+# Backport "Fix build failure for 32-bit targets with..."
+# (Luis Machado, RHBZ 1870031)
+Patch105: gdb-rhbz1870031-p10-prefixed-insn-3of3.patch
+
+# IBM Z: Add support for HLASM extended mnemonics
+# (Andreas Krebbel, RHBZ 2012819)
+Patch106: gdb-rhbz2012819-ibmz-update-1of5.patch
+
+# IBM Z: Add risbgz and risbgnz extended mnemonics
+# (Andreas Krebbel, RHBZ 2012819)
+Patch107: gdb-rhbz2012819-ibmz-update-2of5.patch
+
+# IBM Z: Implement instruction set extensions
+# (Andreas Krebbel, RHBZ 2012819)
+Patch108: gdb-rhbz2012819-ibmz-update-3of5.patch
+
+# IBM Z: Remove lpswey parameter
+# (Andreas Krebbel, RH BZ 2012819)
+Patch109: gdb-rhbz2012819-ibmz-update-4of5.patch
+
+# IBM Z: Add another arch14 instruction
+# (Andreas Krebbel, RHBZ 2012819)
+Patch110: gdb-rhbz2012819-ibmz-update-5of5.patch
+
+# Backport "Add Power 10 PLT instruction patterns"
+# (Carl Love, RHBZ 1870017)
+Patch111: gdb-rhbz1870017-p10-plt-prologue-skipping.patch
+
+# Backport "fix logic of find_comp_unit and set_comp_unit"
+# (Simon Marchi, RHBZ 2086761)
+Patch112: gdb-rhbz2086761-unknown-cfa-rule.patch
+

SOURCES/_gdb.spec.patch.include

@@ -0,0 +1,112 @@
+%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
+%patch089 -p1
+%patch090 -p1
+%patch091 -p1
+%patch092 -p1
+%patch093 -p1
+%patch094 -p1
+%patch095 -p1
+%patch096 -p1
+%patch097 -p1
+%patch098 -p1
+%patch099 -p1
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+%patch108 -p1
+%patch109 -p1
+%patch110 -p1
+%patch111 -p1
+%patch112 -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
+@@ -1726,7 +1726,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 \
+@@ -1775,7 +1775,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 \
+@@ -1798,6 +1816,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-inferior-notification-20050721.patch

@@ -0,0 +1,324 @@
+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-inferior-notification-20050721.patch
+
+;; Notify observers that the inferior has been created
+;;=fedoratest
+
+2005-07-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* gdb.base/attach-32.exp: New test for attaching in 32-bit
+	mode on 64-bit systems.
+	* gdb.base/attach-32.c: Ditto.
+	* gdb.base/attach-32b.c: Ditto.
+
+2007-12-26  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.base/attach-32.exp: Fix forgotten $GDBFLAGS as set.
+
+diff --git a/gdb/testsuite/gdb.base/attach-32.c b/gdb/testsuite/gdb.base/attach-32.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/attach-32.c
+@@ -0,0 +1,20 @@
++/* This program is intended to be started outside of gdb, and then
++   attached to by gdb.  Thus, it simply spins in a loop.  The loop
++   is exited when & if the variable 'should_exit' is non-zero.  (It
++   is initialized to zero in this program, so the loop will never
++   exit unless/until gdb sets the variable to non-zero.)
++   */
++#include <stdio.h>
++
++int  should_exit = 0;
++
++int main ()
++{
++  int  local_i = 0;
++
++  while (! should_exit)
++    {
++      local_i++;
++    }
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.base/attach-32.exp b/gdb/testsuite/gdb.base/attach-32.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/attach-32.exp
+@@ -0,0 +1,246 @@
++# 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.
++#
++# This test was based on attach.exp and modified for 32/64 bit Linux systems. */
++
++# On HP-UX 11.0, this test is causing a process running the program
++# "attach" to be left around spinning.  Until we figure out why, I am
++# commenting out the test to avoid polluting tiamat (our 11.0 nightly
++# test machine) with these processes. RT
++#
++# Setting the magic bit in the target app should work.  I added a
++# "kill", and also a test for the R3 register warning.  JB
++if { ![istarget "x86_64*-*linux*"]
++     && ![istarget "powerpc64*-*linux*"]} {
++    return 0
++}
++
++# are we on a target board
++if {[use_gdb_stub]} {
++    untested "skipping test because of use_gdb_stub"
++    return -1
++}
++
++set testfile "attach-32"
++set srcfile  ${testfile}.c
++set srcfile2 ${testfile}b.c
++set binfile  [standard_output_file ${testfile}]
++set binfile2 [standard_output_file ${testfile}b]
++set escapedbinfile  [string_to_regexp [standard_output_file ${testfile}]]
++
++#execute_anywhere "rm -f ${binfile} ${binfile2}"
++remote_exec build "rm -f ${binfile} ${binfile2}"
++# For debugging this test
++#
++#log_user 1
++
++# build the first test case
++#
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-m32"]] != "" } {
++    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
++}
++
++# Build the in-system-call test
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable [list debug "additional_flags=-m32"]] != "" } {
++    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
++}
++
++if [get_compiler_info ${binfile}] {
++    return -1
++}
++
++proc do_attach_tests {} {
++    global gdb_prompt
++    global binfile
++    global escapedbinfile
++    global srcfile
++    global testfile
++    global objdir
++    global subdir
++    global timeout
++    global testpid
++
++    # Verify that we can "see" the variable "should_exit" in the
++    # program, and that it is zero.
++
++    gdb_test "print should_exit" " = 0" "after attach-32, print should_exit"
++
++    # Verify that we can modify the variable "should_exit" in the
++    # program.
++
++    gdb_test "set should_exit=1" "" "after attach-32, set should_exit"
++
++    # Verify that the modification really happened.
++
++    send_gdb "tbreak 19\n"
++    gdb_expect {
++	-re "reakpoint .*at.*$srcfile, line 19.*$gdb_prompt $" {
++	    pass "after attach-32, set tbreak postloop"
++	}
++	-re "$gdb_prompt $" {
++	    fail "after attach-32, set tbreak postloop"
++	}
++	timeout {
++	    fail "(timeout) after attach-32, set tbreak postloop"
++	}
++    }
++    send_gdb "continue\n"
++    gdb_expect {
++	-re "main.*at.*$srcfile:19.*$gdb_prompt $" {
++	    pass "after attach-32, reach tbreak postloop"
++	}
++	-re "$gdb_prompt $" {
++	    fail "after attach-32, reach tbreak postloop"
++	}
++	timeout {
++	    fail "(timeout) after attach-32, reach tbreak postloop"
++	}
++    }
++
++    # Allow the test process to exit, to cleanup after ourselves.
++
++    gdb_test "continue" {\[Inferior .* exited normally\]} "after attach-32, 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}"
++
++    # Start the program running and then wait for a bit, to be sure
++    # that it can be attached to.
++
++    set testpid [eval exec $binfile &]
++    exec sleep 2
++    if { [istarget "*-*-cygwin*"] } {
++	# testpid is the Cygwin PID, GDB uses the Windows PID, which might be
++	# different due to the way fork/exec works.
++	set testpid [ exec ps -e | gawk "{ if (\$1 == $testpid) print \$4; }" ]
++    }
++
++    # Verify that we can attach to the process, and find its a.out
++    # when we're cd'd to some directory that doesn't contain the
++    # a.out.  (We use the source path set by the "dir" command.)
++
++    gdb_test "dir ${objdir}/${subdir}" "Source directories searched: .*" \
++	"set source path"
++
++    gdb_test "cd /tmp" "Working directory /tmp." \
++	"cd away from process working directory"
++
++    # Explicitly flush out any knowledge of the previous attachment.
++
++    set test "before attach-32-3, flush symbols"
++    gdb_test_multiple "symbol" "$test" {
++	-re "Discard symbol table from.*y or n. $" {
++	    gdb_test "y" "No symbol file now." \
++		"$test"
++	}
++	-re "No symbol file now.*$gdb_prompt $" {
++	    pass "$test"
++	}
++    }
++
++    gdb_test "exec" "No executable file now." \
++	"before attach-32-3, flush exec"
++
++    gdb_test "attach $testpid" \
++	"Attaching to process $testpid.*Reading symbols from $escapedbinfile.*main.*at .*" \
++	"attach-32 when process' a.out not in cwd"
++
++    set test "after attach-32-3, exit"
++    gdb_test_multiple "kill" "$test" {
++	-re "Kill the program being debugged.*y or n. $" {
++	    gdb_test "y" "" "$test"
++	}
++    }
++
++    # Another "don't leave a process around"
++    remote_exec build "kill -9 ${testpid}"
++}
++
++proc do_call_attach_tests {} {
++    global gdb_prompt
++    global binfile2
++    global testpid
++
++    # See if other registers are problems
++
++    set test "info other register"
++    gdb_test_multiple "i r r3" "$test" {
++	-re "warning: reading register.*$gdb_prompt $" {
++	    fail "$test"
++	}
++	-re "r3.*$gdb_prompt $" {
++	    pass "$test"
++	}
++    }
++
++    # Get rid of the process
++
++    gdb_test "p should_exit = 1"
++    gdb_test "c" {\[Inferior .* exited normally\]}
++
++    # Be paranoid
++
++    remote_exec build "kill -9 ${testpid}"
++}
++
++
++# Start with a fresh gdb
++
++gdb_exit
++set testpid [eval exec $binfile &]
++exec sleep 3
++if { [istarget "*-*-cygwin*"] } {
++    # testpid is the Cygwin PID, GDB uses the Windows PID, which might be
++    # different due to the way fork/exec works.
++    set testpid [ exec ps -e | gawk "{ if (\$1 == $testpid) print \$4; }" ]
++}
++
++set GDBFLAGS_orig $GDBFLAGS
++set GDBFLAGS "-iex \"set height 0\" --pid=$testpid"
++gdb_start
++set GDBFLAGS $GDBFLAGS_orig
++
++gdb_reinitialize_dir $srcdir/$subdir
++
++# This is a test of gdb's ability to attach to a running process.
++
++do_attach_tests
++
++# Test attaching when the target is inside a system call
++
++gdb_exit
++set testpid [eval exec $binfile2 &]
++exec sleep 3
++if { [istarget "*-*-cygwin*"] } {
++    # testpid is the Cygwin PID, GDB uses the Windows PID, which might be
++    # different due to the way fork/exec works.
++    set testpid [ exec ps -e | gawk "{ if (\$1 == $testpid) print \$4; }" ]
++}
++
++set GDBFLAGS_orig $GDBFLAGS
++set GDBFLAGS "-iex \"set height 0\" --pid=$testpid"
++gdb_start
++set GDBFLAGS $GDBFLAGS_orig
++
++gdb_reinitialize_dir $srcdir/$subdir
++do_call_attach_tests
++
++return 0
+diff --git a/gdb/testsuite/gdb.base/attach-32b.c b/gdb/testsuite/gdb.base/attach-32b.c
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/attach-32b.c
+@@ -0,0 +1,24 @@
++/* This program is intended to be started outside of gdb, and then
++   attached to by gdb.  Thus, it simply spins in a loop.  The loop
++   is exited when & if the variable 'should_exit' is non-zero.  (It
++   is initialized to zero in this program, so the loop will never
++   exit unless/until gdb sets the variable to non-zero.)
++   */
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++
++int  should_exit = 0;
++
++int main ()
++{
++  int  local_i = 0;
++
++  sleep( 10 ); /* System call causes register fetch to fail */
++               /* This is a known HPUX "feature"            */
++  while (! should_exit)
++    {
++      local_i++;
++    }
++  return (0);
++}

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
+@@ -2163,7 +2163,7 @@ init_gdb_version_vars (void)
+   struct internalvar *major_version_var = create_internalvar ("_gdb_major");
+   struct internalvar *minor_version_var = create_internalvar ("_gdb_minor");
+   int vmajor = 0, vminor = 0, vrevision = 0;
+-  sscanf (version, "%d.%d.%d", &vmajor, &vminor, &vrevision);
++  sscanf (version, "Red Hat Enterprise Linux %d.%d.%d", &vmajor, &vminor, &vrevision);
+   set_internalvar_integer (major_version_var, vmajor);
+   set_internalvar_integer (minor_version_var, vminor + (vrevision > 0));
+ }

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

@@ -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
+@@ -1210,6 +1210,10 @@ print_command_1 (const char *args, int voidprint)
+ 
+   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) ()";
+       expression_up expr = parse_expression (exp);
+       val = evaluate_expression (expr.get ());
+     }
+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-solib-trampoline-lookup-lock-fix.patch

@@ -0,0 +1,27 @@
+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-solib-trampoline-lookup-lock-fix.patch
+
+;; Fix lockup on trampoline vs. its function lookup; unreproducible (BZ 218379).
+;;=fedora
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
+
+diff --git a/gdb/symtab.c b/gdb/symtab.c
+--- a/gdb/symtab.c
++++ b/gdb/symtab.c
+@@ -3169,6 +3169,13 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
+ 	     msymbol->linkage_name ()); */
+ 	  ;
+ 	/* fall through */
++	/* `msymbol' trampoline may be located before its .text symbol
++	   but this text symbol may be the address we were looking for.
++	   Avoid `find_pc_sect_line'<->`find_pc_line' infinite loop.
++	   Red Hat Bug 218379.  */
++	else if (BMSYMBOL_VALUE_ADDRESS (mfunsym) == pc)
++	  warning ("In stub for %s (0x%s); interlocked, please submit the binary to http://bugzilla.redhat.com", msymbol.minsym->linkage_name (), paddress (target_gdbarch (), pc));
++	/* fall through */
+ 	else
+ 	  {
+ 	    /* Detect an obvious case of infinite recursion.  If this

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
+@@ -3034,6 +3034,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)
+ 	{
+@@ -3045,6 +3055,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,237 @@
+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
+@@ -1340,14 +1340,27 @@ 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 (symfile_objfile != NULL
++	    && (symfile_objfile->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;
+@@ -1362,23 +1375,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 (symfile_objfile != NULL
+-		    && (symfile_objfile->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
+@@ -25,6 +25,14 @@ if { [test_compiler_info "gcc-*"] || [test_compiler_info "clang-*"] } {
+     lappend options additional_flags=-g3
+ }
+ 
++# 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
+@@ -14031,7 +14031,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-dont-overwrite-fsgsbase-m32.patch

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

SOURCES/gdb-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
+@@ -9649,6 +9649,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 :
+@@ -9673,7 +9674,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
+@@ -9747,6 +9748,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 :
+@@ -9771,7 +9773,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
+@@ -712,7 +712,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
+@@ -754,7 +755,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-flexible-array-member-expected-pattern.patch

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

SOURCES/gdb-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-gdb27743-psymtab-imported-unit.patch

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

SOURCES/gdb-glibc-strstr-workaround.patch

@@ -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
+@@ -145,7 +145,7 @@ AC_DEFUN([GDB_AC_COMMON], [
+     AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
+   #include <linux/perf_event.h>
+   #ifndef PERF_ATTR_SIZE_VER5
+-  # error
++  // error // PERF_ATTR_SIZE_VER5_BUNDLE is not available here - Fedora+RHEL
+   #endif
+     ]])], [perf_event=yes], [perf_event=no])
+     if test "$perf_event" != yes; then

SOURCES/gdb-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-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,81 @@
+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,7 +15,7 @@
+ 
+ import gdb
+ 
+-class Recognizer(object):
++class StringRecognizer(object):
+     def __init__(self):
+         self.enabled = True
+ 
+@@ -30,6 +30,26 @@ 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-rhbz1870017-p10-plt-prologue-skipping.patch

@@ -0,0 +1,298 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Carl Love <cel@us.ibm.com>
+Date: Thu, 29 Apr 2021 17:19:13 -0500
+Subject: gdb-rhbz1870017-p10-plt-prologue-skipping.patch
+
+;; Backport "Add Power 10 PLT instruction patterns"
+;; (Carl Love, RHBZ 1870017)
+
+gdb/ChangeLog:
+
+2021-06-07  Carl Love  <cel@us.ibm.com>
+
+	* ppc-tdep.h (ppc_insn_prefix_dform): Declare.
+	* ppc64-tdep.c(insn_md, insn_x, insn_xo): New macros.
+	(ppc64_plt_pcrel_entry_point, ppc64_pcrel_linkage1_target,
+	ppc64_pcrel_linkage2_target): New functions.
+	(ppc64_standard_linkage9, ppc64_standard_linkage10,
+	ppc64_standard_linkage11, ppc64_standard_linkage12): New ppc
+	instruction patterns.
+	(ppc64_standard_linkage9, ppc64_standard_linkage10,
+	ppc64_standard_linkage11, ppc64_standard_linkage12): New variables
+	in define MAX expression.
+	(ppc64_skip_trampoline_code_1): Handle ppc64_standard_linkage9,
+	ppc64_standard_linkage10, ppc64_standard_linkage11,
+	ppc64_standard_linkage12.
+	* (ppc_insn_prefix_dform): New function.
+
+diff --git a/gdb/ppc-tdep.h b/gdb/ppc-tdep.h
+--- a/gdb/ppc-tdep.h
++++ b/gdb/ppc-tdep.h
+@@ -426,6 +426,8 @@ extern int ppc_insns_match_pattern (struct frame_info *frame, CORE_ADDR pc,
+ extern CORE_ADDR ppc_insn_d_field (unsigned int insn);
+ 
+ extern CORE_ADDR ppc_insn_ds_field (unsigned int insn);
++extern CORE_ADDR ppc_insn_prefix_dform (unsigned int insn1,
++					unsigned int insn2);
+ 
+ extern int ppc_process_record (struct gdbarch *gdbarch,
+ 			       struct regcache *regcache, CORE_ADDR addr);
+diff --git a/gdb/ppc64-tdep.c b/gdb/ppc64-tdep.c
+--- a/gdb/ppc64-tdep.c
++++ b/gdb/ppc64-tdep.c
+@@ -49,6 +49,38 @@
+    | (((unsigned (spr)) & 0x3e0) << 6)                     \
+    | (((unsigned (xo)) & 0x3ff) << 1))
+ 
++#define prefix(a, b, R, do)				   \
++  (((0x1) << 26)					   \
++   | (((unsigned (a)) & 0x3) << 24)			   \
++   | (((unsigned (b)) & 0x1) << 23)			   \
++   | (((unsigned (R)) & 0x1) << 20)			   \
++   | ((unsigned (do)) & 0x3ffff))
++
++#define insn_md(opcd, ra, rs, sh, me, rc)	       	   \
++  ((((unsigned (opcd)) & 0x3f) << 26)			   \
++   | (((unsigned (rs)) & 0x1f) << 21)			   \
++   | (((unsigned (ra)) & 0x1f) << 16)			   \
++   | (((unsigned (sh)) & 0x3e) << 11)			   \
++   | (((unsigned (me)) & 0x3f) << 25)			   \
++   | (((unsigned (sh)) & 0x1)  << 1)			   \
++   | ((unsigned (rc)) & 0x1))
++
++#define insn_x(opcd, rt, ra, rb, opc2)			   \
++  ((((unsigned (opcd)) & 0x3f) << 26)			   \
++   | (((unsigned (rt)) & 0x1f) << 21)			   \
++   | (((unsigned (ra)) & 0x1f) << 16)			   \
++   | (((unsigned (rb)) & 0x3e) << 11)			   \
++   | (((unsigned (opc2)) & 0x3FF) << 1))
++
++#define insn_xo(opcd, rt, ra, rb, oe, rc, opc2)		   \
++  ((((unsigned (opcd)) & 0x3f) << 26)			   \
++   | (((unsigned (rt)) & 0x1f) << 21)			   \
++   | (((unsigned (ra)) & 0x1f) << 16)			   \
++   | (((unsigned (rb)) & 0x3e) << 11)			   \
++   | (((unsigned (oe)) & 0x1) << 10)			   \
++   | (((unsigned (opc2)) & 0x1FF) << 1)			   \
++   | (((unsigned (rc)))))
++
+ /* PLT_OFF is the TOC-relative offset of a 64-bit PowerPC PLT entry.
+    Return the function's entry point.  */
+ 
+@@ -75,6 +107,18 @@ ppc64_plt_entry_point (struct frame_info *frame, CORE_ADDR plt_off)
+   return read_memory_unsigned_integer (tocp + plt_off, 8, byte_order);
+ }
+ 
++static CORE_ADDR
++ppc64_plt_pcrel_entry_point (struct frame_info *frame, CORE_ADDR plt_off,
++			     CORE_ADDR pc)
++{
++  struct gdbarch *gdbarch = get_frame_arch (frame);
++  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
++
++  /* Execution direction doesn't matter, entry is pc + plt_off either way.
++     The first word of the PLT entry is the function entry point.  */
++  return read_memory_unsigned_integer (pc + plt_off, 8, byte_order);
++}
++
+ /* Patterns for the standard linkage functions.  These are built by
+    build_plt_stub in bfd/elf64-ppc.c.  */
+ 
+@@ -342,6 +386,110 @@ static const struct ppc_insn_pattern ppc64_standard_linkage8[] =
+     { 0, 0, 0 }
+   };
+ 
++/* Power 10 ELFv2 PLT call stubs */
++static const struct ppc_insn_pattern ppc64_standard_linkage9[] =
++  {
++    /* std   %r2,0+40(%r1)   <optional> */
++    { insn_ds (-1, -1, -1, 0, 1), insn_ds (62, 2, 1, 40, 0), 1 },
++
++    /* pld r12, <any> */
++    { prefix (-1, -1, 1, 0), prefix (0, 0, 1, 0), 0 },
++    { insn_d (-1, -1, -1, 0), insn_d (57, 12, 0, 0), 0 },
++
++    /* mtctr r12  */
++    { insn_xfx (-1, -1, -1, -1), insn_xfx (31, 12, 9, 467), 0 },
++
++    /* bctr   */
++    { (unsigned) -1, 0x4e800420, 0 },
++
++    { 0, 0, 0 }
++  };
++
++static const struct ppc_insn_pattern ppc64_standard_linkage10[] =
++  {
++    /* std   %r2,0+40(%r1)    <optional> */
++    { insn_ds (-1, -1, -1, 0, 1), insn_ds (62, 2, 1, 40, 0), 1 },
++
++    /* paddi r12,<any> */
++    { prefix (-1, -1, 1, 0), prefix (2, 0, 1, 0), 0 },
++    { insn_d (-1, -1, -1, 0), insn_d (14, 12, 0, 0), 0 },
++
++    /* mtctr r12  <optional> */
++    { insn_xfx (-1, -1, -1, -1), insn_xfx (31, 12, 9, 467), 0 },
++
++    /* bctr   */
++    { (unsigned) -1, 0x4e800420, 0 },
++
++    { 0, 0, 0 }
++  };
++
++static const struct ppc_insn_pattern ppc64_standard_linkage11[] =
++  {
++    /* std   %r2,0+40(%r1)   <optional> */
++    { insn_ds (-1, -1, -1, 0, 1), insn_ds (62, 2, 1, 40, 0), 1 },
++
++    /* li %r11,0     <optional> */
++    { insn_d (-1, -1, -1, 0), insn_d (14, 11, 0, 0), 1 },
++
++    /* sldi  %r11,%r11,34   <eq to rldicr rx,ry,n, 63-n> <optional>  */
++    { insn_md (-1, -1, -1, 0, 0, 1), insn_md (30, 11, 11, 34, 63-34, 0), 1 },
++
++    /* paddi r12, <any> */
++    { prefix (-1, -1, 1, 0), prefix (2, 0, 1, 0), 0 },
++    { insn_d (-1, -1, -1, 0), insn_d (14, 12, 0, 0), 0 },
++
++    /* ldx   %r12,%r11,%r12  <optional> */
++    { (unsigned) -1, insn_x (31, 12, 11, 12, 21), 1 },
++
++    /* add   %r12,%r11,%r12  <optional> */
++    { (unsigned) -1, insn_xo (31, 12, 11, 12, 0, 0, 40), 1 },
++
++    /* mtctr r12   */
++    { insn_xfx (-1, -1, -1, -1), insn_xfx (31, 12, 9, 467), 0 },
++
++    /* bctr   */ // 13, 14, 15, 16
++    { (unsigned) -1, 0x4e800420, 0 },
++
++    { 0, 0, 0 }
++  };
++
++static const struct ppc_insn_pattern ppc64_standard_linkage12[] =
++  {
++    /* std   %r2,0+40(%r1)    <optional>  */
++    { insn_ds (-1, -1, -1, 0, 1), insn_ds (62, 2, 1, 40, 0), 1 },
++
++    /* lis %r11,xxx@ha <equivalent addis rx, 0, val> */
++    /* addis r12, r2, <any> */
++    { insn_d (-1, -1, -1, 0), insn_d (15, 12, 2, 0), 0 },
++
++    /* ori   %r11,%r11,xxx@l */
++    { insn_d (-1, -1, -1, 0), insn_d (24, 11, 11, 0), 0 },
++
++    /* sldi  %r11,%r11,34 <optional> */
++    { (unsigned) -1, insn_md (30, 11, 11, 34, 63-34, 0), 1 },
++
++    /*paddi r12,<any> */
++    { prefix (-1, -1, 1, 0), prefix (2, 0, 1, 0), 0 },
++    { insn_d (-1, -1, -1, 0), insn_d (14, 12, 0, 0), 0 },
++
++    /* sldi  %r11,%r11,34 <optional> */
++    { (unsigned) -1, insn_md (30, 11, 11, 34, 63-34, 0), 1 },
++
++    /* ldx   %r12,%r11,%r12 <optional> */
++    { (unsigned) -1, insn_x (31, 12, 11, 12, 21), 1 },
++
++    /* add   %r12,%r11,%r12 <optional> */
++    { (unsigned) -1, insn_xo (31, 12, 11, 12, 0, 0, 40), 1 },
++
++    /* mtctr r12  */
++    { insn_xfx (-1, -1, -1, -1), insn_xfx (31, 12, 9, 467), 0 },
++
++    /* bctr  */ // 17, 18, 19, 20
++    { (unsigned) -1, 0x4e800420, 0 },
++
++    { 0, 0, 0 }
++  };
++
+ /* When the dynamic linker is doing lazy symbol resolution, the first
+    call to a function in another object will go like this:
+ 
+@@ -432,6 +580,29 @@ ppc64_standard_linkage4_target (struct frame_info *frame, unsigned int *insn)
+   return ppc64_plt_entry_point (frame, plt_off);
+ }
+ 
++static CORE_ADDR
++ppc64_pcrel_linkage1_target (struct frame_info *frame, unsigned int *insn,
++			     CORE_ADDR pc)
++{
++  /* insn[0] is for the std instruction.  */
++  CORE_ADDR plt_off = ppc_insn_prefix_dform (insn[1], insn[2]);
++
++  return ppc64_plt_pcrel_entry_point (frame, plt_off, pc);
++}
++
++static CORE_ADDR
++ppc64_pcrel_linkage2_target (struct frame_info *frame, unsigned int *insn,
++			     CORE_ADDR pc)
++{
++  CORE_ADDR plt_off;
++
++  /* insn[0] is for the std instruction.
++     insn[1] is for the  li r11 instruction  */
++  plt_off = ppc_insn_prefix_dform (insn[2], insn[3]);
++
++  return ppc64_plt_pcrel_entry_point (frame, plt_off, pc);
++}
++
+ 
+ /* Given that we've begun executing a call trampoline at PC, return
+    the entry point of the function the trampoline will go to.
+@@ -447,10 +618,15 @@ ppc64_skip_trampoline_code_1 (struct frame_info *frame, CORE_ADDR pc)
+ 				    ARRAY_SIZE (ppc64_standard_linkage2)),
+ 			       MAX (ARRAY_SIZE (ppc64_standard_linkage3),
+ 				    ARRAY_SIZE (ppc64_standard_linkage4))),
+-			  MAX (MAX (ARRAY_SIZE (ppc64_standard_linkage5),
++		      MAX(MAX (MAX (ARRAY_SIZE (ppc64_standard_linkage5),
+ 				    ARRAY_SIZE (ppc64_standard_linkage6)),
+ 			       MAX (ARRAY_SIZE (ppc64_standard_linkage7),
+-				    ARRAY_SIZE (ppc64_standard_linkage8))))
++				    ARRAY_SIZE (ppc64_standard_linkage8))),
++		          MAX (MAX (ARRAY_SIZE (ppc64_standard_linkage9),
++				    ARRAY_SIZE (ppc64_standard_linkage10)),
++		               MAX (ARRAY_SIZE (ppc64_standard_linkage11),
++				    ARRAY_SIZE (ppc64_standard_linkage12)))))
++
+ 		     - 1];
+   CORE_ADDR target;
+   int scan_limit, i;
+@@ -463,7 +639,19 @@ ppc64_skip_trampoline_code_1 (struct frame_info *frame, CORE_ADDR pc)
+ 
+   for (i = 0; i < scan_limit; i++)
+     {
+-      if (i < ARRAY_SIZE (ppc64_standard_linkage8) - 1
++      if (i < ARRAY_SIZE (ppc64_standard_linkage12) - 1
++	  && ppc_insns_match_pattern (frame, pc, ppc64_standard_linkage12, insns))
++	pc = ppc64_pcrel_linkage1_target (frame, insns, pc);
++      else if (i < ARRAY_SIZE (ppc64_standard_linkage11) - 1
++	  && ppc_insns_match_pattern (frame, pc, ppc64_standard_linkage11, insns))
++	pc = ppc64_pcrel_linkage2_target (frame, insns, pc);
++      else if (i < ARRAY_SIZE (ppc64_standard_linkage10) - 1
++	  && ppc_insns_match_pattern (frame, pc, ppc64_standard_linkage10, insns))
++	pc = ppc64_pcrel_linkage1_target (frame, insns, pc);
++      else if (i < ARRAY_SIZE (ppc64_standard_linkage9) - 1
++	  && ppc_insns_match_pattern (frame, pc, ppc64_standard_linkage9, insns))
++	pc = ppc64_pcrel_linkage1_target (frame, insns, pc);
++      else if (i < ARRAY_SIZE (ppc64_standard_linkage8) - 1
+ 	  && ppc_insns_match_pattern (frame, pc, ppc64_standard_linkage8, insns))
+ 	pc = ppc64_standard_linkage4_target (frame, insns);
+       else if (i < ARRAY_SIZE (ppc64_standard_linkage7) - 1
+diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
+--- a/gdb/rs6000-tdep.c
++++ b/gdb/rs6000-tdep.c
+@@ -7361,6 +7361,14 @@ ppc_insn_ds_field (unsigned int insn)
+   return ((((CORE_ADDR) insn & 0xfffc) ^ 0x8000) - 0x8000);
+ }
+ 
++CORE_ADDR
++ppc_insn_prefix_dform (unsigned int insn1, unsigned int insn2)
++{
++  /* result is 34-bits  */
++  return (CORE_ADDR) ((((insn1 & 0x3ffff) ^ 0x20000) - 0x20000) << 16)
++    | (CORE_ADDR)(insn2 & 0xffff);
++}
++
+ /* Initialization code.  */
+ 
+ void _initialize_rs6000_tdep ();

SOURCES/gdb-rhbz1870029-powerpc-remove-region-limit-dawr.patch

@@ -0,0 +1,79 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Keith Seitz <keiths@redhat.com>
+Date: Wed, 5 May 2021 09:11:12 -0700
+Subject: gdb-rhbz1870029-powerpc-remove-region-limit-dawr.patch
+
+;; Backport "PowerPC remove 512 bytes region limit if 2nd DAWR is available"
+;; (Rogerio Alves, RHBZ 1870029)
+
+  commit 539d71e89a21990d9fd15641477e4790129bdb11
+  Author: Rogerio Alves <rcardoso@linux.ibm.com>
+  Date:   Tue Dec 1 16:53:38 2020 -0300
+
+    PowerPC remove 512 bytes region limit if 2nd DAWR is avaliable.
+
+    Power 10 introduces the 2nd DAWR (second watchpoint) and also removed
+    a restriction that limit the watch region to 512 bytes.
+
+    2020-11-08  Rogerio A. Cardoso  <rcardoso@linux.ibm.com>
+
+    /gdb
+
+            * ppc-linux-nat.c: (PPC_DEBUG_FEATURE_DATA_BP_ARCH_31): New define.
+            (region_ok_for_hw_watchpoint): Check if 2nd DAWR is avaliable before
+            set region.
+
+diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
+--- a/gdb/ppc-linux-nat.c
++++ b/gdb/ppc-linux-nat.c
+@@ -138,6 +138,11 @@ struct ppc_hw_breakpoint
+ #define PPC_DEBUG_FEATURE_DATA_BP_DAWR	0x10
+ #endif /* PPC_DEBUG_FEATURE_DATA_BP_DAWR */
+ 
++/* Feature defined on Linux kernel v5.1: Second watchpoint support.  */
++#ifndef PPC_DEBUG_FEATURE_DATA_BP_ARCH_31
++#define PPC_DEBUG_FEATURE_DATA_BP_ARCH_31 0x20
++#endif /* PPC_DEBUG_FEATURE_DATA_BP_ARCH_31 */
++
+ /* The version of the PowerPC HWDEBUG kernel interface that we will use, if
+    available.  */
+ #define PPC_DEBUG_CURRENT_VERSION 1
+@@ -2108,9 +2113,10 @@ ppc_linux_nat_target::region_ok_for_hw_watchpoint (CORE_ADDR addr, int len)
+      watchpoints.  */
+   if (m_dreg_interface.hwdebug_p ())
+     {
+-      int region_size;
+       const struct ppc_debug_info &hwdebug_info = (m_dreg_interface
+ 						   .hwdebug_info ());
++      int region_size = hwdebug_info.data_bp_alignment;
++      int region_align = region_size;
+ 
+       /* Embedded DAC-based processors, like the PowerPC 440 have ranged
+ 	 watchpoints and can watch any access within an arbitrary memory
+@@ -2122,15 +2128,19 @@ ppc_linux_nat_target::region_ok_for_hw_watchpoint (CORE_ADDR addr, int len)
+ 	return 2;
+       /* Check if the processor provides DAWR interface.  */
+       if (hwdebug_info.features & PPC_DEBUG_FEATURE_DATA_BP_DAWR)
+-	/* DAWR interface allows to watch up to 512 byte wide ranges which
+-	   can't cross a 512 byte boundary.  */
+-	region_size = 512;
+-      else
+-	region_size = hwdebug_info.data_bp_alignment;
++	{
++	  /* DAWR interface allows to watch up to 512 byte wide ranges.  */
++	  region_size = 512;
++	  /* DAWR interface allows to watch up to 512 byte wide ranges which
++	     can't cross a 512 byte bondary on machines that doesn't have a
++	     second DAWR (P9 or less).  */
++	  if (!(hwdebug_info.features & PPC_DEBUG_FEATURE_DATA_BP_ARCH_31))
++	    region_align = 512;
++	}
+       /* Server processors provide one hardware watchpoint and addr+len should
+          fall in the watchable region provided by the ptrace interface.  */
+-      if (region_size
+-	  && (addr + len > (addr & ~(region_size - 1)) + region_size))
++      if (region_align
++	  && (addr + len > (addr & ~(region_align - 1)) + region_size))
+ 	return 0;
+     }
+   /* addr+len must fall in the 8 byte watchable region for DABR-based

SOURCES/gdb-rhbz1870031-p10-prefixed-insn-1of3.patch

@@ -0,0 +1,89 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Keith Seitz <keiths@redhat.com>
+Date: Thu, 6 May 2021 14:12:00 -0400
+Subject: gdb-rhbz1870031-p10-prefixed-insn-1of3.patch
+
+;; Backport "displaced stepping across addpcis/lnia"
+;; (Will Schmidt, RHBZ 1870031)
+
+   commit e3d528d7e6a6b863d30aaecf74adf8c78286f84c
+   Author: Will Schmidt <will_schmidt@vnet.ibm.com>
+   Date:   Mon Apr 12 13:35:54 2021 -0500
+
+    [PATCH, rs6000, v3][PR gdb/27525] displaced stepping across addpcis/lnia.
+
+      This addresses PR gdb/27525.     The lnia and other variations
+    of the addpcis instruction write the value of the NIA into a target register.
+    If we are single-stepping across a breakpoint, the instruction is executed
+    from a displaced location, and thusly the written value of the PC/NIA
+    will be incorrect.   The changes here will measure the displacement
+    offset, and adjust the target register value to compensate.
+
+    YYYY-MM-DD  Will Schmidt  <will_schmidt@vnet.ibm.com>
+
+    gdb/ChangeLog:
+
+            * rs6000-tdep.c (ppc_displaced_step_fixup): Update to handle
+            the addpcis/lnia instruction.
+
+    gdb/testsuite/ChangeLog:
+
+            * gdb.arch/powerpc-addpcis.exp: Testcase harness to
+            exercise single-stepping over subpcis,lnia,addpcis instructions
+            with displacement.
+            * gdb.arch/powerpc-addpcis.s: Testcase with stream
+            of addpcis/lnia/subpcis instructions.
+            * gdb.arch/powerpc-lnia.exp: Testcase harness to exercise
+            single-stepping over lnia instructions with displacement.
+            * gdb.arch/powerpc-lnia.s: Testcase with stream of
+            lnia instructions.
+
+diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
+--- a/gdb/rs6000-tdep.c
++++ b/gdb/rs6000-tdep.c
+@@ -836,6 +836,12 @@ typedef BP_MANIPULATION_ENDIAN (little_breakpoint, big_breakpoint)
+ #define STHCX_INSTRUCTION 0x7c0005ad
+ #define STQCX_INSTRUCTION 0x7c00016d
+ 
++/* Instruction masks for single-stepping of addpcis/lnia.  */
++#define ADDPCIS_INSN            0x4c000004
++#define ADDPCIS_INSN_MASK       0xfc00003e
++#define ADDPCIS_TARGET_REGISTER 0x03F00000
++#define ADDPCIS_INSN_REGSHIFT   21
++
+ /* Check if insn is one of the Load And Reserve instructions used for atomic
+    sequences.  */
+ #define IS_LOAD_AND_RESERVE_INSN(insn)	((insn & LOAD_AND_RESERVE_MASK) == LWARX_INSTRUCTION \
+@@ -923,8 +929,31 @@ ppc_displaced_step_fixup (struct gdbarch *gdbarch,
+ 			paddress (gdbarch, from), paddress (gdbarch, to));
+ 
+ 
++  /* Handle the addpcis/lnia instruction.  */
++  if ((insn & ADDPCIS_INSN_MASK) == ADDPCIS_INSN)
++    {
++      LONGEST displaced_offset;
++      ULONGEST current_val;
++      /* Measure the displacement.  */
++      displaced_offset = from - to;
++      /* Identify the target register that was updated by the instruction.  */
++      int regnum = (insn & ADDPCIS_TARGET_REGISTER) >> ADDPCIS_INSN_REGSHIFT;
++      /* Read and update the target value.  */
++      regcache_cooked_read_unsigned (regs, regnum , &current_val);
++      if (debug_displaced)
++	fprintf_unfiltered (gdb_stdlog,
++			    "displaced: {ppc} addpcis target regnum %d was "
++			    "0x%lx now 0x%lx",
++			    regnum, current_val,
++			    current_val + displaced_offset);
++      regcache_cooked_write_unsigned (regs, regnum,
++					current_val + displaced_offset);
++      /* point the PC back at the non-displaced instruction.  */
++      regcache_cooked_write_unsigned (regs, gdbarch_pc_regnum (gdbarch),
++				    from + offset);
++    }
+   /* Handle PC-relative branch instructions.  */
+-  if (opcode == B_INSN || opcode == BC_INSN || opcode == BXL_INSN)
++  else if (opcode == B_INSN || opcode == BC_INSN || opcode == BXL_INSN)
+     {
+       ULONGEST current_pc;
+ 

SOURCES/gdb-rhbz1870031-p10-prefixed-insn-2of3.patch

@@ -0,0 +1,633 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Keith Seitz <keiths@redhat.com>
+Date: Thu, 6 May 2021 14:53:00 -0400
+Subject: gdb-rhbz1870031-p10-prefixed-insn-2of3.patch
+
+;; Backport "gdb-power10-single-step"
+;; (Will Schmidt, RHBZ 1870031)
+
+   commit c8a379440e0f8bf94ed5730e823c9256e64bf37c
+   Author: Will Schmidt <will_schmidt@vnet.ibm.com>
+   Date:   Mon Apr 12 14:11:02 2021 -0500
+
+    [PATCH] gdb-power10-single-step
+
+    Hi,
+      This is based on a patch originally written by Alan Modra.
+    Powerpc / Power10 ISA 3.1 adds prefixed instructions, which
+    are 8 bytes in length.  This is in contrast to powerpc previously
+    always having 4 byte instruction length.  This patch implements
+    changes to allow GDB to better detect prefixed instructions, and
+    handle single stepping across the 8 byte instructions.
+
+    Added #defines to help test for PNOP and prefix instructions.
+    Update ppc_displaced_step_copy_insn() to handle pnop and prefixed
+    instructions whem R=0 (non-pc-relative).
+
+    Updated ppc_displaced_step_fixup() to properly handle the offset
+    value matching the current instruction size
+
+    Updated the for-loop within ppc_deal_with_atomic_sequence() to
+    count instructions properly in case we have a mix of 4-byte and
+    8-byte instructions within the atomic_sequence_length.
+
+    Added testcase and harness to exercise pc-relative load/store
+    instructions with R=0.
+
+    2021-04-12  Will Schmidt  <will_schmidt@vnet.ibm.com>
+
+            gdb/ChangeLog:
+            * rs6000-tdep.c:  Add support for single-stepping of
+            prefixed instructions.
+
+            gdb/testsuite/ChangeLog:
+            * gdb.arch/powerpc-plxv-nonrel.s:  Testcase using
+            non-relative plxv instructions.
+            * gdb.arch/powerpc-plxv-nonrel.exp: Testcase harness.
+
+diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
+--- a/gdb/rs6000-tdep.c
++++ b/gdb/rs6000-tdep.c
+@@ -814,7 +814,7 @@ typedef BP_MANIPULATION_ENDIAN (little_breakpoint, big_breakpoint)
+   rs6000_breakpoint;
+ 
+ /* Instruction masks for displaced stepping.  */
+-#define BRANCH_MASK 0xfc000000
++#define OP_MASK 0xfc000000
+ #define BP_MASK 0xFC0007FE
+ #define B_INSN 0x48000000
+ #define BC_INSN 0x40000000
+@@ -842,6 +842,11 @@ typedef BP_MANIPULATION_ENDIAN (little_breakpoint, big_breakpoint)
+ #define ADDPCIS_TARGET_REGISTER 0x03F00000
+ #define ADDPCIS_INSN_REGSHIFT   21
+ 
++#define PNOP_MASK 0xfff3ffff
++#define PNOP_INSN 0x07000000
++#define R_MASK 0x00100000
++#define R_ZERO 0x00000000
++
+ /* Check if insn is one of the Load And Reserve instructions used for atomic
+    sequences.  */
+ #define IS_LOAD_AND_RESERVE_INSN(insn)	((insn & LOAD_AND_RESERVE_MASK) == LWARX_INSTRUCTION \
+@@ -873,10 +878,38 @@ ppc_displaced_step_copy_insn (struct gdbarch *gdbarch,
+   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+   int insn;
+ 
+-  read_memory (from, buf, len);
++  len = target_read (current_inferior()->top_target(), TARGET_OBJECT_MEMORY, NULL,
++		     buf, from, len);
++  if ((ssize_t) len < PPC_INSN_SIZE)
++    memory_error (TARGET_XFER_E_IO, from);
+ 
+   insn = extract_signed_integer (buf, PPC_INSN_SIZE, byte_order);
+ 
++  /* Check for PNOP and for prefixed instructions with R=0.  Those
++     instructions are safe to displace.  Prefixed instructions with R=1
++     will read/write data to/from locations relative to the current PC.
++     We would not be able to fixup after an instruction has written data
++    into a displaced location, so decline to displace those instructions.  */
++  if ((insn & OP_MASK) == 1 << 26)
++    {
++      if (((insn & PNOP_MASK) != PNOP_INSN)
++	  && ((insn & R_MASK) != R_ZERO))
++	{
++	  fprintf_unfiltered (gdb_stdlog,
++			      "displaced: {ppc} Not displacing prefixed "
++			      "instruction %08x at %s",
++			      insn, paddress (gdbarch, from));
++	  return NULL;
++	}
++    }
++  else
++    /* Non-prefixed instructions..  */
++    {
++      /* Set the instruction length to 4 to match the actual instruction
++	 length.  */
++      len = 4;
++    }
++
+   /* Assume all atomic sequences start with a Load and Reserve instruction.  */
+   if (IS_LOAD_AND_RESERVE_INSN (insn))
+     {
+@@ -917,11 +950,17 @@ ppc_displaced_step_fixup (struct gdbarch *gdbarch,
+   ppc_displaced_step_closure *closure = (ppc_displaced_step_closure *) closure_;
+   ULONGEST insn  = extract_unsigned_integer (closure->buf.data (),
+ 					     PPC_INSN_SIZE, byte_order);
+-  ULONGEST opcode = 0;
++  ULONGEST opcode;
+   /* Offset for non PC-relative instructions.  */
+-  LONGEST offset = PPC_INSN_SIZE;
++  LONGEST offset;
+ 
+-  opcode = insn & BRANCH_MASK;
++  opcode = insn & OP_MASK;
++
++  /* Set offset to 8 if this is an 8-byte (prefixed) instruction.  */
++  if ((opcode) == 1 << 26)
++    offset = 2 * PPC_INSN_SIZE;
++  else
++    offset = PPC_INSN_SIZE;
+ 
+   if (debug_displaced)
+     fprintf_unfiltered (gdb_stdlog,
+@@ -1058,13 +1097,16 @@ ppc_deal_with_atomic_sequence (struct regcache *regcache)
+      instructions.  */
+   for (insn_count = 0; insn_count < atomic_sequence_length; ++insn_count)
+     {
+-      loc += PPC_INSN_SIZE;
++      if ((insn & OP_MASK) == 1 << 26)
++       loc += 2 * PPC_INSN_SIZE;
++      else
++       loc += PPC_INSN_SIZE;
+       insn = read_memory_integer (loc, PPC_INSN_SIZE, byte_order);
+ 
+       /* Assume that there is at most one conditional branch in the atomic
+          sequence.  If a conditional branch is found, put a breakpoint in 
+          its destination address.  */
+-      if ((insn & BRANCH_MASK) == BC_INSN)
++      if ((insn & OP_MASK) == BC_INSN)
+         {
+           int immediate = ((insn & 0xfffc) ^ 0x8000) - 0x8000;
+           int absolute = insn & 2;
+@@ -7095,7 +7137,7 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
+   set_gdbarch_displaced_step_location (gdbarch,
+ 				       displaced_step_at_entry_point);
+ 
+-  set_gdbarch_max_insn_length (gdbarch, PPC_INSN_SIZE);
++  set_gdbarch_max_insn_length (gdbarch, 2 * PPC_INSN_SIZE);
+ 
+   /* Hook in ABI-specific overrides, if they have been registered.  */
+   info.target_desc = tdesc;
+diff --git a/gdb/testsuite/gdb.arch/powerpc-addpcis.exp b/gdb/testsuite/gdb.arch/powerpc-addpcis.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/powerpc-addpcis.exp
+@@ -0,0 +1,104 @@
++# 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 to confirm that gdb is properly single stepping over the
++# displaced addpcis instruction.
++# The addpcis instruction and its extended mnemonics lnia and subpcis
++# apply an immediate shifted value (X || 0x0000) to the current PC/NIA
++# value, and store that value into the instructions target register.
++# When the instruction is displaced, it needs special handling.
++
++# lnia Rx == addpcis Rx,0
++# subcis Rx,value == addpcis Rx,-value
++
++if { ![istarget powerpc*-*] } {
++    verbose "Skipping powerpc addpcis test."
++    return
++}
++
++set retval 0
++
++standard_testfile .s
++
++if { [prepare_for_testing "failed to prepare" $testfile "$srcfile" \
++      {debug quiet}] } {
++    return -1
++}
++
++if ![runto_main] then {
++      return
++}
++
++set check_pc [get_hexadecimal_valueof "\$pc" "default0"]
++set bp1 *$check_pc+4
++set bp2 *$check_pc+12
++set bp3 *$check_pc+16
++gdb_breakpoint $bp1
++gdb_breakpoint $bp2
++gdb_breakpoint $bp3
++
++gdb_test "stepi" "" "set r3 "
++set check_r3 [get_hexadecimal_valueof "\$r3" "default0"]
++gdb_test "stepi" "" "set r4"
++set check_r4 [get_hexadecimal_valueof "\$r4" "default0"]
++gdb_test "stepi" "" "set r5"
++set check_r5 [get_hexadecimal_valueof "\$r5" "default0"]
++gdb_test "stepi" "" "set r6"
++set check_r6 [get_hexadecimal_valueof "\$r6" "default0"]
++gdb_test "stepi" "" "set r7"
++set check_r7 [get_hexadecimal_valueof "\$r7" "default0"]
++gdb_test "stepi" "" "set r8"
++set check_r8 [get_hexadecimal_valueof "\$r8" "default0"]
++gdb_test "stepi" "" "set r9"
++set check_r9 [get_hexadecimal_valueof "\$r9" "default0"]
++
++# R6 will contain the reference value.  All other
++# instructions in this test will be storing values
++# relative to what is stored in R6.
++
++#	subpcis 3,+0x100 	# /* set r3 */
++#	subpcis 4,+0x10		# /* set r4 */
++#	subpcis 5,+0x1		# /* set r5 */
++#	lnia    6		# /* set r6 */
++#	addpcis 7,+0x1		# /* set r7 */
++#	addpcis 8,+0x10		# /* set r8 */
++#	addpcis 9,+0x100	# /* set r9 */
++
++if [expr $check_r3 + 0x1000000   != $check_r6 - 0xc ] {
++    fail "unexpected value r3 + 0x1,000,000 != r6 + 0xc ; r3: $check_r3  r6: $check_r6 "
++}
++if [expr $check_r4 + 0x100000  != $check_r6 - 0x8 ] {
++    fail "unexpected value r4 + 0x100,000 != r6 - 0x8 ; r4: $check_r4  r6: $check_r6 "
++}
++if [expr $check_r5 + 0x10000  != $check_r6 - 0x4 ] {
++    fail "unexpected value r5 + 0x10,000 != r6 , r5: $check_r5  r6: $check_r6 "
++}
++if [expr $check_r6 != $check_r6] {
++    fail "unexpected value r6 != r6 , r6: $check_r6  r6: $check_r6 "
++}
++if [expr $check_r7 - 0x10000  != $check_r6 + 0x4] {
++    fail "unexpected value r7 - 0x10,000 != r6 + 0x4 , r7: $check_r7  r7: $check_r6 "
++}
++if [expr $check_r8 - 0x100000  != $check_r6 + 0x8 ] {
++    fail "unexpected value r8 - 0x100,000 != r6 , r8: $check_r8  r8: $check_r6 "
++}
++if [expr $check_r9 - 0x1000000  != $check_r6 + 0xc ] {
++    fail "unexpected value r9 - 0x1,000,000 != r6 + 0xc , r9: $check_r9  r6: $check_r6 "
++}
++
++gdb_test "info break"
++gdb_test "info register r3 r4 r5 r6 r7 r8 r9"
++gdb_test "disas main"
+diff --git a/gdb/testsuite/gdb.arch/powerpc-addpcis.s b/gdb/testsuite/gdb.arch/powerpc-addpcis.s
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/powerpc-addpcis.s
+@@ -0,0 +1,33 @@
++/* 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/>. */
++
++
++/*  Test to confirm that gdb is properly single stepping over the
++    displaced addpcis instruction.  */
++
++.global main
++.type main,function
++# addpcis: the sum of NIA + ( D || 0x0000) is placed in RT.
++main:
++	subpcis 3,+0x100  	# /* set r3 */
++	subpcis 4,+0x10  	# /* set r4 */
++	subpcis 5,+0x1  	# /* set r5 */
++	lnia    6  		# /* set r6 */
++	addpcis 7,+0x1  	# /* set r7 */
++	addpcis 8,+0x10  	# /* set r8 */
++	addpcis 9,+0x100  	# /* set r9 */
++	blr
+diff --git a/gdb/testsuite/gdb.arch/powerpc-lnia.exp b/gdb/testsuite/gdb.arch/powerpc-lnia.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/powerpc-lnia.exp
+@@ -0,0 +1,100 @@
++# 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 to see if gdb is properly single stepping over the
++# displaced lnia instruction.  This test checks that a series
++# of lnia instructions are loading ascending values as expected.
++
++# lnia is an extended mnemonic for the addpcis instruction, which
++# stores the $NIA plus an immediate value into a register.
++#
++#		lnia Rx == addpcis Rx,0 == lnia Rx
++#		subcis Rx,value == addpcis Rx,-value
++
++if { ![istarget powerpc*-*] } {
++    verbose "Skipping powerpc lnia test."
++    return
++}
++
++set retval 0
++
++standard_testfile .s
++
++if { [prepare_for_testing "failed to prepare" $testfile "$srcfile" \
++      {debug quiet}] } {
++    return -1
++}
++
++if ![runto_main] then {
++      return
++}
++
++set before_pc 0
++set check_pc [get_hexadecimal_valueof "\$pc" "default0"]
++
++# set some breakpoints on the instructions below main().
++set bp1 *$check_pc+4
++set bp2 *$check_pc+12
++set bp3 *$check_pc+16
++gdb_breakpoint $bp1
++gdb_breakpoint $bp2
++gdb_breakpoint $bp3
++
++# single-step through the lnia instructions, and retrieve the
++# register values as we proceed.
++gdb_test "stepi" "" "set r3"
++set check_r3 [get_hexadecimal_valueof "\$r3" "default0"]
++gdb_test "stepi" "" "set r4"
++set check_r4 [get_hexadecimal_valueof "\$r4" "default0"]
++gdb_test "stepi" "" "set r5"
++set check_r5 [get_hexadecimal_valueof "\$r5" "default0"]
++gdb_test "stepi" "" "set r6"
++set check_r6 [get_hexadecimal_valueof "\$r6" "default0"]
++gdb_test "stepi" "" "set r7"
++set check_r7 [get_hexadecimal_valueof "\$r7" "default0"]
++gdb_test "stepi" "" "set r8"
++set check_r8 [get_hexadecimal_valueof "\$r8" "default0"]
++gdb_test "stepi" "" "set r9"
++set check_r9 [get_hexadecimal_valueof "\$r9" "default0"]
++
++# Ensure that our register values are as expected.
++# Specifically that the values loaded by the lnia instruction
++# reflect the value of the PC as if the instruction was
++# not displaced.
++if [expr $check_r3 + 4 != $check_r4] {
++    fail "unexpected value r3+4 != r4 , r3: $check_r3  r4: $check_r4 "
++}
++if [expr $check_r4 + 4 != $check_r5] {
++    fail "unexpected value r4+4 != r5 , r4: $check_r4  r5: $check_r5 "
++}
++if [expr $check_r5 + 4 != $check_r6] {
++    fail "unexpected value r5+4 != r6 , r5: $check_r5  r6: $check_r6 "
++}
++if [expr $check_r6 + 4 != $check_r7] {
++    fail "unexpected value r6+4 != r7 , r6: $check_r6  r7: $check_r7 "
++}
++if [expr $check_r7 + 4 != $check_r8] {
++    fail "unexpected value r7+4 != r8 , r7: $check_r7  r8: $check_r8 "
++}
++if [expr $check_r8 + 4 != $check_r9] {
++    fail "unexpected value r8+4 != r9 , r8: $check_r8  r9: $check_r9 "
++}
++
++gdb_test "info break"
++gdb_test "info register r3 r4 r5 r6 r7 r8 r9"
++gdb_test "disas main"
++
++# Let the inferior store all vector registers in a buffer, then dump
++# the buffer and check it.
+diff --git a/gdb/testsuite/gdb.arch/powerpc-lnia.s b/gdb/testsuite/gdb.arch/powerpc-lnia.s
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/powerpc-lnia.s
+@@ -0,0 +1,32 @@
++/* 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/>. */
++
++/* Test to confirm that gdb properly handles lnia instructions
++   that load the current PC into a target register when executed
++   from a displaced location.  */
++
++.global main
++.type main,function
++main:
++	lnia 3  # /* set r3 */
++	lnia 4  # /* set r4 */
++	lnia 5  # /* set r5 */
++	lnia 6  # /* set r6 */
++	lnia 7  # /* set r7 */
++	lnia 8  # /* set r8 */
++	lnia 9  # /* set r9 */
++	blr
+diff --git a/gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.exp b/gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.exp
+@@ -0,0 +1,130 @@
++# 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 to see if gdb is properly single stepping over the
++# displaced plxv instruction.
++
++if { ![istarget powerpc*-*] } {
++    verbose "Skipping powerpc plxv test."
++    return
++}
++
++set retval 0
++
++standard_testfile .s
++
++if { [prepare_for_testing "failed to prepare" $testfile "$srcfile" \
++      {debug quiet}] } {
++    return -1
++}
++
++gdb_test "set radix 0b10000"
++gdb_test "set debug displaced"
++
++if ![runto_main] then {
++      return
++}
++
++gdb_test "set debug displaced on"
++
++# Proc to extract the uint128 hex value from the output of
++# a print vector statement.
++proc get_vector_hexadecimal_valueof { exp default {test ""} } {
++	set val "0x0000"
++	global gdb_prompt
++	if {$test == ""} {
++		set test "get vector_hexadecimal valueof \"${exp}\""
++	}
++	gdb_test_multiple "print $${exp}.uint128" $test {
++		-re -wrap "\\$\[0-9\]* = (0x\[0-9a-zA-Z\]+).*" {
++			set val $expect_out(1,string)
++				pass "$test"
++		}
++		-re -wrap ".*Illegal instruction.* $" {
++			fail "Illegal instruction on print."
++			set val 0xffff
++		}
++	}
++	return ${val}
++}
++
++# Proc to do a single-step, and ensure we gently handle
++# an illegal instruction situation.
++proc stepi_over_instruction { xyz } {
++	global gdb_prompt
++	gdb_test_multiple "stepi" "${xyz} " {
++		-re -wrap ".*Illegal instruction.*" {
++			fail "Illegal instruction on single step."
++		return
++		}
++		-re -wrap ".*" {
++		 pass "stepi ${xyz}"
++		}
++	}
++}
++
++set check_pc [get_hexadecimal_valueof "\$pc" "default0"]
++
++# set some breakpoints on the instructions below main().
++gdb_test "disas /r main"
++set bp1 *$check_pc+4
++set bp2 *$check_pc+0d12
++set bp3 *$check_pc+0d20
++set bp4 *$check_pc+0d28
++gdb_breakpoint $bp1
++gdb_breakpoint $bp2
++gdb_breakpoint $bp3
++gdb_breakpoint $bp4
++
++# single-step through the plxv instructions, and retrieve the
++# register values as we proceed.
++
++stepi_over_instruction  "stepi over NOP"
++stepi_over_instruction  "stepi over lnia"
++stepi_over_instruction  "stepi over addi"
++
++stepi_over_instruction  "stepi over vs4 assignment"
++set check_vs4 [get_vector_hexadecimal_valueof "vs4" "default0"]
++
++stepi_over_instruction  "stepi over vs5 assignment"
++set check_vs5 [get_vector_hexadecimal_valueof "vs5" "default0"]
++
++stepi_over_instruction  "stepi over vs6 assignment"
++set check_vs6 [get_vector_hexadecimal_valueof "vs6" "default0"]
++
++stepi_over_instruction  "stepi over vs7 assignment"
++set check_vs7 [get_vector_hexadecimal_valueof "vs7" "default0"]
++
++set vs4_expected 0xa5b5c5d5a4b4c4d4a3b3c3d3a2b2c2d2
++set vs5_expected 0xa7b7c7d7a6b6c6d6a5b5c5d5a4b4c4d4
++set vs6_expected 0xa9b9c9d9a8b8c8d8a7b7c7d7a6b6c6d6
++set vs7_expected 0xabbbcbdbaabacadaa9b9c9d9a8b8c8d8
++
++if [expr  $check_vs4 != $vs4_expected] {
++    fail "unexpected value vs4;  actual:$check_vs4 expected:$vs4_expected"
++}
++if [expr $check_vs5 != $vs5_expected ] {
++    fail "unexpected value vs5;   actual:$check_vs5 expected:$vs5_expected"
++}
++if [expr $check_vs6 != $vs6_expected ] {
++    fail "unexpected value vs6;   actual:$check_vs6 expected:$vs6_expected"
++}
++if [expr $check_vs7 != $vs7_expected ] {
++    fail "unexpected value vs7;   actual:$check_vs7 expected:$vs7_expected"
++}
++
++gdb_test "info break"
++gdb_test "info register vs4 vs5 vs6 vs7 "
++gdb_test "disas main #2"
+diff --git a/gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.s b/gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.s
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.s
+@@ -0,0 +1,44 @@
++# 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 to verify that the prefixed instructions that
++# load/store non-relative values work OK.
++
++.global main
++.type main,function
++main:
++	nop
++	lnia 4
++	addi 4,4,40
++	plxv 4,4(4),0
++	plxv 5,12(4),0
++	plxv 6,20(4),0
++	plxv 7,28(4),0
++check_here:
++	blr
++mydata:
++	.long 0xa1b1c1d1	# <<-
++	.long 0xa2b2c2d2	# <<- loaded into vs4
++	.long 0xa3b3c3d3	# <<- loaded into vs4
++	.long 0xa4b4c4d4	# <<- loaded into vs4, vs5
++	.long 0xa5b5c5d5	# <<- loaded into vs4, vs5
++	.long 0xa6b6c6d6	# <<- loaded into      vs5, vs6
++	.long 0xa7b7c7d7	# <<- loaded into      vs5, vs6
++	.long 0xa8b8c8d8	# <<- loaded into           vs6, vs7
++	.long 0xa9b9c9d9	# <<- loaded into           vs6, vs7
++	.long 0xaabacada	# <<- loaded into                vs7
++	.long 0xabbbcbdb	# <<- loaded into                vs7
++	.long 0xacbcccdc	# <<-

SOURCES/gdb-rhbz1870031-p10-prefixed-insn-3of3.patch

@@ -0,0 +1,39 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Keith Seitz <keiths@redhat.com>
+Date: Thu, 6 May 2021 15:39:45 -0400
+Subject: gdb-rhbz1870031-p10-prefixed-insn-3of3.patch
+
+;; Backport "Fix build failure for 32-bit targets with..."
+;; (Luis Machado, RHBZ 1870031)
+
+   commit d9d2ef05f11736bf2e889047cc7588d0c0dd907e
+   Author: Luis Machado <luis.machado@linaro.org>
+   Date:   Tue Apr 13 09:19:52 2021 -0300
+
+    Fix build failure for 32-bit targets with --enable-targets=all
+
+    Replace use of %lx with %s.
+
+    gdb/ChangeLog:
+
+    2021-04-13  Luis Machado  <luis.machado@linaro.org>
+
+            * rs6000-tdep.c (ppc_displaced_step_fixup): Use %s to print
+            hex values.
+
+diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
+--- a/gdb/rs6000-tdep.c
++++ b/gdb/rs6000-tdep.c
+@@ -982,9 +982,9 @@ ppc_displaced_step_fixup (struct gdbarch *gdbarch,
+       if (debug_displaced)
+ 	fprintf_unfiltered (gdb_stdlog,
+ 			    "displaced: {ppc} addpcis target regnum %d was "
+-			    "0x%lx now 0x%lx",
+-			    regnum, current_val,
+-			    current_val + displaced_offset);
++			    "%s now %s",
++			    regnum, paddress (gdbarch, current_val),
++			    paddress (gdbarch, current_val + displaced_offset));
+       regcache_cooked_write_unsigned (regs, regnum,
+ 					current_val + displaced_offset);
+       /* point the PC back at the non-displaced instruction.  */

SOURCES/gdb-rhbz1898252-loadable-section-outside-ELF-segments.patch

@@ -0,0 +1,67 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Keith Seitz <keiths@redhat.com>
+Date: Mon, 16 Nov 2020 12:42:09 -0500
+Subject: gdb-rhbz1898252-loadable-section-outside-ELF-segments.patch
+
+;; Backport of "Exclude debuginfo files from 'outside of ELF segments'
+;; warning"  (Keith Seitz)
+
+    Exclude debuginfo files from "outside of ELF segments" warning
+
+    When GDB loads an ELF file, it will warn when a section is not located
+    in an ELF segment:
+
+    $ ./gdb -q -iex "set build-id-verbose 0" --ex "b systemctl_main" -ex "r" -batch --args systemctl kexec
+    Breakpoint 1 at 0xc24d: file ../src/systemctl/systemctl.c, line 8752.
+    warning: Loadable section ".note.gnu.property" outside of ELF segments
+      in .gnu_debugdata for /lib64/libgcc_s.so.1
+    [Thread debugging using libthread_db enabled]
+    Using host libthread_db library "/lib64/libthread_db.so.1".
+    warning: Loadable section ".note.gnu.property" outside of ELF segments
+      in .gnu_debugdata for /lib64/libcap.so.2
+    warning: Loadable section ".note.gnu.property" outside of ELF segments
+      in .gnu_debugdata for /lib64/libacl.so.1
+    warning: Loadable section ".note.gnu.property" outside of ELF segments
+      in .gnu_debugdata for /lib64/libcryptsetup.so.12
+    warning: Loadable section ".note.gnu.property" outside of ELF segments
+      in .gnu_debugdata for /lib64/libgcrypt.so.20
+    warning: Loadable section ".note.gnu.property" outside of ELF segments
+      in .gnu_debugdata for /lib64/libip4tc.so.2
+    [snip]
+    This has feature has also been reported by various users, most notably
+    the Fedora-EOL'd bug 1553086.
+
+    Mark Wielaard explains the issue quite nicely in
+
+       https://sourceware.org/bugzilla/show_bug.cgi?id=24717#c2
+
+    The short of it is, the ELF program headers for debuginfo files are
+    not suited to this particular use case. Consequently, the warning
+    generated above really is useless and should be ignored.
+
+    This patch follows the same heuristic that BFD itself uses.
+
+    gdb/ChangeLog
+    2020-11-13  Keith Seitz  <keiths@redhat.com>
+
+            https://bugzilla.redhat.com/show_bug.cgi?id=1553086
+            * elfread.c (elf_symfile_segments): Omit "Loadable section ...
+            outside of ELF segments" warning for debugin
+
+diff --git a/gdb/elfread.c b/gdb/elfread.c
+--- a/gdb/elfread.c
++++ b/gdb/elfread.c
+@@ -147,7 +147,12 @@ elf_symfile_segments (bfd *abfd)
+ 	 RealView) use SHT_NOBITS for uninitialized data.  Since it is
+ 	 uninitialized, it doesn't need a program header.  Such
+ 	 binaries are not relocatable.  */
+-      if (bfd_section_size (sect) > 0 && j == num_segments
++
++      /* Exclude debuginfo files from this warning, too, since those
++	 are often not strictly compliant with the standard. See, e.g.,
++	 ld/24717 for more discussion.  */
++      if (!is_debuginfo_file (abfd)
++	  && bfd_section_size (sect) > 0 && j == num_segments
+ 	  && (bfd_section_flags (sect) & SEC_LOAD) != 0)
+ 	warning (_("Loadable section \"%s\" outside of ELF segments"),
+ 		 bfd_section_name (sect));

SOURCES/gdb-rhbz1903375-s390x-store-on-condition.patch

@@ -0,0 +1,64 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Andreas Arnez <arnez@linux.ibm.com>
+Date: Thu, 19 Nov 2020 19:10:58 +0100
+Subject: gdb-rhbz1903375-s390x-store-on-condition.patch
+
+;; Backport of "Correct recording of 'store on condition' insns"
+;; Andreas Arnaz (RH BZ 1903374)
+
+gdb/s390: Correct recording of "store on condition" insns
+
+The "store on condition" instructions STOC, STOCG, and STOCFH are recorded
+as if their instruction formats resembled that of STG.  This is wrong,
+usually resulting in "failed to record execution log" errors when trying
+to record code with any of these instructions.
+
+This patch fixes the recording of these instructions.
+
+gdb/ChangeLog:
+
+	PR tdep/26916
+	* s390-tdep.c (s390_process_record): Fix recording of STOC, STOCG,
+	and STOCFH.
+
+diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
+--- a/gdb/s390-tdep.c
++++ b/gdb/s390-tdep.c
+@@ -5382,7 +5382,6 @@ s390_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
+ 	case 0xe325: /* NTSTG - nontransactional store */
+ 	case 0xe326: /* CVDY - convert to decimal */
+ 	case 0xe32f: /* STRVG - store reversed */
+-	case 0xebe3: /* STOCG - store on condition */
+ 	case 0xed67: /* STDY - store */
+ 	  oaddr = s390_record_calc_disp (gdbarch, regcache, inib[3], insn[1], ibyte[4]);
+ 	  if (record_full_arch_list_add_mem (oaddr, 8))
+@@ -5411,8 +5410,6 @@ s390_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
+ 	case 0xe33e: /* STRV - store reversed */
+ 	case 0xe350: /* STY - store */
+ 	case 0xe3cb: /* STFH - store high */
+-	case 0xebe1: /* STOCFH - store high on condition */
+-	case 0xebf3: /* STOC - store on condition */
+ 	case 0xed66: /* STEY - store */
+ 	  oaddr = s390_record_calc_disp (gdbarch, regcache, inib[3], insn[1], ibyte[4]);
+ 	  if (record_full_arch_list_add_mem (oaddr, 4))
+@@ -6125,6 +6122,20 @@ s390_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
+ 
+ 	/* 0xeb9c-0xebbf undefined */
+ 	/* 0xebc1-0xebdb undefined */
++
++	case 0xebe1: /* STOCFH - store high on condition */
++	case 0xebf3: /* STOC - store on condition */
++	  oaddr = s390_record_calc_disp (gdbarch, regcache, 0, insn[1], ibyte[4]);
++	  if (record_full_arch_list_add_mem (oaddr, 4))
++	    return -1;
++	  break;
++
++	case 0xebe3: /* STOCG - store on condition */
++	  oaddr = s390_record_calc_disp (gdbarch, regcache, 0, insn[1], ibyte[4]);
++	  if (record_full_arch_list_add_mem (oaddr, 8))
++	    return -1;
++	  break;
++
+ 	/* 0xebe5 undefined */
+ 	/* 0xebe9 undefined */
+ 	/* 0xebeb-0xebf1 undefined */

SOURCES/gdb-rhbz1905996-fix-off-by-one-error-in-ada_fold_name.patch

@@ -0,0 +1,82 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Tue, 8 Dec 2020 14:07:45 -0700
+Subject: gdb-rhbz1905996-fix-off-by-one-error-in-ada_fold_name.patch
+
+;; Fix off-by-one error in ada_fold_name.patch (RH BZ 1905996)
+;; Upstream patch proposal: https://sourceware.org/pipermail/gdb-patches/2020-December/173935.html
+;; =fedoratest
+
+Fix off-by-one error in ada_fold_name
+
+I'm seeing a libstdc++ assertion failure when running GDB's "maint selftest"
+command when GDB is configured with the following CFLAGS and CXXFLAGS as
+part of the configure line:
+
+  CFLAGS='-D_GLIBCXX_DEBUG -g3 -O0' CXXFLAGS='-D_GLIBCXX_DEBUG -g3 -O0'
+
+This is what I see when running the self tests:
+
+(gdb) maint selftest
+Running selftest aarch64-analyze-prologue.
+Running selftest aarch64-process-record.
+Running selftest arm-record.
+Running selftest arm_analyze_prologue.
+Running selftest array_view.
+Running selftest child_path.
+Running selftest cli_utils.
+Running selftest command_structure_invariants.
+Running selftest copy_bitwise.
+Running selftest copy_integer_to_size.
+Running selftest cp_remove_params.
+Running selftest cp_symbol_name_matches.
+Running selftest dw2_expand_symtabs_matching.
+/usr/include/c++/11/string_view:211: constexpr const value_type& std::basic_string_view<_CharT, _Traits>::operator[](std::basic_string_view<_CharT, _Traits>::size_type) const [with _CharT = char; _Traits = std::char_traits<char>; std::basic_string_view<_CharT, _Traits>::const_reference = const char&; std::basic_string_view<_CharT, _Traits>::size_type = long unsigned int]: Assertion '__pos < this->_M_len' failed.
+Aborted (core dumped)
+
+Here's a partial stack trace:
+
+  #0  0x00007ffff6ef6262 in raise () from /lib64/libc.so.6
+  #1  0x00007ffff6edf8a4 in abort () from /lib64/libc.so.6
+  #2  0x00000000004249bf in std::__replacement_assert (
+      __file=0xef7480 "/usr/include/c++/11/string_view", __line=211,
+      __function=0xef7328 "constexpr const value_type& std::basic_string_view<_CharT, _Traits>::operator[](std::basic_string_view<_CharT, _Traits>::size_type) const [with _CharT = char; _Traits = std::char_traits<char>; std::ba"...,
+      __condition=0xef7311 "__pos < this->_M_len")
+      at /usr/include/c++/11/x86_64-redhat-linux/bits/c++config.h:2624
+  #3  0x0000000000451737 in std::basic_string_view<char, std::char_traits<char> >::operator[] (this=0x7fffffffc200, __pos=8)
+      at /usr/include/c++/11/string_view:211
+  #4  0x00000000004329f5 in ada_fold_name (name="function")
+      at /ironwood1/sourceware-git/rawhide-master/bld/../../worktree-master/gdb/ada-lang.c:988
+
+And, looking at frame #4...
+
+(top-gdb) up 4
+    at /ironwood1/sourceware-git/rawhide-master/bld/../../worktree-master/gdb/ada-lang.c:988
+988		fold_buffer[i] = tolower (name[i]);
+(top-gdb) p i
+$1 = 8
+(top-gdb) p name.size()
+$2 = 8
+
+My patch adjusts the comparison to only copy name.size() characters
+from the string.  I've added a separate statement for NUL character
+termination of fold_buffer[].
+
+gdb/ChangeLog:
+
+	* ada-lang.c (ada_fold_name): Fix off-by-one error.
+
+diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
+--- a/gdb/ada-lang.c
++++ b/gdb/ada-lang.c
+@@ -1006,8 +1006,9 @@ ada_fold_name (gdb::string_view name)
+     {
+       int i;
+ 
+-      for (i = 0; i <= len; i += 1)
++      for (i = 0; i < len; i += 1)
+         fold_buffer[i] = tolower (name[i]);
++      fold_buffer[i] = '\0';
+     }
+ 
+   return fold_buffer;

SOURCES/gdb-rhbz1909902-frame_id_p-assert-1.patch

@@ -0,0 +1,593 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Pedro Alves <pedro@palves.net>
+Date: Fri, 30 Oct 2020 18:26:15 +0100
+Subject: gdb-rhbz1909902-frame_id_p-assert-1.patch
+
+;; Backport fix for frame_id_p assertion failure (RH BZ 1909902).
+
+Make scoped_restore_current_thread's cdtors exception free (RFC)
+
+If the remote target closes while we're reading registers/memory for
+restoring the selected frame in scoped_restore_current_thread's dtor,
+the corresponding TARGET_CLOSE_ERROR error is swallowed by the
+scoped_restore_current_thread's dtor, because letting exceptions
+escape from a dtor is bad.  It isn't great to lose that errors like
+that, though.  I've been thinking about how to avoid it, and I came up
+with this patch.
+
+The idea here is to make scoped_restore_current_thread's dtor do as
+little as possible, to avoid any work that might throw in the first
+place.  And to do that, instead of having the dtor call
+restore_selected_frame, which re-finds the previously selected frame,
+just record the frame_id/level of the desired selected frame, and have
+get_selected_frame find the frame the next time it is called.  In
+effect, this implements most of Cagney's suggestion, here:
+
+  /* On demand, create the selected frame and then return it.  If the
+     selected frame can not be created, this function prints then throws
+     an error.  When MESSAGE is non-NULL, use it for the error message,
+     otherwize use a generic error message.  */
+  /* FIXME: cagney/2002-11-28: At present, when there is no selected
+     frame, this function always returns the current (inner most) frame.
+     It should instead, when a thread has previously had its frame
+     selected (but not resumed) and the frame cache invalidated, find
+     and then return that thread's previously selected frame.  */
+  extern struct frame_info *get_selected_frame (const char *message);
+
+The only thing missing to fully implement that would be to make
+reinit_frame_cache just clear selected_frame instead of calling
+select_frame(NULL), and the call select_frame(NULL) explicitly in the
+places where we really wanted reinit_frame_cache to go back to the
+current frame too.  That can done separately, though, I'm not
+proposing to do that in this patch.
+
+Note that this patch renames restore_selected_frame to
+lookup_selected_frame, and adds a new restore_selected_frame function
+that doesn't throw, to be paired with the also-new save_selected_frame
+function.
+
+There's a restore_selected_frame function in infrun.c that I think can
+be replaced by the new one in frame.c.
+
+Also done in this patch is make the get_selected_frame's parameter be
+optional, so that we don't have to pass down nullptr explicitly all
+over the place.
+
+lookup_selected_frame should really move from thread.c to frame.c, but
+I didn't do that here, just to avoid churn in the patch while it
+collects comments.  I did make it extern and declared it in frame.h
+already, preparing for the move.  I will do the move as a follow up
+patch if people agree with this approach.
+
+Incidentally, this patch alone would fix the crashes fixed by the
+previous patches in the series, because with this,
+scoped_restore_current_thread's constructor doesn't throw either.
+
+gdb/ChangeLog:
+
+	* blockframe.c (block_innermost_frame): Use get_selected_frame.
+	* frame.c
+	(scoped_restore_selected_frame::scoped_restore_selected_frame):
+	Use save_selected_frame.  Save language as well.
+	(scoped_restore_selected_frame::~scoped_restore_selected_frame):
+	Use restore_selected_frame, and restore language as well.
+	(selected_frame_id, selected_frame_level): New.
+	(selected_frame): Update comments.
+	(save_selected_frame, restore_selected_frame): New.
+	(get_selected_frame): Use lookup_selected_frame.
+	(get_selected_frame_if_set): Delete.
+	(select_frame): Record selected_frame_level and selected_frame_id.
+	* frame.h (scoped_restore_selected_frame) <m_level, m_lang>: New
+	fields.
+	(get_selected_frame): Make 'message' parameter optional.
+	(get_selected_frame_if_set): Delete declaration.
+	(select_frame): Update comments.
+	(save_selected_frame, restore_selected_frame)
+	(lookup_selected_frame): Declare.
+	* gdbthread.h (scoped_restore_current_thread) <m_lang>: New field.
+	* infrun.c (struct infcall_control_state) <selected_frame_level>:
+	New field.
+	(save_infcall_control_state): Use save_selected_frame.
+	(restore_selected_frame): Delete.
+	(restore_infcall_control_state): Use restore_selected_frame.
+	* stack.c (select_frame_command_core, frame_command_core): Use
+	get_selected_frame.
+	* thread.c (restore_selected_frame): Rename to ...
+	(lookup_selected_frame): ... this and make extern.  Select the
+	current frame if the frame level is -1.
+	(scoped_restore_current_thread::restore): Also restore the
+	language.
+	(scoped_restore_current_thread::~scoped_restore_current_thread):
+	Don't try/catch.
+	(scoped_restore_current_thread::scoped_restore_current_thread):
+	Save the language as well.  Use save_selected_frame.
+
+Change-Id: I73fd1cfc40d8513c28e5596383b7ecd8bcfe700f
+
+diff --git a/gdb/blockframe.c b/gdb/blockframe.c
+--- a/gdb/blockframe.c
++++ b/gdb/blockframe.c
+@@ -464,14 +464,10 @@ find_gnu_ifunc_target_type (CORE_ADDR resolver_funaddr)
+ struct frame_info *
+ block_innermost_frame (const struct block *block)
+ {
+-  struct frame_info *frame;
+-
+   if (block == NULL)
+     return NULL;
+ 
+-  frame = get_selected_frame_if_set ();
+-  if (frame == NULL)
+-    frame = get_current_frame ();
++  frame_info *frame = get_selected_frame ();
+   while (frame != NULL)
+     {
+       const struct block *frame_block = get_frame_block (frame, NULL);
+diff --git a/gdb/frame.c b/gdb/frame.c
+--- a/gdb/frame.c
++++ b/gdb/frame.c
+@@ -317,17 +317,15 @@ frame_stash_invalidate (void)
+ /* See frame.h  */
+ scoped_restore_selected_frame::scoped_restore_selected_frame ()
+ {
+-  m_fid = get_frame_id (get_selected_frame (NULL));
++  m_lang = current_language->la_language;
++  save_selected_frame (&m_fid, &m_level);
+ }
+ 
+ /* See frame.h  */
+ scoped_restore_selected_frame::~scoped_restore_selected_frame ()
+ {
+-  frame_info *frame = frame_find_by_id (m_fid);
+-  if (frame == NULL)
+-    warning (_("Unable to restore previously selected frame."));
+-  else
+-    select_frame (frame);
++  restore_selected_frame (m_fid, m_level);
++  set_language (m_lang);
+ }
+ 
+ /* Flag to control debugging.  */
+@@ -1685,10 +1683,63 @@ get_current_frame (void)
+ }
+ 
+ /* The "selected" stack frame is used by default for local and arg
+-   access.  May be zero, for no selected frame.  */
+-
++   access.
++
++   The "single source of truth" for the selected frame is the
++   SELECTED_FRAME_ID / SELECTED_FRAME_LEVEL pair.
++
++   Frame IDs can be saved/restored across reinitializing the frame
++   cache, while frame_info pointers can't (frame_info objects are
++   invalidated).  If we know the corresponding frame_info object, it
++   is cached in SELECTED_FRAME.
++
++   If SELECTED_FRAME_ID / SELECTED_FRAME_LEVEL are null_frame_id / -1,
++   and the target has stack and is stopped, the selected frame is the
++   current (innermost) frame.  This means that SELECTED_FRAME_LEVEL is
++   never 0 and SELECTED_FRAME_ID is never the ID of the innermost
++   frame.
++
++   If SELECTED_FRAME_ID / SELECTED_FRAME_LEVEL are null_frame_id / -1,
++   and the target has no stack or is executing, then there's no
++   selected frame.  */
++static frame_id selected_frame_id = null_frame_id;
++static int selected_frame_level = -1;
++
++/* The cached frame_info object pointing to the selected frame.
++   Looked up on demand by get_selected_frame.  */
+ static struct frame_info *selected_frame;
+ 
++/* See frame.h.  */
++
++void
++save_selected_frame (frame_id *frame_id, int *frame_level)
++  noexcept
++{
++  *frame_id = selected_frame_id;
++  *frame_level = selected_frame_level;
++}
++
++/* See frame.h.  */
++
++void
++restore_selected_frame (frame_id frame_id, int frame_level)
++  noexcept
++{
++  /* save_selected_frame never returns level == 0, so we shouldn't see
++     it here either.  */
++  gdb_assert (frame_level != 0);
++
++  /* FRAME_ID can be null_frame_id only IFF frame_level is -1.  */
++  gdb_assert ((frame_level == -1 && !frame_id_p (frame_id))
++	      || (frame_level != -1 && frame_id_p (frame_id)));
++
++  selected_frame_id = frame_id;
++  selected_frame_level = frame_level;
++
++  /* Will be looked up later by get_selected_frame.  */
++  selected_frame = nullptr;
++}
++
+ bool
+ has_stack_frames ()
+ {
+@@ -1715,9 +1766,7 @@ has_stack_frames ()
+   return true;
+ }
+ 
+-/* Return the selected frame.  Always non-NULL (unless there isn't an
+-   inferior sufficient for creating a frame) in which case an error is
+-   thrown.  */
++/* See frame.h.  */
+ 
+ struct frame_info *
+ get_selected_frame (const char *message)
+@@ -1726,24 +1775,14 @@ get_selected_frame (const char *message)
+     {
+       if (message != NULL && !has_stack_frames ())
+ 	error (("%s"), message);
+-      /* Hey!  Don't trust this.  It should really be re-finding the
+-	 last selected frame of the currently selected thread.  This,
+-	 though, is better than nothing.  */
+-      select_frame (get_current_frame ());
++
++      lookup_selected_frame (selected_frame_id, selected_frame_level);
+     }
+   /* There is always a frame.  */
+   gdb_assert (selected_frame != NULL);
+   return selected_frame;
+ }
+ 
+-/* If there is a selected frame, return it.  Otherwise, return NULL.  */
+-
+-struct frame_info *
+-get_selected_frame_if_set (void)
+-{
+-  return selected_frame;
+-}
+-
+ /* This is a variant of get_selected_frame() which can be called when
+    the inferior does not have a frame; in that case it will return
+    NULL instead of calling error().  */
+@@ -1756,12 +1795,42 @@ deprecated_safe_get_selected_frame (void)
+   return get_selected_frame (NULL);
+ }
+ 
+-/* Select frame FI (or NULL - to invalidate the current frame).  */
++/* Select frame FI (or NULL - to invalidate the selected frame).  */
+ 
+ void
+ select_frame (struct frame_info *fi)
+ {
+   selected_frame = fi;
++  selected_frame_level = frame_relative_level (fi);
++  if (selected_frame_level == 0)
++    {
++      /* Treat the current frame especially -- we want to always
++	 save/restore it without warning, even if the frame ID changes
++	 (see lookup_selected_frame).  E.g.:
++
++	  // The current frame is selected, the target had just stopped.
++	  {
++	    scoped_restore_selected_frame restore_frame;
++	    some_operation_that_changes_the_stack ();
++	  }
++	  // scoped_restore_selected_frame's dtor runs, but the
++	  // original frame_id can't be found.  No matter whether it
++	  // is found or not, we still end up with the now-current
++	  // frame selected.  Warning in lookup_selected_frame in this
++	  // case seems pointless.
++
++	 Also get_frame_id may access the target's registers/memory,
++	 and thus skipping get_frame_id optimizes the common case.
++
++	 Saving the selected frame this way makes get_selected_frame
++	 and restore_current_frame return/re-select whatever frame is
++	 the innermost (current) then.  */
++      selected_frame_level = -1;
++      selected_frame_id = null_frame_id;
++    }
++  else
++    selected_frame_id = get_frame_id (fi);
++
+   /* NOTE: cagney/2002-05-04: FI can be NULL.  This occurs when the
+      frame is being invalidated.  */
+ 
+diff --git a/gdb/frame.h b/gdb/frame.h
+--- a/gdb/frame.h
++++ b/gdb/frame.h
+@@ -186,8 +186,14 @@ class scoped_restore_selected_frame
+ 
+ private:
+ 
+-  /* The ID of the previously selected frame.  */
++  /* The ID and level of the previously selected frame.  */
+   struct frame_id m_fid;
++  int m_level;
++
++  /* Save/restore the language as well, because selecting a frame
++     changes the current language to the frame's language if "set
++     language auto".  */
++  enum language m_lang;
+ };
+ 
+ /* Methods for constructing and comparing Frame IDs.  */
+@@ -316,24 +322,49 @@ extern bool has_stack_frames ();
+    modifies the target invalidating the frame cache).  */
+ extern void reinit_frame_cache (void);
+ 
+-/* On demand, create the selected frame and then return it.  If the
+-   selected frame can not be created, this function prints then throws
+-   an error.  When MESSAGE is non-NULL, use it for the error message,
++/* Return the selected frame.  Always returns non-NULL.  If there
++   isn't an inferior sufficient for creating a frame, an error is
++   thrown.  When MESSAGE is non-NULL, use it for the error message,
+    otherwise use a generic error message.  */
+ /* FIXME: cagney/2002-11-28: At present, when there is no selected
+    frame, this function always returns the current (inner most) frame.
+    It should instead, when a thread has previously had its frame
+    selected (but not resumed) and the frame cache invalidated, find
+    and then return that thread's previously selected frame.  */
+-extern struct frame_info *get_selected_frame (const char *message);
+-
+-/* If there is a selected frame, return it.  Otherwise, return NULL.  */
+-extern struct frame_info *get_selected_frame_if_set (void);
++extern struct frame_info *get_selected_frame (const char *message = nullptr);
+ 
+-/* Select a specific frame.  NULL, apparently implies re-select the
+-   inner most frame.  */
++/* Select a specific frame.  NULL implies re-select the inner most
++   frame.  */
+ extern void select_frame (struct frame_info *);
+ 
++/* Save the frame ID and frame level of the selected frame in FRAME_ID
++   and FRAME_LEVEL, to be restored later with restore_selected_frame.
++
++   This is preferred over getting the same info out of
++   get_selected_frame directly because this function does not create
++   the selected-frame's frame_info object if it hasn't been created
++   yet, and thus is more efficient and doesn't throw.  */
++extern void save_selected_frame (frame_id *frame_id, int *frame_level)
++  noexcept;
++
++/* Restore selected frame as saved with save_selected_frame.
++
++   Does not try to find the corresponding frame_info object.  Instead
++   the next call to get_selected_frame will look it up and cache the
++   result.
++
++   This function does not throw.  It is designed to be safe to called
++   from the destructors of RAII types.  */
++extern void restore_selected_frame (frame_id frame_id, int frame_level)
++  noexcept;
++
++/* Lookup the frame_info object for the selected frame FRAME_ID /
++   FRAME_LEVEL and cache the result.
++
++   If FRAME_LEVEL > 0 and the originally selected frame isn't found,
++   warn and select the innermost (current) frame.  */
++extern void lookup_selected_frame (frame_id frame_id, int frame_level);
++
+ /* Given a FRAME, return the next (more inner, younger) or previous
+    (more outer, older) frame.  */
+ extern struct frame_info *get_prev_frame (struct frame_info *);
+diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
+--- a/gdb/gdbthread.h
++++ b/gdb/gdbthread.h
+@@ -673,6 +673,10 @@ class scoped_restore_current_thread
+   frame_id m_selected_frame_id;
+   int m_selected_frame_level;
+   bool m_was_stopped;
++  /* Save/restore the language as well, because selecting a frame
++     changes the current language to the frame's language if "set
++     language auto".  */
++  enum language m_lang;
+ };
+ 
+ /* Returns a pointer into the thread_info corresponding to
+diff --git a/gdb/infrun.c b/gdb/infrun.c
+--- a/gdb/infrun.c
++++ b/gdb/infrun.c
+@@ -9006,8 +9006,10 @@ struct infcall_control_state
+   enum stop_stack_kind stop_stack_dummy = STOP_NONE;
+   int stopped_by_random_signal = 0;
+ 
+-  /* ID if the selected frame when the inferior function call was made.  */
++  /* ID and level of the selected frame when the inferior function
++     call was made.  */
+   struct frame_id selected_frame_id {};
++  int selected_frame_level = -1;
+ };
+ 
+ /* Save all of the information associated with the inferior<==>gdb
+@@ -9036,27 +9038,12 @@ save_infcall_control_state ()
+   inf_status->stop_stack_dummy = stop_stack_dummy;
+   inf_status->stopped_by_random_signal = stopped_by_random_signal;
+ 
+-  inf_status->selected_frame_id = get_frame_id (get_selected_frame (NULL));
++  save_selected_frame (&inf_status->selected_frame_id,
++		       &inf_status->selected_frame_level);
+ 
+   return inf_status;
+ }
+ 
+-static void
+-restore_selected_frame (const frame_id &fid)
+-{
+-  frame_info *frame = frame_find_by_id (fid);
+-
+-  /* If inf_status->selected_frame_id is NULL, there was no previously
+-     selected frame.  */
+-  if (frame == NULL)
+-    {
+-      warning (_("Unable to restore previously selected frame."));
+-      return;
+-    }
+-
+-  select_frame (frame);
+-}
+-
+ /* Restore inferior session state to INF_STATUS.  */
+ 
+ void
+@@ -9084,21 +9071,8 @@ restore_infcall_control_state (struct infcall_control_state *inf_status)
+ 
+   if (target_has_stack)
+     {
+-      /* The point of the try/catch is that if the stack is clobbered,
+-         walking the stack might encounter a garbage pointer and
+-         error() trying to dereference it.  */
+-      try
+-	{
+-	  restore_selected_frame (inf_status->selected_frame_id);
+-	}
+-      catch (const gdb_exception_error &ex)
+-	{
+-	  exception_fprintf (gdb_stderr, ex,
+-			     "Unable to restore previously selected frame:\n");
+-	  /* Error in restoring the selected frame.  Select the
+-	     innermost frame.  */
+-	  select_frame (get_current_frame ());
+-	}
++      restore_selected_frame (inf_status->selected_frame_id,
++			      inf_status->selected_frame_level);
+     }
+ 
+   delete inf_status;
+diff --git a/gdb/stack.c b/gdb/stack.c
+--- a/gdb/stack.c
++++ b/gdb/stack.c
+@@ -1842,9 +1842,9 @@ trailing_outermost_frame (int count)
+ static void
+ select_frame_command_core (struct frame_info *fi, bool ignored)
+ {
+-  struct frame_info *prev_frame = get_selected_frame_if_set ();
++  frame_info *prev_frame = get_selected_frame ();
+   select_frame (fi);
+-  if (get_selected_frame_if_set () != prev_frame)
++  if (get_selected_frame () != prev_frame)
+     gdb::observers::user_selected_context_changed.notify (USER_SELECTED_FRAME);
+ }
+ 
+@@ -1863,10 +1863,9 @@ select_frame_for_mi (struct frame_info *fi)
+ static void
+ frame_command_core (struct frame_info *fi, bool ignored)
+ {
+-  struct frame_info *prev_frame = get_selected_frame_if_set ();
+-
++  frame_info *prev_frame = get_selected_frame ();
+   select_frame (fi);
+-  if (get_selected_frame_if_set () != prev_frame)
++  if (get_selected_frame () != prev_frame)
+     gdb::observers::user_selected_context_changed.notify (USER_SELECTED_FRAME);
+   else
+     print_selected_thread_frame (current_uiout, USER_SELECTED_FRAME);
+diff --git a/gdb/thread.c b/gdb/thread.c
+--- a/gdb/thread.c
++++ b/gdb/thread.c
+@@ -1325,20 +1325,26 @@ switch_to_thread (process_stratum_target *proc_target, ptid_t ptid)
+   switch_to_thread (thr);
+ }
+ 
+-static void
+-restore_selected_frame (struct frame_id a_frame_id, int frame_level)
++/* See frame.h.  */
++
++void
++lookup_selected_frame (struct frame_id a_frame_id, int frame_level)
+ {
+   struct frame_info *frame = NULL;
+   int count;
+ 
+-  /* This means there was no selected frame.  */
++  /* This either means there was no selected frame, or the selected
++     frame was the current frame.  In either case, select the current
++     frame.  */
+   if (frame_level == -1)
+     {
+-      select_frame (NULL);
++      select_frame (get_current_frame ());
+       return;
+     }
+ 
+-  gdb_assert (frame_level >= 0);
++  /* select_frame never saves 0 in SELECTED_FRAME_LEVEL, so we
++     shouldn't see it here.  */
++  gdb_assert (frame_level > 0);
+ 
+   /* Restore by level first, check if the frame id is the same as
+      expected.  If that fails, try restoring by frame id.  If that
+@@ -1409,64 +1415,28 @@ scoped_restore_current_thread::restore ()
+       && target_has_stack
+       && target_has_memory)
+     restore_selected_frame (m_selected_frame_id, m_selected_frame_level);
++
++  set_language (m_lang);
+ }
+ 
+ scoped_restore_current_thread::~scoped_restore_current_thread ()
+ {
+   if (!m_dont_restore)
+-    {
+-      try
+-	{
+-	  restore ();
+-	}
+-      catch (const gdb_exception &ex)
+-	{
+-	  /* We're in a dtor, there's really nothing else we can do
+-	     but swallow the exception.  */
+-	}
+-    }
++    restore ();
+ }
+ 
+ scoped_restore_current_thread::scoped_restore_current_thread ()
+ {
+   m_inf = inferior_ref::new_reference (current_inferior ());
+ 
++  m_lang = current_language->la_language;
++
+   if (inferior_ptid != null_ptid)
+     {
+       m_thread = thread_info_ref::new_reference (inferior_thread ());
+ 
+-      struct frame_info *frame;
+-
+       m_was_stopped = m_thread->state == THREAD_STOPPED;
+-      if (m_was_stopped
+-	  && target_has_registers
+-	  && target_has_stack
+-	  && target_has_memory)
+-	{
+-	  /* When processing internal events, there might not be a
+-	     selected frame.  If we naively call get_selected_frame
+-	     here, then we can end up reading debuginfo for the
+-	     current frame, but we don't generally need the debuginfo
+-	     at this point.  */
+-	  frame = get_selected_frame_if_set ();
+-	}
+-      else
+-	frame = NULL;
+-
+-      try
+-	{
+-	  m_selected_frame_id = get_frame_id (frame);
+-	  m_selected_frame_level = frame_relative_level (frame);
+-	}
+-      catch (const gdb_exception_error &ex)
+-	{
+-	  m_selected_frame_id = null_frame_id;
+-	  m_selected_frame_level = -1;
+-
+-	  /* Better let this propagate.  */
+-	  if (ex.error == TARGET_CLOSE_ERROR)
+-	    throw;
+-	}
++      save_selected_frame (&m_selected_frame_id, &m_selected_frame_level);
+     }
+ }
+ 

SOURCES/gdb-rhbz1909902-frame_id_p-assert-2.patch

@@ -0,0 +1,169 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Pedro Alves <pedro@palves.net>
+Date: Sat, 31 Oct 2020 00:27:18 +0000
+Subject: gdb-rhbz1909902-frame_id_p-assert-2.patch
+
+;; Backport patch #2 which fixes a frame_id_p assertion failure (RH BZ 1909902).
+
+Fix frame cycle detection
+
+The recent commit to make scoped_restore_current_thread's cdtors
+exception free regressed gdb.base/eh_return.exp:
+
+  Breakpoint 1, 0x00000000004012bb in eh2 (gdb/frame.c:641: internal-error: frame_id get_frame_id(frame_info*): Assertion `stashed' failed.
+  A problem internal to GDB has been detected,
+  further debugging may prove unreliable.
+  Quit this debugging session? (y or n) FAIL: gdb.base/eh_return.exp: hit breakpoint (GDB internal error)
+
+That testcase uses __builtin_eh_return and, before the regression, the
+backtrace at eh2 looked like this:
+
+ (gdb) bt
+ #0  0x00000000004006eb in eh2 (p=0x4006ec <continuation>) at src/gdb/testsuite/gdb.base/eh_return.c:54
+ Backtrace stopped: previous frame identical to this frame (corrupt stack?)
+
+That "previous frame identical to this frame" is caught by the cycle
+detection based on frame id.
+
+The assertion failing is this one:
+
+ 638           /* Since this is the first frame in the chain, this should
+ 639              always succeed.  */
+ 640           bool stashed = frame_stash_add (fi);
+ 641           gdb_assert (stashed);
+
+originally added by
+
+  commit f245535cf583ae4ca13b10d47b3c7d3334593ece
+  Author:     Pedro Alves <palves@redhat.com>
+  AuthorDate: Mon Sep 5 18:41:38 2016 +0100
+
+      Fix PR19927: Avoid unwinder recursion if sniffer uses calls parse_and_eval
+
+The assertion is failing because frame #1's frame id was stashed
+before the id of frame #0 is stashed.  The frame id of frame #1 was
+stashed here:
+
+ (top-gdb) bt
+ #0  frame_stash_add (frame=0x1e24c90) at src/gdb/frame.c:276
+ #1  0x0000000000669c1b in get_prev_frame_if_no_cycle (this_frame=0x19f8370) at src/gdb/frame.c:2120
+ #2  0x000000000066a339 in get_prev_frame_always_1 (this_frame=0x19f8370) at src/gdb/frame.c:2303
+ #3  0x000000000066a360 in get_prev_frame_always (this_frame=0x19f8370) at src/gdb/frame.c:2319
+ #4  0x000000000066b56c in get_frame_unwind_stop_reason (frame=0x19f8370) at src/gdb/frame.c:3028
+ #5  0x000000000059f929 in dwarf2_frame_cfa (this_frame=0x19f8370) at src/gdb/dwarf2/frame.c:1462
+ #6  0x00000000005ce434 in dwarf_evaluate_loc_desc::get_frame_cfa (this=0x7fffffffc070) at src/gdb/dwarf2/loc.c:666
+ #7  0x00000000005989a9 in dwarf_expr_context::execute_stack_op (this=0x7fffffffc070, op_ptr=0x1b2a053 "\364\003", op_end=0x1b2a053 "\364\003") at src/gdb/dwarf2/expr.c:1161
+ #8  0x0000000000596af6 in dwarf_expr_context::eval (this=0x7fffffffc070, addr=0x1b2a052 "\234\364\003", len=1) at src/gdb/dwarf2/expr.c:303
+ #9  0x0000000000597b4e in dwarf_expr_context::execute_stack_op (this=0x7fffffffc070, op_ptr=0x1b2a063 "", op_end=0x1b2a063 "") at src/gdb/dwarf2/expr.c:865
+ #10 0x0000000000596af6 in dwarf_expr_context::eval (this=0x7fffffffc070, addr=0x1b2a061 "\221X", len=2) at src/gdb/dwarf2/expr.c:303
+ #11 0x00000000005c8b5a in dwarf2_evaluate_loc_desc_full (type=0x1b564d0, frame=0x19f8370, data=0x1b2a061 "\221X", size=2, per_cu=0x1b28760, per_objfile=0x1a84930, subobj_type=0x1b564d0, subobj_byte_offset=0) at src/gdb/dwarf2/loc.c:2260
+ #12 0x00000000005c9243 in dwarf2_evaluate_loc_desc (type=0x1b564d0, frame=0x19f8370, data=0x1b2a061 "\221X", size=2, per_cu=0x1b28760, per_objfile=0x1a84930) at src/gdb/dwarf2/loc.c:2444
+ #13 0x00000000005cb769 in locexpr_read_variable (symbol=0x1b59840, frame=0x19f8370) at src/gdb/dwarf2/loc.c:3687
+ #14 0x0000000000663137 in language_defn::read_var_value (this=0x122ea60 <c_language_defn>, var=0x1b59840, var_block=0x0, frame=0x19f8370) at src/gdb/findvar.c:618
+ #15 0x0000000000663c3b in read_var_value (var=0x1b59840, var_block=0x0, frame=0x19f8370) at src/gdb/findvar.c:822
+ #16 0x00000000008c7d9f in read_frame_arg (fp_opts=..., sym=0x1b59840, frame=0x19f8370, argp=0x7fffffffc470, entryargp=0x7fffffffc490) at src/gdb/stack.c:542
+ #17 0x00000000008c89cd in print_frame_args (fp_opts=..., func=0x1b597c0, frame=0x19f8370, num=-1, stream=0x1aba860) at src/gdb/stack.c:890
+ #18 0x00000000008c9bf8 in print_frame (fp_opts=..., frame=0x19f8370, print_level=0, print_what=SRC_AND_LOC, print_args=1, sal=...) at src/gdb/stack.c:1394
+ #19 0x00000000008c92b9 in print_frame_info (fp_opts=..., frame=0x19f8370, print_level=0, print_what=SRC_AND_LOC, print_args=1, set_current_sal=1) at src/gdb/stack.c:1119
+ #20 0x00000000008c75f0 in print_stack_frame (frame=0x19f8370, print_level=0, print_what=SRC_AND_LOC, set_current_sal=1) at src/gdb/stack.c:366
+ #21 0x000000000070250b in print_stop_location (ws=0x7fffffffc9e0) at src/gdb/infrun.c:8110
+ #22 0x0000000000702569 in print_stop_event (uiout=0x1a8b9e0, displays=true) at src/gdb/infrun.c:8126
+ #23 0x000000000096d04b in tui_on_normal_stop (bs=0x1bcd1c0, print_frame=1) at src/gdb/tui/tui-interp.c:98
+ ...
+
+Before the commit to make scoped_restore_current_thread's cdtors
+exception free, scoped_restore_current_thread's dtor would call
+get_frame_id on the selected frame, and we use
+scoped_restore_current_thread pervasively.  That had the side effect
+of stashing the frame id of frame #0 before reaching the path shown in
+the backtrace.  I.e., the frame id of frame #0 happened to be stashed
+before the frame id of frame #1.  But that was by chance, not by
+design.
+
+This commit:
+
+  commit 256ae5dbc73d1348850f86ee77a0dc3b04bc7cc0
+  Author:     Kevin Buettner <kevinb@redhat.com>
+  AuthorDate: Mon Oct 31 12:47:42 2016 -0700
+
+      Stash frame id of current frame before stashing frame id for previous frame
+
+Fixed a similar problem, by making sure get_prev_frame computes the
+frame id of the current frame before unwinding the previous frame, so
+that the cycle detection works properly.  That fix misses the scenario
+we're now running against, because if you notice, the backtrace above
+shows that frame #4 calls get_prev_frame_always, not get_prev_frame.
+I.e., nothing is calling get_frame_id on the current frame.
+
+The fix here is to move Kevin's fix down from get_prev_frame to
+get_prev_frame_always.  Or actually, a bit further down to
+get_prev_frame_always_1 -- note that inline_frame_this_id calls
+get_prev_frame_always, so we need to be careful to avoid recursion in
+that scenario.
+
+gdb/ChangeLog:
+
+	* frame.c (get_prev_frame): Move get_frame_id call from here ...
+	(get_prev_frame_always_1): ... to here.
+	* inline-frame.c (inline_frame_this_id): Mention
+	get_prev_frame_always_1 in comment.
+
+Change-Id: Id960c98ab2d072c48a436c3eb160cc4b2a5cfd1d
+
+diff --git a/gdb/frame.c b/gdb/frame.c
+--- a/gdb/frame.c
++++ b/gdb/frame.c
+@@ -2133,6 +2133,23 @@ get_prev_frame_always_1 (struct frame_info *this_frame)
+   if (get_frame_type (this_frame) == INLINE_FRAME)
+     return get_prev_frame_if_no_cycle (this_frame);
+ 
++  /* If this_frame is the current frame, then compute and stash its
++     frame id prior to fetching and computing the frame id of the
++     previous frame.  Otherwise, the cycle detection code in
++     get_prev_frame_if_no_cycle() will not work correctly.  When
++     get_frame_id() is called later on, an assertion error will be
++     triggered in the event of a cycle between the current frame and
++     its previous frame.
++
++     Note we do this after the INLINE_FRAME check above.  That is
++     because the inline frame's frame id computation needs to fetch
++     the frame id of its previous real stack frame.  I.e., we need to
++     avoid recursion in that case.  This is OK since we're sure the
++     inline frame won't create a cycle with the real stack frame.  See
++     inline_frame_this_id.  */
++  if (this_frame->level == 0)
++    get_frame_id (this_frame);
++
+   /* Check that this frame is unwindable.  If it isn't, don't try to
+      unwind to the prev frame.  */
+   this_frame->stop_reason
+@@ -2410,16 +2427,6 @@ get_prev_frame (struct frame_info *this_frame)
+      something should be calling get_selected_frame() or
+      get_current_frame().  */
+   gdb_assert (this_frame != NULL);
+-  
+-  /* If this_frame is the current frame, then compute and stash
+-     its frame id prior to fetching and computing the frame id of the
+-     previous frame.  Otherwise, the cycle detection code in
+-     get_prev_frame_if_no_cycle() will not work correctly.  When
+-     get_frame_id() is called later on, an assertion error will
+-     be triggered in the event of a cycle between the current
+-     frame and its previous frame.  */
+-  if (this_frame->level == 0)
+-    get_frame_id (this_frame);
+ 
+   frame_pc_p = get_frame_pc_if_available (this_frame, &frame_pc);
+ 
+diff --git a/gdb/inline-frame.c b/gdb/inline-frame.c
+--- a/gdb/inline-frame.c
++++ b/gdb/inline-frame.c
+@@ -161,7 +161,8 @@ inline_frame_this_id (struct frame_info *this_frame,
+      real frame's this_id method.  So we must call
+      get_prev_frame_always.  Because we are inlined into some
+      function, there must be previous frames, so this is safe - as
+-     long as we're careful not to create any cycles.  */
++     long as we're careful not to create any cycles.  See related
++     comments in get_prev_frame_always_1.  */
+   *this_id = get_frame_id (get_prev_frame_always (this_frame));
+ 
+   /* We need a valid frame ID, so we need to be based on a valid

SOURCES/gdb-rhbz1912985-libstdc++-assert.patch

@@ -0,0 +1,64 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Wed, 17 Feb 2021 17:58:54 -0700
+Subject: gdb-rhbz1912985-libstdc++-assert.patch
+
+;; Backport fix for libstdc++ assert when performing tab completion
+;; (RH BZ 1912985).
+
+Fix completion related libstdc++ assert when using -D_GLIBCXX_DEBUG
+
+This commit fixes a libstdc++ assertion failure encountered when
+running gdb.base/completion.exp.  In order to see this problem,
+GDB must be built with the follow CFLAGS and CXXFLAGS as part
+of the configure line:
+
+  CFLAGS='-D_GLIBCXX_DEBUG' CXXFLAGS='-D_GLIBCXX_DEBUG'
+
+(Also, this problem was encountered using Fedora rawhide.  It might
+not be reproducible in Fedora versions prior to Fedora 34.)
+
+Using the gdb.base/completion.exp test program, the problem can be
+observed as follows:
+
+[kev@rawhide-1 gdb]$ ./gdb -q testsuite/outputs/gdb.base/completion/completion
+Reading symbols from testsuite/outputs/gdb.base/completion/completion...
+(gdb) start
+Temporary breakpoint 1 at 0x401179: file ../../worktree-master/gdb/testsuite/gdb.base/break.c, line 43.
+Starting program: testsuite/outputs/gdb.base/completion/completion
+
+Temporary breakpoint 1, main (argc=1, argv=0x7fffffffd718, envp=0x7fffffffd728) at ../../worktree-master/gdb/testsuite/gdb.base/break.c:43
+43	    if (argc == 12345) {  /* an unlikely value < 2^16, in case uninited */ /* set breakpoint 6 here */
+(gdb) p <TAB>/usr/include/c++/11/string_view:211: constexpr const value_type& std::basic_string_view<_CharT, _Traits>::operator[](std::basic_string_view<_CharT, _Traits>::size_type) const [with _CharT = char; _Traits = std::char_traits<char>; std::basic_string_view<_CharT, _Traits>::const_reference = const char&; std::basic_string_view<_CharT, _Traits>::size_type = long unsigned int]: Assertion '__pos < this->_M_len' failed.
+Aborted (core dumped)
+
+(Note that I added "<TAB>" to make it clear where the tab key was
+pressed.)
+
+gdb/ChangeLog:
+
+	* ada-lang.c (ada_fold_name): Check for non-empty string prior
+	to accessing it.
+	(ada_lookup_name_info): Likewise.
+
+diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
+--- a/gdb/ada-lang.c
++++ b/gdb/ada-lang.c
+@@ -997,7 +997,7 @@ ada_fold_name (gdb::string_view name)
+   int len = name.size ();
+   GROW_VECT (fold_buffer, fold_buffer_size, len + 1);
+ 
+-  if (name[0] == '\'')
++  if (!name.empty () && name[0] == '\'')
+     {
+       strncpy (fold_buffer, name.data () + 1, len - 2);
+       fold_buffer[len - 2] = '\000';
+@@ -13597,7 +13597,7 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name)
+ {
+   gdb::string_view user_name = lookup_name.name ();
+ 
+-  if (user_name[0] == '<')
++  if (!user_name.empty () && user_name[0] == '<')
+     {
+       if (user_name.back () == '>')
+ 	m_encoded_name

SOURCES/gdb-rhbz1931344-bfd_seek-elf_read_notes.patch

@@ -0,0 +1,87 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Keith Seitz <keiths@redhat.com>
+Date: Thu, 25 Mar 2021 10:31:48 -0700
+Subject: gdb-rhbz1931344-bfd_seek-elf_read_notes.patch
+
+;; Backport "Save/restore file offset while reading notes in core file"
+;; (Keith Seitz, RHBZ 1931344)
+
+A recent bug (RH BZ 1931344) has exposed a bug in the core file
+build-ID support that I introduced a while ago. It is pretty
+easy to demonstate the problem following a simplified procedure
+outlined in that bug:
+
+[shell1]
+shell1$ /usr/libexec/qemu-kvm
+
+[shell2]
+shell2$ pkill -SEGV -x qemu-kvm
+
+[shell1]
+Segmentation fault (core dumped)
+
+Load this core file into GDB without specifying an executable
+(an unfortunate Fedora/RHEL-ism), and GDB will inform the user
+to install debuginfo for the "missing" executable:
+
+$ gdb -nx -q core.12345
+...
+Missing separate debuginfo for the main executable file
+Try: dnf --enablerepo='*debug*' install /usr/lib/debug/.build-id/e2/e9c66d3117fb2bbb5b2be122f04f2664e5df54
+Core was generated by `/usr/libexec/qemu-kvm'.
+Program terminated with signal SIGSEGV, Segmentation fault.
+...
+
+The suggested build-ID is actaully for gmp not qemu-kvm. The problem
+lies in _bfd_elf_core_find_build_id, where we loop over program headers
+looking for note segments:
+
+  /* Read in program headers and parse notes.  */
+  for (i = 0; i < i_ehdr.e_phnum; ++i, ++i_phdr)
+    {
+      Elf_External_Phdr x_phdr;
+
+      if (bfd_bread (&x_phdr, sizeof (x_phdr), abfd) != sizeof (x_phdr))
+        goto fail;
+      elf_swap_phdr_in (abfd, &x_phdr, i_phdr);
+
+      if (i_phdr->p_type == PT_NOTE && i_phdr->p_filesz > 0)
+        {
+          elf_read_notes (abfd, offset + i_phdr->p_offset,
+                          i_phdr->p_filesz, i_phdr->p_align);
+
+          if (abfd->build_id != NULL)
+            return TRUE;
+        }
+
+elf_read_notes uses bfd_seek to forward the stream to the location of
+the note segment. When control returns to _bfd_elf_core_fild_build_id,
+the stream is no longer in the location looking at program headers, and
+all subsequent reads will read from the wrong file offset.
+
+To fix this, this patch marks the stream location and ensures
+that it is restored after elf_read_notes is called.
+
+bfd/ChangeLog
+2021-03-26  Keith Seitz  <keiths@redhat.com>
+
+	* elfcore.h (_bfd_elf_core_find_build_id): Seek file
+	offset of program headers after calling elf_read_notes.
+
+diff --git a/bfd/elfcore.h b/bfd/elfcore.h
+--- a/bfd/elfcore.h
++++ b/bfd/elfcore.h
+@@ -410,6 +410,13 @@ NAME(_bfd_elf, core_find_build_id)
+ 	{
+ 	  elf_read_notes (abfd, offset + i_phdr->p_offset,
+ 			  i_phdr->p_filesz, i_phdr->p_align);
++
++	  /* Make sure ABFD returns to processing the program headers.  */
++	  if (bfd_seek (abfd, (file_ptr) (offset + i_ehdr.e_phoff
++					  + (i + 1) * sizeof (x_phdr)),
++			SEEK_SET) != 0)
++	    goto fail;
++
+ 	  if (abfd->build_id != NULL)
+ 	    return TRUE;
+ 	}

SOURCES/gdb-rhbz1941080-fix-gdbserver-hang.patch

@@ -0,0 +1,58 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Fri, 19 Mar 2021 11:07:11 -0700
+Subject: gdb-rhbz1941080-fix-gdbserver-hang.patch
+
+;; Backport change which fixes gdbserver testing hang on f34 and rawhide.
+
+Fix potential hang during gdbserver testing
+
+We're currently seeing testing of native-extended-gdbserver hang while
+testing the x86_64 architecture on both Fedora 34 and Fedora Rawhide.
+The test responsible for the hang is gdb.threads/fork-plus-threads.exp.
+
+While there is clearly a problem/bug with this test on F34 and
+Rawhide, it's also the case that testing should not hang.  This commit
+prevents the hang by waiting with the "-nowait" flag in
+close_gdbserver.
+
+The -nowait flag is also used in the kill_wait_spawned_process proc in
+gdb/testsuite/lib/gdb.exp, so there is precedent for doing this.
+
+There are also 15 other uses of "wait -i" scattered throughout the
+test suite.  While it's tempting to change these to also use the
+-nowait flag, I think it might be safer to defer doing so until we
+actually see a problem.
+
+I've tested this patch on Fedora 32, 33, 34, and Rawhide.  Results are
+comparable on Fedora 32 and 33.  On Fedora 34 and Rawhide, with this
+commit in place, testing completes when the target_board is
+native-extended-gdbserver.  On those OSes, when not using this commit,
+testing usually hangs due to a problem with
+gdb.threads/fork-plus-threads.exp.  I've also tested on all of the
+mentioned OSes with target_board=native-gdbserver; for that testing,
+I achieved comparable results over a number of runs.  (Unfortunately
+results are rarely identical due to racy tests.)
+
+gdb/testsuite/ChangeLog:
+
+	* lib/gdbserver-support.exp (gdbserver_exit): Use the
+	"-nowait" flag when waiting for gdbserver to exit.
+
+diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp
+--- a/gdb/testsuite/lib/gdbserver-support.exp
++++ b/gdb/testsuite/lib/gdbserver-support.exp
+@@ -418,7 +418,12 @@ proc close_gdbserver {} {
+     verbose "Quitting GDBserver"
+ 
+     catch "close -i $server_spawn_id"
+-    catch "wait -i $server_spawn_id"
++
++    # If gdbserver misbehaves, and ignores the close, waiting for it
++    # without the -nowait flag will cause testing to hang.  Passing
++    # -nowait makes expect tell Tcl to wait for the process in the
++    # background.
++    catch "wait -nowait -i $server_spawn_id"
+     unset server_spawn_id
+ }
+ 

SOURCES/gdb-rhbz1964167-convert-enum-range_type.patch

@@ -0,0 +1,375 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Mon, 24 May 2021 17:10:28 -0700
+Subject: gdb-rhbz1964167-convert-enum-range_type.patch
+
+;; [fortran] Backport Andrew Burgess's commit which changes enum
+;; range_type into a bit field enum.
+
+gdb: Convert enum range_type to a bit field enum
+
+The expression range_type enum represents the following ideas:
+
+  - Lower bound is set to default,
+  - Upper bound is set to default,
+  - Upper bound is exclusive.
+
+There are currently 6 entries in the enum to represent the combination
+of all those ideas.
+
+In a future commit I'd like to add stride information to the range,
+this could in theory appear with any of the existing enum entries, so
+this would take us to 12 enum entries.
+
+This feels like its getting a little out of hand, so in this commit I
+switch the range_type enum over to being a flags style enum.  There's
+one entry to represent no flags being set, then 3 flags to represent
+the 3 ideas above.  Adding stride information will require adding only
+one more enum flag.
+
+I've then gone through and updated the code to handle this change.
+
+There should be no user visible changes after this commit.
+
+gdb/ChangeLog:
+
+	* expprint.c (print_subexp_standard): Update to reflect changes to
+	enum range_type.
+	(dump_subexp_body_standard): Likewise.
+	* expression.h (enum range_type): Convert to a bit field enum, and
+	make the enum unsigned.
+	* f-exp.y (subrange): Update to reflect changes to enum
+	range_type.
+	* f-lang.c (value_f90_subarray): Likewise.
+	* parse.c (operator_length_standard): Likewise.
+	* rust-exp.y (rust_parser::convert_ast_to_expression): Likewise.
+	* rust-lang.c (rust_range): Likewise.
+	(rust_compute_range): Likewise.
+	(rust_subscript): Likewise.
+
+diff --git a/gdb/expprint.c b/gdb/expprint.c
+--- a/gdb/expprint.c
++++ b/gdb/expprint.c
+@@ -584,17 +584,13 @@ print_subexp_standard (struct expression *exp, int *pos,
+ 	  longest_to_int (exp->elts[pc + 1].longconst);
+ 	*pos += 2;
+ 
+-	if (range_type == NONE_BOUND_DEFAULT_EXCLUSIVE
+-	    || range_type == LOW_BOUND_DEFAULT_EXCLUSIVE)
++	if (range_type & RANGE_HIGH_BOUND_EXCLUSIVE)
+ 	  fputs_filtered ("EXCLUSIVE_", stream);
+ 	fputs_filtered ("RANGE(", stream);
+-	if (range_type == HIGH_BOUND_DEFAULT
+-	    || range_type == NONE_BOUND_DEFAULT
+-	    || range_type == NONE_BOUND_DEFAULT_EXCLUSIVE)
++	if (!(range_type & RANGE_LOW_BOUND_DEFAULT))
+ 	  print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
+ 	fputs_filtered ("..", stream);
+-	if (range_type == LOW_BOUND_DEFAULT
+-	    || range_type == NONE_BOUND_DEFAULT)
++	if (!(range_type & RANGE_HIGH_BOUND_DEFAULT))
+ 	  print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
+ 	fputs_filtered (")", stream);
+ 	return;
+@@ -1114,36 +1110,19 @@ dump_subexp_body_standard (struct expression *exp,
+ 	  longest_to_int (exp->elts[elt].longconst);
+ 	elt += 2;
+ 
+-	switch (range_type)
+-	  {
+-	  case BOTH_BOUND_DEFAULT:
+-	    fputs_filtered ("Range '..'", stream);
+-	    break;
+-	  case LOW_BOUND_DEFAULT:
+-	    fputs_filtered ("Range '..EXP'", stream);
+-	    break;
+-	  case LOW_BOUND_DEFAULT_EXCLUSIVE:
+-	    fputs_filtered ("ExclusiveRange '..EXP'", stream);
+-	    break;
+-	  case HIGH_BOUND_DEFAULT:
+-	    fputs_filtered ("Range 'EXP..'", stream);
+-	    break;
+-	  case NONE_BOUND_DEFAULT:
+-	    fputs_filtered ("Range 'EXP..EXP'", stream);
+-	    break;
+-	  case NONE_BOUND_DEFAULT_EXCLUSIVE:
+-	    fputs_filtered ("ExclusiveRange 'EXP..EXP'", stream);
+-	    break;
+-	  default:
+-	    fputs_filtered ("Invalid Range!", stream);
+-	    break;
+-	  }
++	if (range_type & RANGE_HIGH_BOUND_EXCLUSIVE)
++	  fputs_filtered ("Exclusive", stream);
++	fputs_filtered ("Range '", stream);
++	if (!(range_type & RANGE_LOW_BOUND_DEFAULT))
++	  fputs_filtered ("EXP", stream);
++	fputs_filtered ("..", stream);
++	if (!(range_type & RANGE_HIGH_BOUND_DEFAULT))
++	  fputs_filtered ("EXP", stream);
++	fputs_filtered ("'", stream);
+ 
+-	if (range_type == HIGH_BOUND_DEFAULT
+-	    || range_type == NONE_BOUND_DEFAULT)
++	if (!(range_type & RANGE_LOW_BOUND_DEFAULT))
+ 	  elt = dump_subexp (exp, stream, elt);
+-	if (range_type == LOW_BOUND_DEFAULT
+-	    || range_type == NONE_BOUND_DEFAULT)
++	if (!(range_type & RANGE_HIGH_BOUND_DEFAULT))
+ 	  elt = dump_subexp (exp, stream, elt);
+       }
+       break;
+diff --git a/gdb/expression.h b/gdb/expression.h
+--- a/gdb/expression.h
++++ b/gdb/expression.h
+@@ -185,22 +185,22 @@ extern void dump_prefix_expression (struct expression *, struct ui_file *);
+    or inclusive.  So we have six sorts of subrange.  This enumeration
+    type is to identify this.  */
+ 
+-enum range_type
++enum range_type : unsigned
+ {
+-  /* Neither the low nor the high bound was given -- so this refers to
+-     the entire available range.  */
+-  BOTH_BOUND_DEFAULT,
+-  /* The low bound was not given and the high bound is inclusive.  */
+-  LOW_BOUND_DEFAULT,
+-  /* The high bound was not given and the low bound in inclusive.  */
+-  HIGH_BOUND_DEFAULT,
+-  /* Both bounds were given and both are inclusive.  */
+-  NONE_BOUND_DEFAULT,
+-  /* The low bound was not given and the high bound is exclusive.  */
+-  NONE_BOUND_DEFAULT_EXCLUSIVE,
+-  /* Both bounds were given.  The low bound is inclusive and the high
+-     bound is exclusive.  */
+-  LOW_BOUND_DEFAULT_EXCLUSIVE,
++  /* This is a standard range.  Both the lower and upper bounds are
++     defined, and the bounds are inclusive.  */
++  RANGE_STANDARD = 0,
++
++  /* The low bound was not given.  */
++  RANGE_LOW_BOUND_DEFAULT = 1 << 0,
++
++  /* The high bound was not given.  */
++  RANGE_HIGH_BOUND_DEFAULT = 1 << 1,
++
++  /* The high bound of this range is exclusive.  */
++  RANGE_HIGH_BOUND_EXCLUSIVE = 1 << 2,
+ };
+ 
++DEF_ENUM_FLAGS_TYPE (enum range_type, range_types);
++
+ #endif /* !defined (EXPRESSION_H) */
+diff --git a/gdb/f-exp.y b/gdb/f-exp.y
+--- a/gdb/f-exp.y
++++ b/gdb/f-exp.y
+@@ -287,26 +287,30 @@ arglist	:	arglist ',' exp   %prec ABOVE_COMMA
+ /* There are four sorts of subrange types in F90.  */
+ 
+ subrange:	exp ':' exp	%prec ABOVE_COMMA
+-			{ write_exp_elt_opcode (pstate, OP_RANGE); 
+-			  write_exp_elt_longcst (pstate, NONE_BOUND_DEFAULT);
++			{ write_exp_elt_opcode (pstate, OP_RANGE);
++			  write_exp_elt_longcst (pstate, RANGE_STANDARD);
+ 			  write_exp_elt_opcode (pstate, OP_RANGE); }
+ 	;
+ 
+ subrange:	exp ':'	%prec ABOVE_COMMA
+ 			{ write_exp_elt_opcode (pstate, OP_RANGE);
+-			  write_exp_elt_longcst (pstate, HIGH_BOUND_DEFAULT);
++			  write_exp_elt_longcst (pstate,
++						 RANGE_HIGH_BOUND_DEFAULT);
+ 			  write_exp_elt_opcode (pstate, OP_RANGE); }
+ 	;
+ 
+ subrange:	':' exp	%prec ABOVE_COMMA
+ 			{ write_exp_elt_opcode (pstate, OP_RANGE);
+-			  write_exp_elt_longcst (pstate, LOW_BOUND_DEFAULT);
++			  write_exp_elt_longcst (pstate,
++						 RANGE_LOW_BOUND_DEFAULT);
+ 			  write_exp_elt_opcode (pstate, OP_RANGE); }
+ 	;
+ 
+ subrange:	':'	%prec ABOVE_COMMA
+ 			{ write_exp_elt_opcode (pstate, OP_RANGE);
+-			  write_exp_elt_longcst (pstate, BOTH_BOUND_DEFAULT);
++			  write_exp_elt_longcst (pstate,
++						 (RANGE_LOW_BOUND_DEFAULT
++						  | RANGE_HIGH_BOUND_DEFAULT));
+ 			  write_exp_elt_opcode (pstate, OP_RANGE); }
+ 	;
+ 
+diff --git a/gdb/f-lang.c b/gdb/f-lang.c
+--- a/gdb/f-lang.c
++++ b/gdb/f-lang.c
+@@ -131,12 +131,12 @@ value_f90_subarray (struct value *array,
+ 
+   *pos += 3;
+ 
+-  if (range_type == LOW_BOUND_DEFAULT || range_type == BOTH_BOUND_DEFAULT)
++  if (range_type & RANGE_LOW_BOUND_DEFAULT)
+     low_bound = range->bounds ()->low.const_val ();
+   else
+     low_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
+ 
+-  if (range_type == HIGH_BOUND_DEFAULT || range_type == BOTH_BOUND_DEFAULT)
++  if (range_type & RANGE_HIGH_BOUND_DEFAULT)
+     high_bound = range->bounds ()->high.const_val ();
+   else
+     high_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
+diff --git a/gdb/parse.c b/gdb/parse.c
+--- a/gdb/parse.c
++++ b/gdb/parse.c
+@@ -921,21 +921,13 @@ operator_length_standard (const struct expression *expr, int endpos,
+       range_type = (enum range_type)
+ 	longest_to_int (expr->elts[endpos - 2].longconst);
+ 
+-      switch (range_type)
+-	{
+-	case LOW_BOUND_DEFAULT:
+-	case LOW_BOUND_DEFAULT_EXCLUSIVE:
+-	case HIGH_BOUND_DEFAULT:
+-	  args = 1;
+-	  break;
+-	case BOTH_BOUND_DEFAULT:
+-	  args = 0;
+-	  break;
+-	case NONE_BOUND_DEFAULT:
+-	case NONE_BOUND_DEFAULT_EXCLUSIVE:
+-	  args = 2;
+-	  break;
+-	}
++      /* Assume the range has 2 arguments (low bound and high bound), then
++	 reduce the argument count if any bounds are set to default.  */
++      args = 2;
++      if (range_type & RANGE_LOW_BOUND_DEFAULT)
++	--args;
++      if (range_type & RANGE_HIGH_BOUND_DEFAULT)
++	--args;
+ 
+       break;
+ 
+diff --git a/gdb/rust-exp.y b/gdb/rust-exp.y
+--- a/gdb/rust-exp.y
++++ b/gdb/rust-exp.y
+@@ -2492,24 +2492,29 @@ rust_parser::convert_ast_to_expression (const struct rust_op *operation,
+ 
+     case OP_RANGE:
+       {
+-	enum range_type kind = BOTH_BOUND_DEFAULT;
++	enum range_type kind = (RANGE_HIGH_BOUND_DEFAULT
++				| RANGE_LOW_BOUND_DEFAULT);
+ 
+ 	if (operation->left.op != NULL)
+ 	  {
+ 	    convert_ast_to_expression (operation->left.op, top);
+-	    kind = HIGH_BOUND_DEFAULT;
++	    kind &= ~RANGE_LOW_BOUND_DEFAULT;
+ 	  }
+ 	if (operation->right.op != NULL)
+ 	  {
+ 	    convert_ast_to_expression (operation->right.op, top);
+-	    if (kind == BOTH_BOUND_DEFAULT)
+-	      kind = (operation->inclusive
+-		      ? LOW_BOUND_DEFAULT : LOW_BOUND_DEFAULT_EXCLUSIVE);
++	    if (kind == (RANGE_HIGH_BOUND_DEFAULT | RANGE_LOW_BOUND_DEFAULT))
++	      {
++		kind = RANGE_LOW_BOUND_DEFAULT;
++		if (!operation->inclusive)
++		  kind |= RANGE_HIGH_BOUND_EXCLUSIVE;
++	      }
+ 	    else
+ 	      {
+-		gdb_assert (kind == HIGH_BOUND_DEFAULT);
+-		kind = (operation->inclusive
+-			? NONE_BOUND_DEFAULT : NONE_BOUND_DEFAULT_EXCLUSIVE);
++		gdb_assert (kind == RANGE_HIGH_BOUND_DEFAULT);
++		kind = RANGE_STANDARD;
++		if (!operation->inclusive)
++		  kind |= RANGE_HIGH_BOUND_EXCLUSIVE;
+ 	      }
+ 	  }
+ 	else
+diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
+--- a/gdb/rust-lang.c
++++ b/gdb/rust-lang.c
+@@ -1082,13 +1082,11 @@ rust_range (struct expression *exp, int *pos, enum noside noside)
+   kind = (enum range_type) longest_to_int (exp->elts[*pos + 1].longconst);
+   *pos += 3;
+ 
+-  if (kind == HIGH_BOUND_DEFAULT || kind == NONE_BOUND_DEFAULT
+-      || kind == NONE_BOUND_DEFAULT_EXCLUSIVE)
++  if (!(kind & RANGE_LOW_BOUND_DEFAULT))
+     low = evaluate_subexp (nullptr, exp, pos, noside);
+-  if (kind == LOW_BOUND_DEFAULT || kind == LOW_BOUND_DEFAULT_EXCLUSIVE
+-      || kind == NONE_BOUND_DEFAULT || kind == NONE_BOUND_DEFAULT_EXCLUSIVE)
++  if (!(kind & RANGE_HIGH_BOUND_DEFAULT))
+     high = evaluate_subexp (nullptr, exp, pos, noside);
+-  bool inclusive = (kind == NONE_BOUND_DEFAULT || kind == LOW_BOUND_DEFAULT);
++  bool inclusive = !(kind & RANGE_HIGH_BOUND_EXCLUSIVE);
+ 
+   if (noside == EVAL_SKIP)
+     return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, 1);
+@@ -1171,13 +1169,13 @@ rust_range (struct expression *exp, int *pos, enum noside noside)
+ static void
+ rust_compute_range (struct type *type, struct value *range,
+ 		    LONGEST *low, LONGEST *high,
+-		    enum range_type *kind)
++		    range_types *kind)
+ {
+   int i;
+ 
+   *low = 0;
+   *high = 0;
+-  *kind = BOTH_BOUND_DEFAULT;
++  *kind = RANGE_LOW_BOUND_DEFAULT | RANGE_HIGH_BOUND_DEFAULT;
+ 
+   if (type->num_fields () == 0)
+     return;
+@@ -1185,15 +1183,15 @@ rust_compute_range (struct type *type, struct value *range,
+   i = 0;
+   if (strcmp (TYPE_FIELD_NAME (type, 0), "start") == 0)
+     {
+-      *kind = HIGH_BOUND_DEFAULT;
++      *kind = RANGE_HIGH_BOUND_DEFAULT;
+       *low = value_as_long (value_field (range, 0));
+       ++i;
+     }
+   if (type->num_fields () > i
+       && strcmp (TYPE_FIELD_NAME (type, i), "end") == 0)
+     {
+-      *kind = (*kind == BOTH_BOUND_DEFAULT
+-	       ? LOW_BOUND_DEFAULT : NONE_BOUND_DEFAULT);
++      *kind = (*kind == (RANGE_LOW_BOUND_DEFAULT | RANGE_HIGH_BOUND_DEFAULT)
++	       ? RANGE_LOW_BOUND_DEFAULT : RANGE_STANDARD);
+       *high = value_as_long (value_field (range, i));
+ 
+       if (rust_inclusive_range_type_p (type))
+@@ -1211,7 +1209,7 @@ rust_subscript (struct expression *exp, int *pos, enum noside noside,
+   struct type *rhstype;
+   LONGEST low, high_bound;
+   /* Initialized to appease the compiler.  */
+-  enum range_type kind = BOTH_BOUND_DEFAULT;
++  range_types kind = RANGE_LOW_BOUND_DEFAULT | RANGE_HIGH_BOUND_DEFAULT;
+   LONGEST high = 0;
+   int want_slice = 0;
+ 
+@@ -1308,8 +1306,7 @@ rust_subscript (struct expression *exp, int *pos, enum noside noside,
+       else
+ 	error (_("Cannot subscript non-array type"));
+ 
+-      if (want_slice
+-	  && (kind == BOTH_BOUND_DEFAULT || kind == LOW_BOUND_DEFAULT))
++      if (want_slice && (kind & RANGE_LOW_BOUND_DEFAULT))
+ 	low = low_bound;
+       if (low < 0)
+ 	error (_("Index less than zero"));
+@@ -1327,7 +1324,7 @@ rust_subscript (struct expression *exp, int *pos, enum noside noside,
+ 	  CORE_ADDR addr;
+ 	  struct value *addrval, *tem;
+ 
+-	  if (kind == BOTH_BOUND_DEFAULT || kind == HIGH_BOUND_DEFAULT)
++	  if (kind & RANGE_HIGH_BOUND_DEFAULT)
+ 	    high = high_bound;
+ 	  if (high < 0)
+ 	    error (_("High index less than zero"));

SOURCES/gdb-rhbz1964167-fortran-array-strides-in-expressions.patch

@@ -0,0 +1,193 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Mon, 24 May 2021 22:30:32 -0700
+Subject: gdb-rhbz1964167-fortran-array-strides-in-expressions.patch
+
+;; [fortran] Backport Andrew Burgess's commit which adds support
+;; for array strides in expressions.
+
+gdb/fortran: add support for parsing array strides in expressions
+
+With this commit GDB now understands the syntax of Fortran array
+strides, a user can type an expression including an array stride, but
+they will only get an error informing them that array strides are not
+supported.
+
+This alone is an improvement on what we had before in GDB, better to
+give the user a helpful message that a particular feature is not
+supported than to just claim a syntax error.
+
+Before:
+
+  (gdb) p array (1:10:2, 2:10:2)
+  A syntax error in expression, near `:2, 2:10:2)'.
+
+Now:
+
+  (gdb) p array (1:10:2, 2:10:2)
+  Fortran array strides are not currently supported
+
+Later commits will allow GDB to handle array strides correctly.
+
+gdb/ChangeLog:
+
+	* expprint.c (dump_subexp_body_standard): Print RANGE_HAS_STRIDE.
+	* expression.h (enum range_type): Add RANGE_HAS_STRIDE.
+	* f-exp.y (arglist): Allow for a series of subranges.
+	(subrange): Add cases for subranges with strides.
+	* f-lang.c (value_f90_subarray): Catch use of array strides and
+	throw an error.
+	* parse.c (operator_length_standard): Handle RANGE_HAS_STRIDE.
+
+gdb/testsuite/ChangeLog:
+
+	* gdb.fortran/array-slices.exp: Add a new test.
+
+diff --git a/gdb/expprint.c b/gdb/expprint.c
+--- a/gdb/expprint.c
++++ b/gdb/expprint.c
+@@ -1118,12 +1118,16 @@ dump_subexp_body_standard (struct expression *exp,
+ 	fputs_filtered ("..", stream);
+ 	if (!(range_flag & RANGE_HIGH_BOUND_DEFAULT))
+ 	  fputs_filtered ("EXP", stream);
++	if (range_flag & RANGE_HAS_STRIDE)
++	  fputs_filtered (":EXP", stream);
+ 	fputs_filtered ("'", stream);
+ 
+ 	if (!(range_flag & RANGE_LOW_BOUND_DEFAULT))
+ 	  elt = dump_subexp (exp, stream, elt);
+ 	if (!(range_flag & RANGE_HIGH_BOUND_DEFAULT))
+ 	  elt = dump_subexp (exp, stream, elt);
++	if (range_flag & RANGE_HAS_STRIDE)
++	  elt = dump_subexp (exp, stream, elt);
+       }
+       break;
+ 
+diff --git a/gdb/expression.h b/gdb/expression.h
+--- a/gdb/expression.h
++++ b/gdb/expression.h
+@@ -199,6 +199,9 @@ enum range_flag : unsigned
+ 
+   /* The high bound of this range is exclusive.  */
+   RANGE_HIGH_BOUND_EXCLUSIVE = 1 << 2,
++
++  /* The range has a stride.  */
++  RANGE_HAS_STRIDE = 1 << 3,
+ };
+ 
+ DEF_ENUM_FLAGS_TYPE (enum range_flag, range_flags);
+diff --git a/gdb/f-exp.y b/gdb/f-exp.y
+--- a/gdb/f-exp.y
++++ b/gdb/f-exp.y
+@@ -284,6 +284,10 @@ arglist	:	arglist ',' exp   %prec ABOVE_COMMA
+ 			{ pstate->arglist_len++; }
+ 	;
+ 
++arglist	:	arglist ',' subrange   %prec ABOVE_COMMA
++			{ pstate->arglist_len++; }
++	;
++
+ /* There are four sorts of subrange types in F90.  */
+ 
+ subrange:	exp ':' exp	%prec ABOVE_COMMA
+@@ -314,6 +318,38 @@ subrange:	':'	%prec ABOVE_COMMA
+ 			  write_exp_elt_opcode (pstate, OP_RANGE); }
+ 	;
+ 
++/* And each of the four subrange types can also have a stride.  */
++subrange:	exp ':' exp ':' exp	%prec ABOVE_COMMA
++			{ write_exp_elt_opcode (pstate, OP_RANGE);
++			  write_exp_elt_longcst (pstate, RANGE_HAS_STRIDE);
++			  write_exp_elt_opcode (pstate, OP_RANGE); }
++	;
++
++subrange:	exp ':' ':' exp	%prec ABOVE_COMMA
++			{ write_exp_elt_opcode (pstate, OP_RANGE);
++			  write_exp_elt_longcst (pstate,
++						 (RANGE_HIGH_BOUND_DEFAULT
++						  | RANGE_HAS_STRIDE));
++			  write_exp_elt_opcode (pstate, OP_RANGE); }
++	;
++
++subrange:	':' exp ':' exp	%prec ABOVE_COMMA
++			{ write_exp_elt_opcode (pstate, OP_RANGE);
++			  write_exp_elt_longcst (pstate,
++						 (RANGE_LOW_BOUND_DEFAULT
++						  | RANGE_HAS_STRIDE));
++			  write_exp_elt_opcode (pstate, OP_RANGE); }
++	;
++
++subrange:	':' ':' exp	%prec ABOVE_COMMA
++			{ write_exp_elt_opcode (pstate, OP_RANGE);
++			  write_exp_elt_longcst (pstate,
++						 (RANGE_LOW_BOUND_DEFAULT
++						  | RANGE_HIGH_BOUND_DEFAULT
++						  | RANGE_HAS_STRIDE));
++			  write_exp_elt_opcode (pstate, OP_RANGE); }
++	;
++
+ complexnum:     exp ',' exp 
+                 	{ }                          
+         ;
+diff --git a/gdb/f-lang.c b/gdb/f-lang.c
+--- a/gdb/f-lang.c
++++ b/gdb/f-lang.c
+@@ -124,7 +124,7 @@ value_f90_subarray (struct value *array,
+ 		    struct expression *exp, int *pos, enum noside noside)
+ {
+   int pc = (*pos) + 1;
+-  LONGEST low_bound, high_bound;
++  LONGEST low_bound, high_bound, stride;
+   struct type *range = check_typedef (value_type (array)->index_type ());
+   enum range_flag range_flag
+     = (enum range_flag) longest_to_int (exp->elts[pc].longconst);
+@@ -141,6 +141,14 @@ value_f90_subarray (struct value *array,
+   else
+     high_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
+ 
++  if (range_flag & RANGE_HAS_STRIDE)
++    stride = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
++  else
++    stride = 1;
++
++  if (stride != 1)
++    error (_("Fortran array strides are not currently supported"));
++
+   return value_slice (array, low_bound, high_bound - low_bound + 1);
+ }
+ 
+diff --git a/gdb/parse.c b/gdb/parse.c
+--- a/gdb/parse.c
++++ b/gdb/parse.c
+@@ -924,6 +924,8 @@ operator_length_standard (const struct expression *expr, int endpos,
+       /* Assume the range has 2 arguments (low bound and high bound), then
+ 	 reduce the argument count if any bounds are set to default.  */
+       args = 2;
++      if (range_flag & RANGE_HAS_STRIDE)
++	++args;
+       if (range_flag & RANGE_LOW_BOUND_DEFAULT)
+ 	--args;
+       if (range_flag & RANGE_HIGH_BOUND_DEFAULT)
+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
+@@ -66,3 +66,19 @@ foreach result $array_contents msg $message_strings {
+ }
+ 
+ gdb_continue_to_breakpoint "continue to Final Breakpoint"
++
++# Next test that asking for an array with stride at the CLI gives an
++# error.
++clean_restart ${testfile}
++
++if ![fortran_runto_main] then {
++    perror "couldn't run to main"
++    continue
++}
++
++gdb_breakpoint "show"
++gdb_continue_to_breakpoint "show"
++gdb_test "up" ".*"
++gdb_test "p array (1:10:2, 1:10:2)" \
++    "Fortran array strides are not currently supported" \
++    "using array stride gives an error"

SOURCES/gdb-rhbz1964167-fortran-clean-up-array-expression-evaluation.patch

@@ -0,0 +1,209 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Mon, 24 May 2021 16:53:22 -0700
+Subject: gdb-rhbz1964167-fortran-clean-up-array-expression-evaluation.patch
+
+;; [fortran] Backport Andrew Burgess's commit which cleans up
+;; array/string expression evaluation.
+
+gdb/fortran: Clean up array/string expression evaluation
+
+This commit is a refactor of part of the Fortran array and string
+handling code.
+
+The current code is split into two blocks, linked, weirdly, with a
+goto.  After this commit all the code is moved to its own function,
+and arrays and strings are now handled using the same code; this will
+be useful later when I want to add array stride support where strings
+will want to be treated just like arrays, but is a good clean up even
+without the array stride work, which is why I'm merging it now.
+
+For now the new function is added as a static within eval.c, even
+though the function is Fortran only.  A following commit will remove
+some of the Fortran specific code from eval.c into one of the Fortran
+specific files, including this new function.
+
+There should be no user visible changes after this commit.
+
+gdb/ChangeLog:
+
+	* eval.c (fortran_value_subarray): New function, content is taken
+	from...
+	(evaluate_subexp_standard): ...here, in two places.  Now arrays
+	and strings both call the new function.
+	(calc_f77_array_dims): Add header comment, handle strings.
+
+diff --git a/gdb/eval.c b/gdb/eval.c
+--- a/gdb/eval.c
++++ b/gdb/eval.c
+@@ -1260,6 +1260,67 @@ is_integral_or_integral_reference (struct type *type)
+ 	  && is_integral_type (TYPE_TARGET_TYPE (type)));
+ }
+ 
++/* Called from evaluate_subexp_standard to perform array indexing, and
++   sub-range extraction, for Fortran.  As well as arrays this function
++   also handles strings as they can be treated like arrays of characters.
++   ARRAY is the array or string being accessed.  EXP, POS, and NOSIDE are
++   as for evaluate_subexp_standard, and NARGS is the number of arguments
++   in this access (e.g. 'array (1,2,3)' would be NARGS 3).  */
++
++static struct value *
++fortran_value_subarray (struct value *array, struct expression *exp,
++			int *pos, int nargs, enum noside noside)
++{
++  if (exp->elts[*pos].opcode == OP_RANGE)
++    return value_f90_subarray (array, exp, pos, noside);
++
++  if (noside == EVAL_SKIP)
++    {
++      skip_undetermined_arglist (nargs, exp, pos, noside);
++      /* Return the dummy value with the correct type.  */
++      return array;
++    }
++
++  LONGEST subscript_array[MAX_FORTRAN_DIMS];
++  int ndimensions = 1;
++  struct type *type = check_typedef (value_type (array));
++
++  if (nargs > MAX_FORTRAN_DIMS)
++    error (_("Too many subscripts for F77 (%d Max)"), MAX_FORTRAN_DIMS);
++
++  ndimensions = calc_f77_array_dims (type);
++
++  if (nargs != ndimensions)
++    error (_("Wrong number of subscripts"));
++
++  gdb_assert (nargs > 0);
++
++  /* Now that we know we have a legal array subscript expression let us
++     actually find out where this element exists in the array.  */
++
++  /* Take array indices left to right.  */
++  for (int i = 0; i < nargs; i++)
++    {
++      /* Evaluate each subscript; it must be a legal integer in F77.  */
++      value *arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
++
++      /* Fill in the subscript array.  */
++      subscript_array[i] = value_as_long (arg2);
++    }
++
++  /* Internal type of array is arranged right to left.  */
++  for (int i = nargs; i > 0; i--)
++    {
++      struct type *array_type = check_typedef (value_type (array));
++      LONGEST index = subscript_array[i - 1];
++
++      array = value_subscripted_rvalue (array, index,
++					f77_get_lowerbound (array_type));
++    }
++
++  return array;
++}
++
+ struct value *
+ evaluate_subexp_standard (struct type *expect_type,
+ 			  struct expression *exp, int *pos,
+@@ -1953,33 +2014,8 @@ evaluate_subexp_standard (struct type *expect_type,
+       switch (code)
+ 	{
+ 	case TYPE_CODE_ARRAY:
+-	  if (exp->elts[*pos].opcode == OP_RANGE)
+-	    return value_f90_subarray (arg1, exp, pos, noside);
+-	  else
+-	    {
+-	      if (noside == EVAL_SKIP)
+-		{
+-		  skip_undetermined_arglist (nargs, exp, pos, noside);
+-		  /* Return the dummy value with the correct type.  */
+-		  return arg1;
+-		}
+-	      goto multi_f77_subscript;
+-	    }
+-
+ 	case TYPE_CODE_STRING:
+-	  if (exp->elts[*pos].opcode == OP_RANGE)
+-	    return value_f90_subarray (arg1, exp, pos, noside);
+-	  else
+-	    {
+-	      if (noside == EVAL_SKIP)
+-		{
+-		  skip_undetermined_arglist (nargs, exp, pos, noside);
+-		  /* Return the dummy value with the correct type.  */
+-		  return arg1;
+-		}
+-	      arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
+-	      return value_subscript (arg1, value_as_long (arg2));
+-	    }
++	  return fortran_value_subarray (arg1, exp, pos, nargs, noside);
+ 
+ 	case TYPE_CODE_PTR:
+ 	case TYPE_CODE_FUNC:
+@@ -2400,49 +2436,6 @@ evaluate_subexp_standard (struct type *expect_type,
+ 	}
+       return (arg1);
+ 
+-    multi_f77_subscript:
+-      {
+-	LONGEST subscript_array[MAX_FORTRAN_DIMS];
+-	int ndimensions = 1, i;
+-	struct value *array = arg1;
+-
+-	if (nargs > MAX_FORTRAN_DIMS)
+-	  error (_("Too many subscripts for F77 (%d Max)"), MAX_FORTRAN_DIMS);
+-
+-	ndimensions = calc_f77_array_dims (type);
+-
+-	if (nargs != ndimensions)
+-	  error (_("Wrong number of subscripts"));
+-
+-	gdb_assert (nargs > 0);
+-
+-	/* Now that we know we have a legal array subscript expression 
+-	   let us actually find out where this element exists in the array.  */
+-
+-	/* Take array indices left to right.  */
+-	for (i = 0; i < nargs; i++)
+-	  {
+-	    /* Evaluate each subscript; it must be a legal integer in F77.  */
+-	    arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
+-
+-	    /* Fill in the subscript array.  */
+-
+-	    subscript_array[i] = value_as_long (arg2);
+-	  }
+-
+-	/* Internal type of array is arranged right to left.  */
+-	for (i = nargs; i > 0; i--)
+-	  {
+-	    struct type *array_type = check_typedef (value_type (array));
+-	    LONGEST index = subscript_array[i - 1];
+-
+-	    array = value_subscripted_rvalue (array, index,
+-					      f77_get_lowerbound (array_type));
+-	  }
+-
+-	return array;
+-      }
+-
+     case BINOP_LOGICAL_AND:
+       arg1 = evaluate_subexp (nullptr, exp, pos, noside);
+       if (noside == EVAL_SKIP)
+@@ -3354,12 +3347,17 @@ parse_and_eval_type (char *p, int length)
+   return expr->elts[1].type;
+ }
+ 
++/* Return the number of dimensions for a Fortran array or string.  */
++
+ int
+ calc_f77_array_dims (struct type *array_type)
+ {
+   int ndimen = 1;
+   struct type *tmp_type;
+ 
++  if ((array_type->code () == TYPE_CODE_STRING))
++    return 1;
++
+   if ((array_type->code () != TYPE_CODE_ARRAY))
+     error (_("Can't get dimensions for a non-array type"));
+ 

SOURCES/gdb-rhbz1964167-fortran-fix-type-format-mismatch-in-f-lang.c.patch

@@ -0,0 +1,128 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Tue, 25 May 2021 17:34:57 -0700
+Subject: gdb-rhbz1964167-fortran-fix-type-format-mismatch-in-f-lang.c.patch
+
+;; [fortran] Backport Simon Marchi's commit which fixes a 32-bit build
+;; problem in gdb/f-lang.c.
+
+gdb: fix format string warnings in f-lang.c
+
+I get a bunch of these warnings when compiling for i386 (32-bit):
+
+      CXX    f-lang.o
+    /home/simark/src/binutils-gdb/gdb/f-lang.c: In function 'value* fortran_value_subarray(value*, expression*, int*, int, noside)':
+    /home/simark/src/binutils-gdb/gdb/f-lang.c:453:48: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'LONGEST' {aka 'long long int'} [-Werror=format=]
+      453 |        debug_printf ("|   |   |-> Low bound: %ld\n", lb);
+          |                                              ~~^     ~~
+          |                                                |     |
+          |                                                |     LONGEST {aka long long int}
+          |                                                long int
+          |                                              %lld
+
+Fix them by using plongest/pulongest.
+
+gdb/ChangeLog:
+
+	* f-lang.c (fortran_value_subarray): Use plongest/pulongest.
+
+Change-Id: I666ead5593653d5a1a3dab2ffdc72942c928c7d2
+
+diff --git a/gdb/f-lang.c b/gdb/f-lang.c
+--- a/gdb/f-lang.c
++++ b/gdb/f-lang.c
+@@ -463,21 +463,21 @@ fortran_value_subarray (struct value *array, struct expression *exp,
+ 	      std::string str = type_to_string (dim_type);
+ 	      debug_printf ("|   |-> Type: %s\n", str.c_str ());
+ 	      debug_printf ("|   |-> Array:\n");
+-	      debug_printf ("|   |   |-> Low bound: %ld\n", lb);
+-	      debug_printf ("|   |   |-> High bound: %ld\n", ub);
+-	      debug_printf ("|   |   |-> Bit stride: %ld\n", sd);
+-	      debug_printf ("|   |   |-> Byte stride: %ld\n", sd / 8);
+-	      debug_printf ("|   |   |-> Type size: %ld\n",
+-			    TYPE_LENGTH (dim_type));
+-	      debug_printf ("|   |   '-> Target type size: %ld\n",
+-			    TYPE_LENGTH (target_type));
++	      debug_printf ("|   |   |-> Low bound: %s\n", plongest (lb));
++	      debug_printf ("|   |   |-> High bound: %s\n", plongest (ub));
++	      debug_printf ("|   |   |-> Bit stride: %s\n", plongest (sd));
++	      debug_printf ("|   |   |-> Byte stride: %s\n", plongest (sd / 8));
++	      debug_printf ("|   |   |-> Type size: %s\n",
++			    pulongest (TYPE_LENGTH (dim_type)));
++	      debug_printf ("|   |   '-> Target type size: %s\n",
++			    pulongest (TYPE_LENGTH (target_type)));
+ 	      debug_printf ("|   |-> Accessing:\n");
+-	      debug_printf ("|   |   |-> Low bound: %ld\n",
+-			    low);
+-	      debug_printf ("|   |   |-> High bound: %ld\n",
+-			    high);
+-	      debug_printf ("|   |   '-> Element stride: %ld\n",
+-			    stride);
++	      debug_printf ("|   |   |-> Low bound: %s\n",
++			    plongest (low));
++	      debug_printf ("|   |   |-> High bound: %s\n",
++			    plongest (high));
++	      debug_printf ("|   |   '-> Element stride: %s\n",
++			    plongest (stride));
+ 	    }
+ 
+ 	  /* Check the user hasn't asked for something invalid.  */
+@@ -519,13 +519,17 @@ fortran_value_subarray (struct value *array, struct expression *exp,
+ 	  if (fortran_array_slicing_debug)
+ 	    {
+ 	      debug_printf ("|   '-> Results:\n");
+-	      debug_printf ("|       |-> Offset = %ld\n", offset);
+-	      debug_printf ("|       |-> Elements = %ld\n", e_count);
+-	      debug_printf ("|       |-> Low bound = %ld\n", new_low);
+-	      debug_printf ("|       |-> High bound = %ld\n", new_high);
+-	      debug_printf ("|       |-> Byte stride = %ld\n", new_stride);
+-	      debug_printf ("|       |-> Last element = %ld\n", last_elem);
+-	      debug_printf ("|       |-> Remainder = %ld\n", remainder);
++	      debug_printf ("|       |-> Offset = %s\n", plongest (offset));
++	      debug_printf ("|       |-> Elements = %s\n", plongest (e_count));
++	      debug_printf ("|       |-> Low bound = %s\n", plongest (new_low));
++	      debug_printf ("|       |-> High bound = %s\n",
++			    plongest (new_high));
++	      debug_printf ("|       |-> Byte stride = %s\n",
++			    plongest (new_stride));
++	      debug_printf ("|       |-> Last element = %s\n",
++			    plongest (last_elem));
++	      debug_printf ("|       |-> Remainder = %s\n",
++			    plongest (remainder));
+ 	      debug_printf ("|       '-> Contiguous = %s\n",
+ 			    (is_dim_contiguous ? "Yes" : "No"));
+ 	    }
+@@ -561,14 +565,16 @@ fortran_value_subarray (struct value *array, struct expression *exp,
+ 	      std::string str = type_to_string (dim_type);
+ 	      debug_printf ("|   |-> Type: %s\n", str.c_str ());
+ 	      debug_printf ("|   |-> Array:\n");
+-	      debug_printf ("|   |   |-> Low bound: %ld\n", lb);
+-	      debug_printf ("|   |   |-> High bound: %ld\n", ub);
+-	      debug_printf ("|   |   |-> Byte stride: %ld\n", sd);
+-	      debug_printf ("|   |   |-> Type size: %ld\n", TYPE_LENGTH (dim_type));
+-	      debug_printf ("|   |   '-> Target type size: %ld\n",
+-			    TYPE_LENGTH (target_type));
++	      debug_printf ("|   |   |-> Low bound: %s\n", plongest (lb));
++	      debug_printf ("|   |   |-> High bound: %s\n", plongest (ub));
++	      debug_printf ("|   |   |-> Byte stride: %s\n", plongest (sd));
++	      debug_printf ("|   |   |-> Type size: %s\n",
++			    pulongest (TYPE_LENGTH (dim_type)));
++	      debug_printf ("|   |   '-> Target type size: %s\n",
++			    pulongest (TYPE_LENGTH (target_type)));
+ 	      debug_printf ("|   '-> Accessing:\n");
+-	      debug_printf ("|       '-> Index: %ld\n", index);
++	      debug_printf ("|       '-> Index: %s\n",
++			    plongest (index));
+ 	    }
+ 
+ 	  /* If the array has actual content then check the index is in
+@@ -625,7 +631,8 @@ fortran_value_subarray (struct value *array, struct expression *exp,
+       debug_printf ("'-> Final result:\n");
+       debug_printf ("    |-> Type: %s\n",
+ 		    type_to_string (array_slice_type).c_str ());
+-      debug_printf ("    |-> Total offset: %ld\n", total_offset);
++      debug_printf ("    |-> Total offset: %s\n",
++		    plongest (total_offset));
+       debug_printf ("    |-> Base address: %s\n",
+ 		    core_addr_to_string (value_address (array)));
+       debug_printf ("    '-> Contiguous = %s\n",

SOURCES/gdb-rhbz1964167-fortran-range_type-to-range_flag.patch

@@ -0,0 +1,224 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Mon, 24 May 2021 17:15:27 -0700
+Subject: gdb-rhbz1964167-fortran-range_type-to-range_flag.patch
+
+;; [fortran] Backport Andrew Burgess's commit which renames enum
+;; range_type to enum range_flag.
+
+gdb: rename 'enum range_type' to 'enum range_flag'
+
+To avoid confusion with other parts of GDB relating to types and
+ranges, rename this enum to make it clearer that it is a set of
+individual flags rather than an enumeration of different types of
+range.
+
+There should be no user visible changes after this commit.
+
+gdb/ChangeLog:
+
+	* expprint.c (print_subexp_standard): Change enum range_type to
+	range_flag and rename variables to match.
+	(dump_subexp_body_standard): Likewise.
+	* expression.h (enum range_type): Rename to...
+	(enum range_flag): ...this.
+	(range_types): Rename to...
+	(range_flags): ...this.
+	* f-lang.c (value_f90_subarray): Change enum range_type to
+	range_flag and rename variables to match.
+	* parse.c (operator_length_standard): Likewise.
+	* rust-exp.y (rust_parser::convert_ast_to_expression): Change enum
+	range_type to range_flag.
+	* rust-lang.c (rust_evaluate_funcall): Likewise.
+	(rust_range): Likewise.
+	(rust_compute_range): Likewise.
+	(rust_subscript): Likewise.
+
+diff --git a/gdb/expprint.c b/gdb/expprint.c
+--- a/gdb/expprint.c
++++ b/gdb/expprint.c
+@@ -578,19 +578,19 @@ print_subexp_standard (struct expression *exp, int *pos,
+ 
+     case OP_RANGE:
+       {
+-	enum range_type range_type;
++	enum range_flag range_flag;
+ 
+-	range_type = (enum range_type)
++	range_flag = (enum range_flag)
+ 	  longest_to_int (exp->elts[pc + 1].longconst);
+ 	*pos += 2;
+ 
+-	if (range_type & RANGE_HIGH_BOUND_EXCLUSIVE)
++	if (range_flag & RANGE_HIGH_BOUND_EXCLUSIVE)
+ 	  fputs_filtered ("EXCLUSIVE_", stream);
+ 	fputs_filtered ("RANGE(", stream);
+-	if (!(range_type & RANGE_LOW_BOUND_DEFAULT))
++	if (!(range_flag & RANGE_LOW_BOUND_DEFAULT))
+ 	  print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
+ 	fputs_filtered ("..", stream);
+-	if (!(range_type & RANGE_HIGH_BOUND_DEFAULT))
++	if (!(range_flag & RANGE_HIGH_BOUND_DEFAULT))
+ 	  print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
+ 	fputs_filtered (")", stream);
+ 	return;
+@@ -1104,25 +1104,25 @@ dump_subexp_body_standard (struct expression *exp,
+       break;
+     case OP_RANGE:
+       {
+-	enum range_type range_type;
++	enum range_flag range_flag;
+ 
+-	range_type = (enum range_type)
++	range_flag = (enum range_flag)
+ 	  longest_to_int (exp->elts[elt].longconst);
+ 	elt += 2;
+ 
+-	if (range_type & RANGE_HIGH_BOUND_EXCLUSIVE)
++	if (range_flag & RANGE_HIGH_BOUND_EXCLUSIVE)
+ 	  fputs_filtered ("Exclusive", stream);
+ 	fputs_filtered ("Range '", stream);
+-	if (!(range_type & RANGE_LOW_BOUND_DEFAULT))
++	if (!(range_flag & RANGE_LOW_BOUND_DEFAULT))
+ 	  fputs_filtered ("EXP", stream);
+ 	fputs_filtered ("..", stream);
+-	if (!(range_type & RANGE_HIGH_BOUND_DEFAULT))
++	if (!(range_flag & RANGE_HIGH_BOUND_DEFAULT))
+ 	  fputs_filtered ("EXP", stream);
+ 	fputs_filtered ("'", stream);
+ 
+-	if (!(range_type & RANGE_LOW_BOUND_DEFAULT))
++	if (!(range_flag & RANGE_LOW_BOUND_DEFAULT))
+ 	  elt = dump_subexp (exp, stream, elt);
+-	if (!(range_type & RANGE_HIGH_BOUND_DEFAULT))
++	if (!(range_flag & RANGE_HIGH_BOUND_DEFAULT))
+ 	  elt = dump_subexp (exp, stream, elt);
+       }
+       break;
+diff --git a/gdb/expression.h b/gdb/expression.h
+--- a/gdb/expression.h
++++ b/gdb/expression.h
+@@ -185,7 +185,7 @@ extern void dump_prefix_expression (struct expression *, struct ui_file *);
+    or inclusive.  So we have six sorts of subrange.  This enumeration
+    type is to identify this.  */
+ 
+-enum range_type : unsigned
++enum range_flag : unsigned
+ {
+   /* This is a standard range.  Both the lower and upper bounds are
+      defined, and the bounds are inclusive.  */
+@@ -201,6 +201,6 @@ enum range_type : unsigned
+   RANGE_HIGH_BOUND_EXCLUSIVE = 1 << 2,
+ };
+ 
+-DEF_ENUM_FLAGS_TYPE (enum range_type, range_types);
++DEF_ENUM_FLAGS_TYPE (enum range_flag, range_flags);
+ 
+ #endif /* !defined (EXPRESSION_H) */
+diff --git a/gdb/f-lang.c b/gdb/f-lang.c
+--- a/gdb/f-lang.c
++++ b/gdb/f-lang.c
+@@ -126,17 +126,17 @@ value_f90_subarray (struct value *array,
+   int pc = (*pos) + 1;
+   LONGEST low_bound, high_bound;
+   struct type *range = check_typedef (value_type (array)->index_type ());
+-  enum range_type range_type
+-    = (enum range_type) longest_to_int (exp->elts[pc].longconst);
++  enum range_flag range_flag
++    = (enum range_flag) longest_to_int (exp->elts[pc].longconst);
+ 
+   *pos += 3;
+ 
+-  if (range_type & RANGE_LOW_BOUND_DEFAULT)
++  if (range_flag & RANGE_LOW_BOUND_DEFAULT)
+     low_bound = range->bounds ()->low.const_val ();
+   else
+     low_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
+ 
+-  if (range_type & RANGE_HIGH_BOUND_DEFAULT)
++  if (range_flag & RANGE_HIGH_BOUND_DEFAULT)
+     high_bound = range->bounds ()->high.const_val ();
+   else
+     high_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
+diff --git a/gdb/parse.c b/gdb/parse.c
+--- a/gdb/parse.c
++++ b/gdb/parse.c
+@@ -774,7 +774,7 @@ operator_length_standard (const struct expression *expr, int endpos,
+ {
+   int oplen = 1;
+   int args = 0;
+-  enum range_type range_type;
++  enum range_flag range_flag;
+   int i;
+ 
+   if (endpos < 1)
+@@ -918,15 +918,15 @@ operator_length_standard (const struct expression *expr, int endpos,
+ 
+     case OP_RANGE:
+       oplen = 3;
+-      range_type = (enum range_type)
++      range_flag = (enum range_flag)
+ 	longest_to_int (expr->elts[endpos - 2].longconst);
+ 
+       /* Assume the range has 2 arguments (low bound and high bound), then
+ 	 reduce the argument count if any bounds are set to default.  */
+       args = 2;
+-      if (range_type & RANGE_LOW_BOUND_DEFAULT)
++      if (range_flag & RANGE_LOW_BOUND_DEFAULT)
+ 	--args;
+-      if (range_type & RANGE_HIGH_BOUND_DEFAULT)
++      if (range_flag & RANGE_HIGH_BOUND_DEFAULT)
+ 	--args;
+ 
+       break;
+diff --git a/gdb/rust-exp.y b/gdb/rust-exp.y
+--- a/gdb/rust-exp.y
++++ b/gdb/rust-exp.y
+@@ -2492,7 +2492,7 @@ rust_parser::convert_ast_to_expression (const struct rust_op *operation,
+ 
+     case OP_RANGE:
+       {
+-	enum range_type kind = (RANGE_HIGH_BOUND_DEFAULT
++	unsigned int kind = (RANGE_HIGH_BOUND_DEFAULT
+ 				| RANGE_LOW_BOUND_DEFAULT);
+ 
+ 	if (operation->left.op != NULL)
+diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
+--- a/gdb/rust-lang.c
++++ b/gdb/rust-lang.c
+@@ -1070,7 +1070,6 @@ rust_evaluate_funcall (struct expression *exp, int *pos, enum noside noside)
+ static struct value *
+ rust_range (struct expression *exp, int *pos, enum noside noside)
+ {
+-  enum range_type kind;
+   struct value *low = NULL, *high = NULL;
+   struct value *addrval, *result;
+   CORE_ADDR addr;
+@@ -1079,7 +1078,8 @@ rust_range (struct expression *exp, int *pos, enum noside noside)
+   struct type *temp_type;
+   const char *name;
+ 
+-  kind = (enum range_type) longest_to_int (exp->elts[*pos + 1].longconst);
++  auto kind
++    = (enum range_flag) longest_to_int (exp->elts[*pos + 1].longconst);
+   *pos += 3;
+ 
+   if (!(kind & RANGE_LOW_BOUND_DEFAULT))
+@@ -1169,7 +1169,7 @@ rust_range (struct expression *exp, int *pos, enum noside noside)
+ static void
+ rust_compute_range (struct type *type, struct value *range,
+ 		    LONGEST *low, LONGEST *high,
+-		    range_types *kind)
++		    range_flags *kind)
+ {
+   int i;
+ 
+@@ -1209,7 +1209,7 @@ rust_subscript (struct expression *exp, int *pos, enum noside noside,
+   struct type *rhstype;
+   LONGEST low, high_bound;
+   /* Initialized to appease the compiler.  */
+-  range_types kind = RANGE_LOW_BOUND_DEFAULT | RANGE_HIGH_BOUND_DEFAULT;
++  range_flags kind = RANGE_LOW_BOUND_DEFAULT | RANGE_HIGH_BOUND_DEFAULT;
+   LONGEST high = 0;
+   int want_slice = 0;
+ 

SOURCES/gdb-rhbz1964167-fortran-whitespace_array.patch

@@ -0,0 +1,137 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Mon, 24 May 2021 17:07:36 -0700
+Subject: gdb-rhbz1964167-fortran-whitespace_array.patch
+
+;; [fortran] Backport Andrew Burgess's commit which eliminates undesirable
+;; whitespace when printing arrays.
+
+gdb/fortran: Change whitespace when printing arrays
+
+This commit makes the whitespace usage when printing Fortran arrays
+more consistent, and more inline with how we print C arrays.
+
+Currently a 2 dimensional Fotran array is printed like this, I find
+the marked whitespace unpleasant:
+
+  (( 1, 2, 3) ( 4, 5, 6) )
+    ^          ^        ^
+
+After this commit the same array is printed like this:
+
+  ((1, 2, 3) (4, 5, 6))
+
+Which seems more inline with how we print C arrays, in the case of C
+arrays we don't add extra whitespace before the first element.
+
+gdb/ChangeLog:
+
+	* f-valprint.c (f77_print_array_1): Adjust printing of whitespace
+	for arrays.
+
+gdb/testsuite/ChangeLog:
+
+	* gdb.fortran/array-slices.exp: Update expected results.
+	* gdb.fortran/class-allocatable-array.exp: Likewise.
+	* gdb.fortran/multi-dim.exp: Likewise.
+	* gdb.fortran/vla-type.exp: Likewise.
+	* gdb.mi/mi-vla-fortran.exp: Likewise.
+
+diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
+--- a/gdb/f-valprint.c
++++ b/gdb/f-valprint.c
+@@ -137,14 +137,17 @@ f77_print_array_1 (int nss, int ndimensions, struct type *type,
+ 	    (TYPE_TARGET_TYPE (type), value_contents_for_printing_const (val)
+ 	     + offs, addr + offs);
+ 
+-	  fprintf_filtered (stream, "( ");
++	  fprintf_filtered (stream, "(");
+ 	  f77_print_array_1 (nss + 1, ndimensions, value_type (subarray),
+ 			     value_contents_for_printing (subarray),
+ 			     value_embedded_offset (subarray),
+ 			     value_address (subarray),
+ 			     stream, recurse, subarray, options, elts);
+ 	  offs += byte_stride;
+-	  fprintf_filtered (stream, ") ");
++	  fprintf_filtered (stream, ")");
++
++	  if (i < upperbound)
++	    fprintf_filtered (stream, " ");
+ 	}
+       if (*elts >= options->print_max && i < upperbound)
+ 	fprintf_filtered (stream, "...");
+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
+@@ -38,14 +38,14 @@ gdb_breakpoint [gdb_get_line_number "Final Breakpoint"]
+ 
+ set array_contents \
+     [list \
+-	 " = \\(\\( 1, 2, 3, 4, 5, 6, 7, 8, 9, 10\\) \\( 11, 12, 13, 14, 15, 16, 17, 18, 19, 20\\) \\( 21, 22, 23, 24, 25, 26, 27, 28, 29, 30\\) \\( 31, 32, 33, 34, 35, 36, 37, 38, 39, 40\\) \\( 41, 42, 43, 44, 45, 46, 47, 48, 49, 50\\) \\( 51, 52, 53, 54, 55, 56, 57, 58, 59, 60\\) \\( 61, 62, 63, 64, 65, 66, 67, 68, 69, 70\\) \\( 71, 72, 73, 74, 75, 76, 77, 78, 79, 80\\) \\( 81, 82, 83, 84, 85, 86, 87, 88, 89, 90\\) \\( 91, 92, 93, 94, 95, 96, 97, 98, 99, 100\\) \\)" \
+-	 " = \\(\\( 1, 2, 3, 4, 5\\) \\( 11, 12, 13, 14, 15\\) \\( 21, 22, 23, 24, 25\\) \\( 31, 32, 33, 34, 35\\) \\( 41, 42, 43, 44, 45\\) \\)" \
+-	 " = \\(\\( 1, 3, 5, 7, 9\\) \\( 21, 23, 25, 27, 29\\) \\( 41, 43, 45, 47, 49\\) \\( 61, 63, 65, 67, 69\\) \\( 81, 83, 85, 87, 89\\) \\)" \
+-	 " = \\(\\( 1, 4, 7, 10\\) \\( 21, 24, 27, 30\\) \\( 41, 44, 47, 50\\) \\( 61, 64, 67, 70\\) \\( 81, 84, 87, 90\\) \\)" \
+-	 " = \\(\\( 1, 5, 9\\) \\( 31, 35, 39\\) \\( 61, 65, 69\\) \\( 91, 95, 99\\) \\)" \
+-	 " = \\(\\( -26, -25, -24, -23, -22, -21, -20, -19, -18, -17\\) \\( -19, -18, -17, -16, -15, -14, -13, -12, -11, -10\\) \\( -12, -11, -10, -9, -8, -7, -6, -5, -4, -3\\) \\( -5, -4, -3, -2, -1, 0, 1, 2, 3, 4\\) \\( 2, 3, 4, 5, 6, 7, 8, 9, 10, 11\\) \\( 9, 10, 11, 12, 13, 14, 15, 16, 17, 18\\) \\( 16, 17, 18, 19, 20, 21, 22, 23, 24, 25\\) \\( 23, 24, 25, 26, 27, 28, 29, 30, 31, 32\\) \\( 30, 31, 32, 33, 34, 35, 36, 37, 38, 39\\) \\( 37, 38, 39, 40, 41, 42, 43, 44, 45, 46\\) \\)" \
+-	 " = \\(\\( -26, -25, -24, -23, -22, -21\\) \\( -19, -18, -17, -16, -15, -14\\) \\( -12, -11, -10, -9, -8, -7\\) \\)" \
+-	 " = \\(\\( -26, -24, -22, -20, -18\\) \\( -5, -3, -1, 1, 3\\) \\( 16, 18, 20, 22, 24\\) \\( 37, 39, 41, 43, 45\\) \\)" ]
++	 " = \\(\\(1, 2, 3, 4, 5, 6, 7, 8, 9, 10\\) \\(11, 12, 13, 14, 15, 16, 17, 18, 19, 20\\) \\(21, 22, 23, 24, 25, 26, 27, 28, 29, 30\\) \\(31, 32, 33, 34, 35, 36, 37, 38, 39, 40\\) \\(41, 42, 43, 44, 45, 46, 47, 48, 49, 50\\) \\(51, 52, 53, 54, 55, 56, 57, 58, 59, 60\\) \\(61, 62, 63, 64, 65, 66, 67, 68, 69, 70\\) \\(71, 72, 73, 74, 75, 76, 77, 78, 79, 80\\) \\(81, 82, 83, 84, 85, 86, 87, 88, 89, 90\\) \\(91, 92, 93, 94, 95, 96, 97, 98, 99, 100\\)\\)" \
++	 " = \\(\\(1, 2, 3, 4, 5\\) \\(11, 12, 13, 14, 15\\) \\(21, 22, 23, 24, 25\\) \\(31, 32, 33, 34, 35\\) \\(41, 42, 43, 44, 45\\)\\)" \
++	 " = \\(\\(1, 3, 5, 7, 9\\) \\(21, 23, 25, 27, 29\\) \\(41, 43, 45, 47, 49\\) \\(61, 63, 65, 67, 69\\) \\(81, 83, 85, 87, 89\\)\\)" \
++	 " = \\(\\(1, 4, 7, 10\\) \\(21, 24, 27, 30\\) \\(41, 44, 47, 50\\) \\(61, 64, 67, 70\\) \\(81, 84, 87, 90\\)\\)" \
++	 " = \\(\\(1, 5, 9\\) \\(31, 35, 39\\) \\(61, 65, 69\\) \\(91, 95, 99\\)\\)" \
++	 " = \\(\\(-26, -25, -24, -23, -22, -21, -20, -19, -18, -17\\) \\(-19, -18, -17, -16, -15, -14, -13, -12, -11, -10\\) \\(-12, -11, -10, -9, -8, -7, -6, -5, -4, -3\\) \\(-5, -4, -3, -2, -1, 0, 1, 2, 3, 4\\) \\(2, 3, 4, 5, 6, 7, 8, 9, 10, 11\\) \\(9, 10, 11, 12, 13, 14, 15, 16, 17, 18\\) \\(16, 17, 18, 19, 20, 21, 22, 23, 24, 25\\) \\(23, 24, 25, 26, 27, 28, 29, 30, 31, 32\\) \\(30, 31, 32, 33, 34, 35, 36, 37, 38, 39\\) \\(37, 38, 39, 40, 41, 42, 43, 44, 45, 46\\)\\)" \
++	 " = \\(\\(-26, -25, -24, -23, -22, -21\\) \\(-19, -18, -17, -16, -15, -14\\) \\(-12, -11, -10, -9, -8, -7\\)\\)" \
++	 " = \\(\\(-26, -24, -22, -20, -18\\) \\(-5, -3, -1, 1, 3\\) \\(16, 18, 20, 22, 24\\) \\(37, 39, 41, 43, 45\\)\\)" ]
+ 
+ set message_strings \
+     [list \
+diff --git a/gdb/testsuite/gdb.fortran/class-allocatable-array.exp b/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
+--- a/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
++++ b/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
+@@ -40,4 +40,4 @@ gdb_continue_to_breakpoint "Break Here"
+ # cetainly going to fail.
+ gdb_test "print this" " = \\( _data = \[^\r\n\]+, _vptr = \[^\r\n\]+\\)"
+ gdb_test "print this%_data" " = \\(PTR TO -> \\( Type test_type \\)\\) \[^\r\n\]+"
+-gdb_test "print this%_data%b" " = \\(\\( 1, 2, 3\\) \\( 4, 5, 6\\) \\)"
++gdb_test "print this%_data%b" " = \\(\\(1, 2, 3\\) \\(4, 5, 6\\)\\)"
+diff --git a/gdb/testsuite/gdb.fortran/multi-dim.exp b/gdb/testsuite/gdb.fortran/multi-dim.exp
+--- a/gdb/testsuite/gdb.fortran/multi-dim.exp
++++ b/gdb/testsuite/gdb.fortran/multi-dim.exp
+@@ -57,7 +57,7 @@ gdb_test "print foo(3,3,4)" \
+     "print an invalid array index (3,3,4)"
+ 
+ gdb_test "print foo" \
+-    { = \(\( \( 10, 10\) \( 10, 10\) \( 10, 10\) \) \( \( 10, 10\) \( 10, 10\) \( 10, 10\) \) \( \( 10, 10\) \( 10, 10\) \( 10, 10\) \) \( \( 10, 10\) \( 10, 10\) \( 10, 20\) \) \)} \
++    { = \(\(\(10, 10\) \(10, 10\) \(10, 10\)\) \(\(10, 10\) \(10, 10\) \(10, 10\)\) \(\(10, 10\) \(10, 10\) \(10, 10\)\) \(\(10, 10\) \(10, 10\) \(10, 20\)\)\)} \
+     "print full contents of the array"
+ 
+ gdb_breakpoint [gdb_get_line_number "break-variable"]
+diff --git a/gdb/testsuite/gdb.fortran/vla-type.exp b/gdb/testsuite/gdb.fortran/vla-type.exp
+--- a/gdb/testsuite/gdb.fortran/vla-type.exp
++++ b/gdb/testsuite/gdb.fortran/vla-type.exp
+@@ -66,9 +66,9 @@ gdb_test "ptype twov" \
+                      "\\s+$int, allocatable :: ivla1\\\(5,12,99\\\)" \
+                      "\\s+$int, allocatable :: ivla2\\\(9,12\\\)" \
+                      "End Type two" ]
+-gdb_test "print twov" " = \\\( ivla1 = \\\(\\\( \\\( 1, 1, 1, 1, 1\\\)\
+- \\\( 1, 1, 321, 1, 1\\\)\
+- \\\( 1, 1, 1, 1, 1\\\) .*"
++gdb_test "print twov" " = \\\( ivla1 = \\\(\\\(\\\(1, 1, 1, 1, 1\\\)\
++ \\\(1, 1, 321, 1, 1\\\)\
++ \\\(1, 1, 1, 1, 1\\\) .*"
+ 
+ # Check type with attribute at beginn of type
+ gdb_breakpoint [gdb_get_line_number "threev-filled"]
+diff --git a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
+--- a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
++++ b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
+@@ -180,7 +180,7 @@ mi_run_cmd
+ mi_expect_stop "breakpoint-hit" "vla" "" ".*vla.f90" "$bp_lineno" \
+   { "" "disp=\"del\"" } "run to breakpoint at line $bp_lineno"
+ mi_gdb_test "590-data-evaluate-expression pvla2" \
+-  "590\\^done,value=\"\\(\\( 2, 2, 2, 2, 2\\) \\( 2, 2, 2, 2, 2\\) \\)\"" \
++  "590\\^done,value=\"\\(\\(2, 2, 2, 2, 2\\) \\(2, 2, 2, 2, 2\\)\\)\"" \
+   "evaluate associated vla"
+ 
+ mi_create_varobj_checked pvla2_associated pvla2 \

SOURCES/gdb-rhbz1964167-move-fortran-expr-handling.patch

@@ -0,0 +1,787 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Mon, 24 May 2021 17:00:17 -0700
+Subject: gdb-rhbz1964167-move-fortran-expr-handling.patch
+
+;; [fortran] Backport Andrew Burgess's commit which moves Fortran
+;; expression handling to f-lang.c.
+
+gdb/fortran: Move Fortran expression handling into f-lang.c
+
+The Fortran specific OP_F77_UNDETERMINED_ARGLIST is currently handled
+in the generic expression handling code.  There's no reason why this
+should be the case, so this commit moves handling of this into Fortran
+specific files.
+
+There should be no user visible changes after this commit.
+
+gdb/ChangeLog:
+
+	* eval.c: Remove 'f-lang.h' include.
+	(value_f90_subarray): Moved to f-lang.c.
+	(eval_call): Renamed to...
+	(evaluate_subexp_do_call): ...this, is no longer static, header
+	comment moved into header file.
+	(evaluate_funcall): Update call to eval_call.
+	(skip_undetermined_arglist): Moved to f-lang.c.
+	(fortran_value_subarray): Likewise.
+	(evaluate_subexp_standard): OP_F77_UNDETERMINED_ARGLIST handling
+	moved to evaluate_subexp_f.
+	(calc_f77_array_dims): Moved to f-lang.c
+	* expprint.c (print_subexp_funcall): New function.
+	(print_subexp_standard): OP_F77_UNDETERMINED_ARGLIST handling
+	moved to print_subexp_f, OP_FUNCALL uses new function.
+	(dump_subexp_body_funcall): New function.
+	(dump_subexp_body_standard): OP_F77_UNDETERMINED_ARGLIST handling
+	moved to dump_subexp_f, OP_FUNCALL uses new function.
+	* expression.h (evaluate_subexp_do_call): Declare.
+	* f-lang.c (value_f90_subarray): Moved from eval.c.
+	(skip_undetermined_arglist): Likewise.
+	(calc_f77_array_dims): Likewise.
+	(fortran_value_subarray): Likewise.
+	(evaluate_subexp_f): Add OP_F77_UNDETERMINED_ARGLIST support.
+	(operator_length_f): Likewise.
+	(print_subexp_f): Likewise.
+	(dump_subexp_body_f): Likewise.
+	* fortran-operator.def (OP_F77_UNDETERMINED_ARGLIST): Move
+	declaration of this operation to here.
+	* parse.c (operator_length_standard): OP_F77_UNDETERMINED_ARGLIST
+	support moved to operator_length_f.
+	* parser-defs.h (dump_subexp_body_funcall): Declare.
+	(print_subexp_funcall): Declare.
+	* std-operator.def (OP_F77_UNDETERMINED_ARGLIST): Moved to
+	fortran-operator.def.
+
+diff --git a/gdb/eval.c b/gdb/eval.c
+--- a/gdb/eval.c
++++ b/gdb/eval.c
+@@ -26,7 +26,6 @@
+ #include "frame.h"
+ #include "gdbthread.h"
+ #include "language.h"		/* For CAST_IS_CONVERSION.  */
+-#include "f-lang.h"		/* For array bound stuff.  */
+ #include "cp-abi.h"
+ #include "infcall.h"
+ #include "objc-lang.h"
+@@ -371,32 +370,6 @@ init_array_element (struct value *array, struct value *element,
+   return index;
+ }
+ 
+-static struct value *
+-value_f90_subarray (struct value *array,
+-		    struct expression *exp, int *pos, enum noside noside)
+-{
+-  int pc = (*pos) + 1;
+-  LONGEST low_bound, high_bound;
+-  struct type *range = check_typedef (value_type (array)->index_type ());
+-  enum range_type range_type
+-    = (enum range_type) longest_to_int (exp->elts[pc].longconst);
+- 
+-  *pos += 3;
+-
+-  if (range_type == LOW_BOUND_DEFAULT || range_type == BOTH_BOUND_DEFAULT)
+-    low_bound = range->bounds ()->low.const_val ();
+-  else
+-    low_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
+-
+-  if (range_type == HIGH_BOUND_DEFAULT || range_type == BOTH_BOUND_DEFAULT)
+-    high_bound = range->bounds ()->high.const_val ();
+-  else
+-    high_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
+-
+-  return value_slice (array, low_bound, high_bound - low_bound + 1);
+-}
+-
+-
+ /* Promote value ARG1 as appropriate before performing a unary operation
+    on this argument.
+    If the result is not appropriate for any particular language then it
+@@ -749,17 +722,13 @@ eval_skip_value (expression *exp)
+   return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, 1);
+ }
+ 
+-/* Evaluate a function call.  The function to be called is in
+-   ARGVEC[0] and the arguments passed to the function are in
+-   ARGVEC[1..NARGS].  FUNCTION_NAME is the name of the function, if
+-   known.  DEFAULT_RETURN_TYPE is used as the function's return type
+-   if the return type is unknown.  */
++/* See expression.h.  */
+ 
+-static value *
+-eval_call (expression *exp, enum noside noside,
+-	   int nargs, value **argvec,
+-	   const char *function_name,
+-	   type *default_return_type)
++value *
++evaluate_subexp_do_call (expression *exp, enum noside noside,
++			 int nargs, value **argvec,
++			 const char *function_name,
++			 type *default_return_type)
+ {
+   if (argvec[0] == NULL)
+     error (_("Cannot evaluate function -- may be inlined"));
+@@ -1230,20 +1199,8 @@ evaluate_funcall (type *expect_type, expression *exp, int *pos,
+       /* Nothing to be done; argvec already correctly set up.  */
+     }
+ 
+-  return eval_call (exp, noside, nargs, argvec, var_func_name, expect_type);
+-}
+-
+-/* Helper for skipping all the arguments in an undetermined argument list.
+-   This function was designed for use in the OP_F77_UNDETERMINED_ARGLIST
+-   case of evaluate_subexp_standard as multiple, but not all, code paths
+-   require a generic skip.  */
+-
+-static void
+-skip_undetermined_arglist (int nargs, struct expression *exp, int *pos,
+-			   enum noside noside)
+-{
+-  for (int i = 0; i < nargs; ++i)
+-    evaluate_subexp (nullptr, exp, pos, noside);
++  return evaluate_subexp_do_call (exp, noside, nargs, argvec,
++				  var_func_name, expect_type);
+ }
+ 
+ /* Return true if type is integral or reference to integral */
+@@ -1260,67 +1217,6 @@ is_integral_or_integral_reference (struct type *type)
+ 	  && is_integral_type (TYPE_TARGET_TYPE (type)));
+ }
+ 
+-/* Called from evaluate_subexp_standard to perform array indexing, and
+-   sub-range extraction, for Fortran.  As well as arrays this function
+-   also handles strings as they can be treated like arrays of characters.
+-   ARRAY is the array or string being accessed.  EXP, POS, and NOSIDE are
+-   as for evaluate_subexp_standard, and NARGS is the number of arguments
+-   in this access (e.g. 'array (1,2,3)' would be NARGS 3).  */
+-
+-static struct value *
+-fortran_value_subarray (struct value *array, struct expression *exp,
+-			int *pos, int nargs, enum noside noside)
+-{
+-  if (exp->elts[*pos].opcode == OP_RANGE)
+-    return value_f90_subarray (array, exp, pos, noside);
+-
+-  if (noside == EVAL_SKIP)
+-    {
+-      skip_undetermined_arglist (nargs, exp, pos, noside);
+-      /* Return the dummy value with the correct type.  */
+-      return array;
+-    }
+-
+-  LONGEST subscript_array[MAX_FORTRAN_DIMS];
+-  int ndimensions = 1;
+-  struct type *type = check_typedef (value_type (array));
+-
+-  if (nargs > MAX_FORTRAN_DIMS)
+-    error (_("Too many subscripts for F77 (%d Max)"), MAX_FORTRAN_DIMS);
+-
+-  ndimensions = calc_f77_array_dims (type);
+-
+-  if (nargs != ndimensions)
+-    error (_("Wrong number of subscripts"));
+-
+-  gdb_assert (nargs > 0);
+-
+-  /* Now that we know we have a legal array subscript expression let us
+-     actually find out where this element exists in the array.  */
+-
+-  /* Take array indices left to right.  */
+-  for (int i = 0; i < nargs; i++)
+-    {
+-      /* Evaluate each subscript; it must be a legal integer in F77.  */
+-      value *arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
+-
+-      /* Fill in the subscript array.  */
+-      subscript_array[i] = value_as_long (arg2);
+-    }
+-
+-  /* Internal type of array is arranged right to left.  */
+-  for (int i = nargs; i > 0; i--)
+-    {
+-      struct type *array_type = check_typedef (value_type (array));
+-      LONGEST index = subscript_array[i - 1];
+-
+-      array = value_subscripted_rvalue (array, index,
+-					f77_get_lowerbound (array_type));
+-    }
+-
+-  return array;
+-}
+-
+ struct value *
+ evaluate_subexp_standard (struct type *expect_type,
+ 			  struct expression *exp, int *pos,
+@@ -1335,7 +1231,6 @@ evaluate_subexp_standard (struct type *expect_type,
+   struct type *type;
+   int nargs;
+   struct value **argvec;
+-  int code;
+   int ix;
+   long mem_offset;
+   struct type **arg_types;
+@@ -1976,84 +1871,6 @@ evaluate_subexp_standard (struct type *expect_type,
+     case OP_FUNCALL:
+       return evaluate_funcall (expect_type, exp, pos, noside);
+ 
+-    case OP_F77_UNDETERMINED_ARGLIST:
+-
+-      /* Remember that in F77, functions, substring ops and 
+-         array subscript operations cannot be disambiguated 
+-         at parse time.  We have made all array subscript operations, 
+-         substring operations as well as function calls  come here 
+-         and we now have to discover what the heck this thing actually was.
+-         If it is a function, we process just as if we got an OP_FUNCALL.  */
+-
+-      nargs = longest_to_int (exp->elts[pc + 1].longconst);
+-      (*pos) += 2;
+-
+-      /* First determine the type code we are dealing with.  */
+-      arg1 = evaluate_subexp (nullptr, exp, pos, noside);
+-      type = check_typedef (value_type (arg1));
+-      code = type->code ();
+-
+-      if (code == TYPE_CODE_PTR)
+-	{
+-	  /* Fortran always passes variable to subroutines as pointer.
+-	     So we need to look into its target type to see if it is
+-	     array, string or function.  If it is, we need to switch
+-	     to the target value the original one points to.  */ 
+-	  struct type *target_type = check_typedef (TYPE_TARGET_TYPE (type));
+-
+-	  if (target_type->code () == TYPE_CODE_ARRAY
+-	      || target_type->code () == TYPE_CODE_STRING
+-	      || target_type->code () == TYPE_CODE_FUNC)
+-	    {
+-	      arg1 = value_ind (arg1);
+-	      type = check_typedef (value_type (arg1));
+-	      code = type->code ();
+-	    }
+-	} 
+-
+-      switch (code)
+-	{
+-	case TYPE_CODE_ARRAY:
+-	case TYPE_CODE_STRING:
+-	  return fortran_value_subarray (arg1, exp, pos, nargs, noside);
+-
+-	case TYPE_CODE_PTR:
+-	case TYPE_CODE_FUNC:
+-	case TYPE_CODE_INTERNAL_FUNCTION:
+-	  /* It's a function call.  */
+-	  /* Allocate arg vector, including space for the function to be
+-	     called in argvec[0] and a terminating NULL.  */
+-	  argvec = (struct value **)
+-	    alloca (sizeof (struct value *) * (nargs + 2));
+-	  argvec[0] = arg1;
+-	  tem = 1;
+-	  for (; tem <= nargs; tem++)
+-	    {
+-	      argvec[tem] = evaluate_subexp_with_coercion (exp, pos, noside);
+-	      /* Arguments in Fortran are passed by address.  Coerce the
+-		 arguments here rather than in value_arg_coerce as otherwise
+-		 the call to malloc to place the non-lvalue parameters in
+-		 target memory is hit by this Fortran specific logic.  This
+-		 results in malloc being called with a pointer to an integer
+-		 followed by an attempt to malloc the arguments to malloc in
+-		 target memory.  Infinite recursion ensues.  */
+-	      if (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC)
+-		{
+-		  bool is_artificial
+-		    = TYPE_FIELD_ARTIFICIAL (value_type (arg1), tem - 1);
+-		  argvec[tem] = fortran_argument_convert (argvec[tem],
+-							  is_artificial);
+-		}
+-	    }
+-	  argvec[tem] = 0;	/* signal end of arglist */
+-	  if (noside == EVAL_SKIP)
+-	    return eval_skip_value (exp);
+-	  return eval_call (exp, noside, nargs, argvec, NULL, expect_type);
+-
+-	default:
+-	  error (_("Cannot perform substring on this type"));
+-	}
+-
+     case OP_COMPLEX:
+       /* We have a complex number, There should be 2 floating 
+          point numbers that compose it.  */
+@@ -3346,27 +3163,3 @@ parse_and_eval_type (char *p, int length)
+     error (_("Internal error in eval_type."));
+   return expr->elts[1].type;
+ }
+-
+-/* Return the number of dimensions for a Fortran array or string.  */
+-
+-int
+-calc_f77_array_dims (struct type *array_type)
+-{
+-  int ndimen = 1;
+-  struct type *tmp_type;
+-
+-  if ((array_type->code () == TYPE_CODE_STRING))
+-    return 1;
+-
+-  if ((array_type->code () != TYPE_CODE_ARRAY))
+-    error (_("Can't get dimensions for a non-array type"));
+-
+-  tmp_type = array_type;
+-
+-  while ((tmp_type = TYPE_TARGET_TYPE (tmp_type)))
+-    {
+-      if (tmp_type->code () == TYPE_CODE_ARRAY)
+-	++ndimen;
+-    }
+-  return ndimen;
+-}
+diff --git a/gdb/expprint.c b/gdb/expprint.c
+--- a/gdb/expprint.c
++++ b/gdb/expprint.c
+@@ -53,6 +53,25 @@ print_subexp (struct expression *exp, int *pos,
+   exp->language_defn->la_exp_desc->print_subexp (exp, pos, stream, prec);
+ }
+ 
++/* See parser-defs.h.  */
++
++void
++print_subexp_funcall (struct expression *exp, int *pos,
++		      struct ui_file *stream)
++{
++  (*pos) += 2;
++  unsigned nargs = longest_to_int (exp->elts[*pos].longconst);
++  print_subexp (exp, pos, stream, PREC_SUFFIX);
++  fputs_filtered (" (", stream);
++  for (unsigned tem = 0; tem < nargs; tem++)
++    {
++      if (tem != 0)
++	fputs_filtered (", ", stream);
++      print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
++    }
++  fputs_filtered (")", stream);
++}
++
+ /* Standard implementation of print_subexp for use in language_defn
+    vectors.  */
+ void
+@@ -187,18 +206,7 @@ print_subexp_standard (struct expression *exp, int *pos,
+       return;
+ 
+     case OP_FUNCALL:
+-    case OP_F77_UNDETERMINED_ARGLIST:
+-      (*pos) += 2;
+-      nargs = longest_to_int (exp->elts[pc + 1].longconst);
+-      print_subexp (exp, pos, stream, PREC_SUFFIX);
+-      fputs_filtered (" (", stream);
+-      for (tem = 0; tem < nargs; tem++)
+-	{
+-	  if (tem != 0)
+-	    fputs_filtered (", ", stream);
+-	  print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
+-	}
+-      fputs_filtered (")", stream);
++      print_subexp_funcall (exp, pos, stream);
+       return;
+ 
+     case OP_NAME:
+@@ -796,6 +804,22 @@ dump_subexp_body (struct expression *exp, struct ui_file *stream, int elt)
+   return exp->language_defn->la_exp_desc->dump_subexp_body (exp, stream, elt);
+ }
+ 
++/* See parser-defs.h.  */
++
++int
++dump_subexp_body_funcall (struct expression *exp,
++			  struct ui_file *stream, int elt)
++{
++  int nargs = longest_to_int (exp->elts[elt].longconst);
++  fprintf_filtered (stream, "Number of args: %d", nargs);
++  elt += 2;
++
++  for (int i = 1; i <= nargs + 1; i++)
++    elt = dump_subexp (exp, stream, elt);
++
++  return elt;
++}
++
+ /* Default value for subexp_body in exp_descriptor vector.  */
+ 
+ int
+@@ -931,18 +955,7 @@ dump_subexp_body_standard (struct expression *exp,
+       elt += 2;
+       break;
+     case OP_FUNCALL:
+-    case OP_F77_UNDETERMINED_ARGLIST:
+-      {
+-	int i, nargs;
+-
+-	nargs = longest_to_int (exp->elts[elt].longconst);
+-
+-	fprintf_filtered (stream, "Number of args: %d", nargs);
+-	elt += 2;
+-
+-	for (i = 1; i <= nargs + 1; i++)
+-	  elt = dump_subexp (exp, stream, elt);
+-      }
++      elt = dump_subexp_body_funcall (exp, stream, elt);
+       break;
+     case OP_ARRAY:
+       {
+diff --git a/gdb/expression.h b/gdb/expression.h
+--- a/gdb/expression.h
++++ b/gdb/expression.h
+@@ -155,6 +155,18 @@ enum noside
+ extern struct value *evaluate_subexp_standard
+   (struct type *, struct expression *, int *, enum noside);
+ 
++/* Evaluate a function call.  The function to be called is in ARGVEC[0] and
++   the arguments passed to the function are in ARGVEC[1..NARGS].
++   FUNCTION_NAME is the name of the function, if known.
++   DEFAULT_RETURN_TYPE is used as the function's return type if the return
++   type is unknown.  */
++
++extern struct value *evaluate_subexp_do_call (expression *exp,
++					      enum noside noside,
++					      int nargs, value **argvec,
++					      const char *function_name,
++					      type *default_return_type);
++
+ /* From expprint.c */
+ 
+ extern void print_expression (struct expression *, struct ui_file *);
+diff --git a/gdb/f-lang.c b/gdb/f-lang.c
+--- a/gdb/f-lang.c
++++ b/gdb/f-lang.c
+@@ -114,6 +114,134 @@ enum f_primitive_types {
+   nr_f_primitive_types
+ };
+ 
++/* Called from fortran_value_subarray to take a slice of an array or a
++   string.  ARRAY is the array or string to be accessed.  EXP, POS, and
++   NOSIDE are as for evaluate_subexp_standard.  Return a value that is a
++   slice of the array.  */
++
++static struct value *
++value_f90_subarray (struct value *array,
++		    struct expression *exp, int *pos, enum noside noside)
++{
++  int pc = (*pos) + 1;
++  LONGEST low_bound, high_bound;
++  struct type *range = check_typedef (value_type (array)->index_type ());
++  enum range_type range_type
++    = (enum range_type) longest_to_int (exp->elts[pc].longconst);
++
++  *pos += 3;
++
++  if (range_type == LOW_BOUND_DEFAULT || range_type == BOTH_BOUND_DEFAULT)
++    low_bound = range->bounds ()->low.const_val ();
++  else
++    low_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
++
++  if (range_type == HIGH_BOUND_DEFAULT || range_type == BOTH_BOUND_DEFAULT)
++    high_bound = range->bounds ()->high.const_val ();
++  else
++    high_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
++
++  return value_slice (array, low_bound, high_bound - low_bound + 1);
++}
++
++/* Helper for skipping all the arguments in an undetermined argument list.
++   This function was designed for use in the OP_F77_UNDETERMINED_ARGLIST
++   case of evaluate_subexp_standard as multiple, but not all, code paths
++   require a generic skip.  */
++
++static void
++skip_undetermined_arglist (int nargs, struct expression *exp, int *pos,
++			   enum noside noside)
++{
++  for (int i = 0; i < nargs; ++i)
++    evaluate_subexp (nullptr, exp, pos, noside);
++}
++
++/* Return the number of dimensions for a Fortran array or string.  */
++
++int
++calc_f77_array_dims (struct type *array_type)
++{
++  int ndimen = 1;
++  struct type *tmp_type;
++
++  if ((array_type->code () == TYPE_CODE_STRING))
++    return 1;
++
++  if ((array_type->code () != TYPE_CODE_ARRAY))
++    error (_("Can't get dimensions for a non-array type"));
++
++  tmp_type = array_type;
++
++  while ((tmp_type = TYPE_TARGET_TYPE (tmp_type)))
++    {
++      if (tmp_type->code () == TYPE_CODE_ARRAY)
++	++ndimen;
++    }
++  return ndimen;
++}
++
++/* Called from evaluate_subexp_standard to perform array indexing, and
++   sub-range extraction, for Fortran.  As well as arrays this function
++   also handles strings as they can be treated like arrays of characters.
++   ARRAY is the array or string being accessed.  EXP, POS, and NOSIDE are
++   as for evaluate_subexp_standard, and NARGS is the number of arguments
++   in this access (e.g. 'array (1,2,3)' would be NARGS 3).  */
++
++static struct value *
++fortran_value_subarray (struct value *array, struct expression *exp,
++			int *pos, int nargs, enum noside noside)
++{
++  if (exp->elts[*pos].opcode == OP_RANGE)
++    return value_f90_subarray (array, exp, pos, noside);
++
++  if (noside == EVAL_SKIP)
++    {
++      skip_undetermined_arglist (nargs, exp, pos, noside);
++      /* Return the dummy value with the correct type.  */
++      return array;
++    }
++
++  LONGEST subscript_array[MAX_FORTRAN_DIMS];
++  int ndimensions = 1;
++  struct type *type = check_typedef (value_type (array));
++
++  if (nargs > MAX_FORTRAN_DIMS)
++    error (_("Too many subscripts for F77 (%d Max)"), MAX_FORTRAN_DIMS);
++
++  ndimensions = calc_f77_array_dims (type);
++
++  if (nargs != ndimensions)
++    error (_("Wrong number of subscripts"));
++
++  gdb_assert (nargs > 0);
++
++  /* Now that we know we have a legal array subscript expression let us
++     actually find out where this element exists in the array.  */
++
++  /* Take array indices left to right.  */
++  for (int i = 0; i < nargs; i++)
++    {
++      /* Evaluate each subscript; it must be a legal integer in F77.  */
++      value *arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
++
++      /* Fill in the subscript array.  */
++      subscript_array[i] = value_as_long (arg2);
++    }
++
++  /* Internal type of array is arranged right to left.  */
++  for (int i = nargs; i > 0; i--)
++    {
++      struct type *array_type = check_typedef (value_type (array));
++      LONGEST index = subscript_array[i - 1];
++
++      array = value_subscripted_rvalue (array, index,
++					f77_get_lowerbound (array_type));
++    }
++
++  return array;
++}
++
+ /* Special expression evaluation cases for Fortran.  */
+ 
+ static struct value *
+@@ -285,6 +413,87 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp,
+ 				   TYPE_LENGTH (type));
+       return value_from_longest (builtin_type (exp->gdbarch)->builtin_int,
+ 				 TYPE_LENGTH (TYPE_TARGET_TYPE (type)));
++
++
++    case OP_F77_UNDETERMINED_ARGLIST:
++      /* Remember that in F77, functions, substring ops and array subscript
++         operations cannot be disambiguated at parse time.  We have made
++         all array subscript operations, substring operations as well as
++         function calls come here and we now have to discover what the heck
++         this thing actually was.  If it is a function, we process just as
++         if we got an OP_FUNCALL.  */
++      int nargs = longest_to_int (exp->elts[pc + 1].longconst);
++      (*pos) += 2;
++
++      /* First determine the type code we are dealing with.  */
++      arg1 = evaluate_subexp (nullptr, exp, pos, noside);
++      type = check_typedef (value_type (arg1));
++      enum type_code code = type->code ();
++
++      if (code == TYPE_CODE_PTR)
++	{
++	  /* Fortran always passes variable to subroutines as pointer.
++	     So we need to look into its target type to see if it is
++	     array, string or function.  If it is, we need to switch
++	     to the target value the original one points to.  */
++	  struct type *target_type = check_typedef (TYPE_TARGET_TYPE (type));
++
++	  if (target_type->code () == TYPE_CODE_ARRAY
++	      || target_type->code () == TYPE_CODE_STRING
++	      || target_type->code () == TYPE_CODE_FUNC)
++	    {
++	      arg1 = value_ind (arg1);
++	      type = check_typedef (value_type (arg1));
++	      code = type->code ();
++	    }
++	}
++
++      switch (code)
++	{
++	case TYPE_CODE_ARRAY:
++	case TYPE_CODE_STRING:
++	  return fortran_value_subarray (arg1, exp, pos, nargs, noside);
++
++	case TYPE_CODE_PTR:
++	case TYPE_CODE_FUNC:
++	case TYPE_CODE_INTERNAL_FUNCTION:
++	  {
++	    /* It's a function call.  Allocate arg vector, including
++	    space for the function to be called in argvec[0] and a
++	    termination NULL.  */
++	    struct value **argvec = (struct value **)
++	      alloca (sizeof (struct value *) * (nargs + 2));
++	    argvec[0] = arg1;
++	    int tem = 1;
++	    for (; tem <= nargs; tem++)
++	      {
++		argvec[tem] = evaluate_subexp_with_coercion (exp, pos, noside);
++		/* Arguments in Fortran are passed by address.  Coerce the
++		   arguments here rather than in value_arg_coerce as
++		   otherwise the call to malloc to place the non-lvalue
++		   parameters in target memory is hit by this Fortran
++		   specific logic.  This results in malloc being called
++		   with a pointer to an integer followed by an attempt to
++		   malloc the arguments to malloc in target memory.
++		   Infinite recursion ensues.  */
++		if (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC)
++		  {
++		    bool is_artificial
++		      = TYPE_FIELD_ARTIFICIAL (value_type (arg1), tem - 1);
++		    argvec[tem] = fortran_argument_convert (argvec[tem],
++							    is_artificial);
++		  }
++	      }
++	    argvec[tem] = 0;	/* signal end of arglist */
++	    if (noside == EVAL_SKIP)
++	      return eval_skip_value (exp);
++	    return evaluate_subexp_do_call (exp, noside, nargs, argvec, NULL,
++					    expect_type);
++	  }
++
++	default:
++	  error (_("Cannot perform substring on this type"));
++	}
+     }
+ 
+   /* Should be unreachable.  */
+@@ -318,6 +527,11 @@ operator_length_f (const struct expression *exp, int pc, int *oplenp,
+       oplen = 1;
+       args = 2;
+       break;
++
++    case OP_F77_UNDETERMINED_ARGLIST:
++      oplen = 3;
++      args = 1 + longest_to_int (exp->elts[pc - 2].longconst);
++      break;
+     }
+ 
+   *oplenp = oplen;
+@@ -390,6 +604,10 @@ print_subexp_f (struct expression *exp, int *pos,
+     case BINOP_FORTRAN_MODULO:
+       print_binop_subexp_f (exp, pos, stream, prec, "MODULO");
+       return;
++
++    case OP_F77_UNDETERMINED_ARGLIST:
++      print_subexp_funcall (exp, pos, stream);
++      return;
+     }
+ }
+ 
+@@ -432,6 +650,9 @@ dump_subexp_body_f (struct expression *exp,
+     case BINOP_FORTRAN_MODULO:
+       operator_length_f (exp, (elt + 1), &oplen, &nargs);
+       break;
++
++    case OP_F77_UNDETERMINED_ARGLIST:
++      return dump_subexp_body_funcall (exp, stream, elt);
+     }
+ 
+   elt += oplen;
+diff --git a/gdb/fortran-operator.def b/gdb/fortran-operator.def
+--- a/gdb/fortran-operator.def
++++ b/gdb/fortran-operator.def
+@@ -17,6 +17,14 @@
+    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 is EXACTLY like OP_FUNCALL but is semantically different.
++   In F77, array subscript expressions, substring expressions and
++   function calls are all exactly the same syntactically.  They
++   may only be disambiguated at runtime.  Thus this operator,
++   which indicates that we have found something of the form
++   <name> ( <stuff> ).  */
++OP (OP_F77_UNDETERMINED_ARGLIST)
++
+ /* Single operand builtins.  */
+ OP (UNOP_FORTRAN_KIND)
+ OP (UNOP_FORTRAN_FLOOR)
+diff --git a/gdb/parse.c b/gdb/parse.c
+--- a/gdb/parse.c
++++ b/gdb/parse.c
+@@ -817,7 +817,6 @@ operator_length_standard (const struct expression *expr, int endpos,
+       break;
+ 
+     case OP_FUNCALL:
+-    case OP_F77_UNDETERMINED_ARGLIST:
+       oplen = 3;
+       args = 1 + longest_to_int (expr->elts[endpos - 2].longconst);
+       break;
+diff --git a/gdb/parser-defs.h b/gdb/parser-defs.h
+--- a/gdb/parser-defs.h
++++ b/gdb/parser-defs.h
+@@ -338,6 +338,13 @@ extern int dump_subexp (struct expression *, struct ui_file *, int);
+ extern int dump_subexp_body_standard (struct expression *, 
+ 				      struct ui_file *, int);
+ 
++/* Dump (to STREAM) a function call like expression at position ELT in the
++   expression array EXP.  Return a new value for ELT just after the
++   function call expression.  */
++
++extern int dump_subexp_body_funcall (struct expression *exp,
++				     struct ui_file *stream, int elt);
++
+ extern void operator_length (const struct expression *, int, int *, int *);
+ 
+ extern void operator_length_standard (const struct expression *, int, int *,
+@@ -440,6 +447,15 @@ extern void print_subexp (struct expression *, int *, struct ui_file *,
+ extern void print_subexp_standard (struct expression *, int *, 
+ 				   struct ui_file *, enum precedence);
+ 
++/* Print a function call like expression to STREAM.  This is called as a
++   helper function by which point the expression node identifying this as a
++   function call has already been stripped off and POS should point to the
++   number of function call arguments.  EXP is the object containing the
++   list of expression elements.  */
++
++extern void print_subexp_funcall (struct expression *exp, int *pos,
++				  struct ui_file *stream);
++
+ /* Function used to avoid direct calls to fprintf
+    in the code generated by the bison parser.  */
+ 
+diff --git a/gdb/std-operator.def b/gdb/std-operator.def
+--- a/gdb/std-operator.def
++++ b/gdb/std-operator.def
+@@ -168,14 +168,6 @@ OP (OP_FUNCALL)
+    pointer.  This is an Objective C message.  */
+ OP (OP_OBJC_MSGCALL)
+ 
+-/* This is EXACTLY like OP_FUNCALL but is semantically different.
+-   In F77, array subscript expressions, substring expressions and
+-   function calls are all exactly the same syntactically.  They
+-   may only be disambiguated at runtime.  Thus this operator,
+-   which indicates that we have found something of the form
+-   <name> ( <stuff> ).  */
+-OP (OP_F77_UNDETERMINED_ARGLIST)
+-
+ /* OP_COMPLEX takes a type in the following element, followed by another
+    OP_COMPLEX, making three exp_elements.  It is followed by two double
+    args, and converts them into a complex number of the given type.  */

SOURCES/gdb-rhbz1971095-libthread_db-update-1of5.patch

@@ -0,0 +1,306 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Simon Marchi <simon.marchi@polymtl.ca>
+Date: Tue, 8 Jun 2021 16:50:53 -0400
+Subject: gdb-rhbz1971095-libthread_db-update-1of5.patch
+
+;; Backport "gdb: try to load libthread_db only after reading all
+;; shared libraries when attaching / handling a fork child"
+;; (Simon Marchi, RH BZ 1971095)
+
+When trying to attach to a pthread process on a Linux system with glibc 2.33,
+we get:
+
+    $ ./gdb -q -nx --data-directory=data-directory -p 1472010
+    Attaching to process 1472010
+    [New LWP 1472013]
+    [New LWP 1472014]
+    [New LWP 1472015]
+    Error while reading shared library symbols for /usr/lib/libpthread.so.0:
+    Cannot find user-level thread for LWP 1472015: generic error
+    0x00007ffff6d3637f in poll () from /usr/lib/libc.so.6
+    (gdb)
+
+When attaching to a process (or handling a fork child, an operation very
+similar to attaching), GDB reads the shared library list from the
+process.  For each shared library (if "set auto-solib-add" is on), it
+reads its symbols and calls the "new_objfile" observable.
+
+The libthread-db code monitors this observable, and if it sees an
+objfile named somewhat like "libpthread.so" go by, it tries to load
+libthread_db.so in the GDB process itself.  libthread_db knows how to
+navigate libpthread's data structures to get information about the
+existing threads.
+
+To locate these data structures, libthread_db calls ps_pglobal_lookup
+(implemented in proc-service.c), passing in a symbol name and expecting
+an address in return.
+
+Before glibc 2.33, libthread_db always asked for symbols found in
+libpthread.  There was no ordering problem: since we were always trying
+to load libthread_db in reaction to processing libpthread (and reading
+in its symbols) and libthread_db only asked symbols from libpthread, the
+requested symbols could always be found.  Starting with glibc 2.33,
+libthread_db now asks for a symbol name that can be found in
+/lib/ld-linux-x86-64.so.2 (_rtld_global).  And the ordering in which GDB
+reads the shared libraries from the inferior when attaching is
+unfortunate, in that libpthread is processed before ld-linux.  So when
+loading libthread_db in reaction to processing libpthread, and
+libthread_db requests the symbol that is from ld-linux, GDB is not yet
+able to supply it.
+
+That problematic symbol lookup happens in the thread_from_lwp function,
+when we call td_ta_map_lwp2thr_p, and an exception is thrown at this
+point:
+
+    #0  0x00007ffff6681012 in __cxxabiv1::__cxa_throw (obj=0x60e000006100, tinfo=0x555560033b50 <typeinfo for gdb_exception_error>, dest=0x55555d9404bc <gdb_exception_error::~gdb_exception_error()>) at /build/gcc/src/gcc/libstdc++-v3/libsupc++/eh_throw.cc:78
+    #1  0x000055555e5d3734 in throw_it(return_reason, errors, const char *, typedef __va_list_tag __va_list_tag *) (reason=RETURN_ERROR, error=GENERIC_ERROR, fmt=0x55555f0c5360 "Cannot find user-level thread for LWP %ld: %s", ap=0x7fffffffaae0) at /home/simark/src/binutils-gdb/gdbsupport/common-exceptions.cc:200
+    #2  0x000055555e5d37d4 in throw_verror (error=GENERIC_ERROR, fmt=0x55555f0c5360 "Cannot find user-level thread for LWP %ld: %s", ap=0x7fffffffaae0) at /home/simark/src/binutils-gdb/gdbsupport/common-exceptions.cc:208
+    #3  0x000055555e0b0ed2 in verror (string=0x55555f0c5360 "Cannot find user-level thread for LWP %ld: %s", args=0x7fffffffaae0) at /home/simark/src/binutils-gdb/gdb/utils.c:171
+    #4  0x000055555e5e898a in error (fmt=0x55555f0c5360 "Cannot find user-level thread for LWP %ld: %s") at /home/simark/src/binutils-gdb/gdbsupport/errors.cc:43
+    #5  0x000055555d06b4bc in thread_from_lwp (stopped=0x617000035d80, ptid=...) at /home/simark/src/binutils-gdb/gdb/linux-thread-db.c:418
+    #6  0x000055555d07040d in try_thread_db_load_1 (info=0x60c000011140) at /home/simark/src/binutils-gdb/gdb/linux-thread-db.c:912
+    #7  0x000055555d071103 in try_thread_db_load (library=0x55555f0c62a0 "libthread_db.so.1", check_auto_load_safe=false) at /home/simark/src/binutils-gdb/gdb/linux-thread-db.c:1014
+    #8  0x000055555d072168 in try_thread_db_load_from_sdir () at /home/simark/src/binutils-gdb/gdb/linux-thread-db.c:1091
+    #9  0x000055555d072d1c in thread_db_load_search () at /home/simark/src/binutils-gdb/gdb/linux-thread-db.c:1146
+    #10 0x000055555d07365c in thread_db_load () at /home/simark/src/binutils-gdb/gdb/linux-thread-db.c:1203
+    #11 0x000055555d07373e in check_for_thread_db () at /home/simark/src/binutils-gdb/gdb/linux-thread-db.c:1246
+    #12 0x000055555d0738ab in thread_db_new_objfile (objfile=0x61300000c0c0) at /home/simark/src/binutils-gdb/gdb/linux-thread-db.c:1275
+    #13 0x000055555bd10740 in std::__invoke_impl<void, void (*&)(objfile*), objfile*> (__f=@0x616000068d88: 0x55555d073745 <thread_db_new_objfile(objfile*)>) at /usr/include/c++/10.2.0/bits/invoke.h:60
+    #14 0x000055555bd02096 in std::__invoke_r<void, void (*&)(objfile*), objfile*> (__fn=@0x616000068d88: 0x55555d073745 <thread_db_new_objfile(objfile*)>) at /usr/include/c++/10.2.0/bits/invoke.h:153
+    #15 0x000055555bce0392 in std::_Function_handler<void (objfile*), void (*)(objfile*)>::_M_invoke(std::_Any_data const&, objfile*&&) (__functor=..., __args#0=@0x7fffffffb4a0: 0x61300000c0c0) at /usr/include/c++/10.2.0/bits/std_function.h:291
+    #16 0x000055555d3595c0 in std::function<void (objfile*)>::operator()(objfile*) const (this=0x616000068d88, __args#0=0x61300000c0c0) at /usr/include/c++/10.2.0/bits/std_function.h:622
+    #17 0x000055555d356b7f in gdb::observers::observable<objfile*>::notify (this=0x555566727020 <gdb::observers::new_objfile>, args#0=0x61300000c0c0) at /home/simark/src/binutils-gdb/gdb/../gdbsupport/observable.h:106
+    #18 0x000055555da3f228 in symbol_file_add_with_addrs (abfd=0x61200001ccc0, name=0x6190000d9090 "/usr/lib/libpthread.so.0", add_flags=..., addrs=0x7fffffffbc10, flags=..., parent=0x0) at /home/simark/src/binutils-gdb/gdb/symfile.c:1131
+    #19 0x000055555da3f763 in symbol_file_add_from_bfd (abfd=0x61200001ccc0, name=0x6190000d9090 "/usr/lib/libpthread.so.0", add_flags=<error reading variable: Cannot access memory at address 0xffffffffffffffb0>, addrs=0x7fffffffbc10, flags=<error reading variable: Cannot access memory at address 0xffffffffffffffc0>, parent=0x0) at /home/simark/src/binutils-gdb/gdb/symfile.c:1167
+    #20 0x000055555d95f9fa in solib_read_symbols (so=0x6190000d8e80, flags=...) at /home/simark/src/binutils-gdb/gdb/solib.c:681
+    #21 0x000055555d96233d in solib_add (pattern=0x0, from_tty=0, readsyms=1) at /home/simark/src/binutils-gdb/gdb/solib.c:987
+    #22 0x000055555d93646e in enable_break (info=0x608000008f20, from_tty=0) at /home/simark/src/binutils-gdb/gdb/solib-svr4.c:2238
+    #23 0x000055555d93cfc0 in svr4_solib_create_inferior_hook (from_tty=0) at /home/simark/src/binutils-gdb/gdb/solib-svr4.c:3049
+    #24 0x000055555d96610d in solib_create_inferior_hook (from_tty=0) at /home/simark/src/binutils-gdb/gdb/solib.c:1195
+    #25 0x000055555cdee318 in post_create_inferior (from_tty=0) at /home/simark/src/binutils-gdb/gdb/infcmd.c:318
+    #26 0x000055555ce00e6e in setup_inferior (from_tty=0) at /home/simark/src/binutils-gdb/gdb/infcmd.c:2439
+    #27 0x000055555ce59c34 in handle_one (event=...) at /home/simark/src/binutils-gdb/gdb/infrun.c:4887
+    #28 0x000055555ce5cd00 in stop_all_threads () at /home/simark/src/binutils-gdb/gdb/infrun.c:5064
+    #29 0x000055555ce7f0da in stop_waiting (ecs=0x7fffffffd170) at /home/simark/src/binutils-gdb/gdb/infrun.c:8006
+    #30 0x000055555ce67f5c in handle_signal_stop (ecs=0x7fffffffd170) at /home/simark/src/binutils-gdb/gdb/infrun.c:6062
+    #31 0x000055555ce63653 in handle_inferior_event (ecs=0x7fffffffd170) at /home/simark/src/binutils-gdb/gdb/infrun.c:5727
+    #32 0x000055555ce4f297 in fetch_inferior_event () at /home/simark/src/binutils-gdb/gdb/infrun.c:4105
+    #33 0x000055555cdbe3bf in inferior_event_handler (event_type=INF_REG_EVENT) at /home/simark/src/binutils-gdb/gdb/inf-loop.c:42
+    #34 0x000055555d018047 in handle_target_event (error=0, client_data=0x0) at /home/simark/src/binutils-gdb/gdb/linux-nat.c:4060
+    #35 0x000055555e5ea77e in handle_file_event (file_ptr=0x60600008b1c0, ready_mask=1) at /home/simark/src/binutils-gdb/gdbsupport/event-loop.cc:575
+    #36 0x000055555e5eb09c in gdb_wait_for_event (block=0) at /home/simark/src/binutils-gdb/gdbsupport/event-loop.cc:701
+    #37 0x000055555e5e8d19 in gdb_do_one_event () at /home/simark/src/binutils-gdb/gdbsupport/event-loop.cc:212
+    #38 0x000055555dd6e0d4 in wait_sync_command_done () at /home/simark/src/binutils-gdb/gdb/top.c:528
+    #39 0x000055555dd6e372 in maybe_wait_sync_command_done (was_sync=0) at /home/simark/src/binutils-gdb/gdb/top.c:545
+    #40 0x000055555d0ec7c8 in catch_command_errors (command=0x55555ce01bb8 <attach_command(char const*, int)>, arg=0x7fffffffe28d "1472010", from_tty=1, do_bp_actions=false) at /home/simark/src/binutils-gdb/gdb/main.c:452
+    #41 0x000055555d0f03ad in captured_main_1 (context=0x7fffffffdd10) at /home/simark/src/binutils-gdb/gdb/main.c:1149
+    #42 0x000055555d0f1239 in captured_main (data=0x7fffffffdd10) at /home/simark/src/binutils-gdb/gdb/main.c:1232
+    #43 0x000055555d0f1315 in gdb_main (args=0x7fffffffdd10) at /home/simark/src/binutils-gdb/gdb/main.c:1257
+    #44 0x000055555bb70cf9 in main (argc=7, argv=0x7fffffffde88) at /home/simark/src/binutils-gdb/gdb/gdb.c:32
+
+The exception is caught here:
+
+    #0  __cxxabiv1::__cxa_begin_catch (exc_obj_in=0x60e0000060e0) at /build/gcc/src/gcc/libstdc++-v3/libsupc++/eh_catch.cc:84
+    #1  0x000055555d95fded in solib_read_symbols (so=0x6190000d8e80, flags=...) at /home/simark/src/binutils-gdb/gdb/solib.c:689
+    #2  0x000055555d96233d in solib_add (pattern=0x0, from_tty=0, readsyms=1) at /home/simark/src/binutils-gdb/gdb/solib.c:987
+    #3  0x000055555d93646e in enable_break (info=0x608000008f20, from_tty=0) at /home/simark/src/binutils-gdb/gdb/solib-svr4.c:2238
+    #4  0x000055555d93cfc0 in svr4_solib_create_inferior_hook (from_tty=0) at /home/simark/src/binutils-gdb/gdb/solib-svr4.c:3049
+    #5  0x000055555d96610d in solib_create_inferior_hook (from_tty=0) at /home/simark/src/binutils-gdb/gdb/solib.c:1195
+    #6  0x000055555cdee318 in post_create_inferior (from_tty=0) at /home/simark/src/binutils-gdb/gdb/infcmd.c:318
+    #7  0x000055555ce00e6e in setup_inferior (from_tty=0) at /home/simark/src/binutils-gdb/gdb/infcmd.c:2439
+    #8  0x000055555ce59c34 in handle_one (event=...) at /home/simark/src/binutils-gdb/gdb/infrun.c:4887
+    #9  0x000055555ce5cd00 in stop_all_threads () at /home/simark/src/binutils-gdb/gdb/infrun.c:5064
+    #10 0x000055555ce7f0da in stop_waiting (ecs=0x7fffffffd170) at /home/simark/src/binutils-gdb/gdb/infrun.c:8006
+    #11 0x000055555ce67f5c in handle_signal_stop (ecs=0x7fffffffd170) at /home/simark/src/binutils-gdb/gdb/infrun.c:6062
+    #12 0x000055555ce63653 in handle_inferior_event (ecs=0x7fffffffd170) at /home/simark/src/binutils-gdb/gdb/infrun.c:5727
+    #13 0x000055555ce4f297 in fetch_inferior_event () at /home/simark/src/binutils-gdb/gdb/infrun.c:4105
+    #14 0x000055555cdbe3bf in inferior_event_handler (event_type=INF_REG_EVENT) at /home/simark/src/binutils-gdb/gdb/inf-loop.c:42
+    #15 0x000055555d018047 in handle_target_event (error=0, client_data=0x0) at /home/simark/src/binutils-gdb/gdb/linux-nat.c:4060
+    #16 0x000055555e5ea77e in handle_file_event (file_ptr=0x60600008b1c0, ready_mask=1) at /home/simark/src/binutils-gdb/gdbsupport/event-loop.cc:575
+    #17 0x000055555e5eb09c in gdb_wait_for_event (block=0) at /home/simark/src/binutils-gdb/gdbsupport/event-loop.cc:701
+    #18 0x000055555e5e8d19 in gdb_do_one_event () at /home/simark/src/binutils-gdb/gdbsupport/event-loop.cc:212
+    #19 0x000055555dd6e0d4 in wait_sync_command_done () at /home/simark/src/binutils-gdb/gdb/top.c:528
+    #20 0x000055555dd6e372 in maybe_wait_sync_command_done (was_sync=0) at /home/simark/src/binutils-gdb/gdb/top.c:545
+    #21 0x000055555d0ec7c8 in catch_command_errors (command=0x55555ce01bb8 <attach_command(char const*, int)>, arg=0x7fffffffe28d "1472010", from_tty=1, do_bp_actions=false) at /home/simark/src/binutils-gdb/gdb/main.c:452
+    #22 0x000055555d0f03ad in captured_main_1 (context=0x7fffffffdd10) at /home/simark/src/binutils-gdb/gdb/main.c:1149
+    #23 0x000055555d0f1239 in captured_main (data=0x7fffffffdd10) at /home/simark/src/binutils-gdb/gdb/main.c:1232
+    #24 0x000055555d0f1315 in gdb_main (args=0x7fffffffdd10) at /home/simark/src/binutils-gdb/gdb/main.c:1257
+    #25 0x000055555bb70cf9 in main (argc=7, argv=0x7fffffffde88) at /home/simark/src/binutils-gdb/gdb/gdb.c:32
+
+Catching the exception at this point means that the thread_db_info
+object for this inferior will be left in place, despite the failure to
+load libthread_db.  This means that there won't be further attempts at
+loading libthread_db, because thread_db_load will think that
+libthread_db is already loaded for this inferior and will always exit
+early.  To fix this, add a try/catch around calling try_thread_db_load_1
+in try_thread_db_load, such that if some exception is thrown while
+trying to load libthread_db, we reset / delete the thread_db_info for
+that inferior.  That alone makes attach work fine again, because
+check_for_thread_db is called again in the thread_db_inferior_created
+observer (that happens after we learned about all shared libraries and
+their symbols), and libthread_db is successfully loaded then.
+
+When attaching, I think that the inferior_created observer is a good
+place to try to load libthread_db: it is called once everything has
+stabilized, when we learned about all shared libraries.
+
+The only problem then is that when we first try (and fail) to load
+libthread_db, in reaction to learning about libpthread, we show this
+warning:
+
+    warning: Unable to find libthread_db matching inferior's thread library, thread debugging will not be available.
+
+This is misleading, because we do succeed in loading it later.  So when
+attaching, I think we shouldn't try to load libthread_db in reaction to
+the new_objfile events, we should wait until we have learned about all
+shared libraries (using the inferior_created observable).  To do so, add
+an `in_initial_library_scan` flag to struct inferior.  This flag is used
+to postpone loading libthread_db if we are attaching or handling a fork
+child.
+
+When debugging remotely with GDBserver, the same problem happens, except
+that the qSymbol mechanism (allowing the remote side to ask GDB for
+symbols values) is involved.  The fix there is the same idea, we make
+GDB wait until all shared libraries and their symbols are known before
+sending out a qSymbol packet.  This way, we never present the remote
+side a state where libpthread.so's symbols are known but ld-linux's
+symbols aren't.
+
+gdb/ChangeLog:
+
+	* inferior.h (class inferior) <in_initial_library_scan>: New.
+	* infcmd.c (post_create_inferior): Set in_initial_library_scan.
+	* infrun.c (follow_fork_inferior): Likewise.
+	* linux-thread-db.c (try_thread_db_load): Catch exception thrown
+	by try_thread_db_load_1
+	(thread_db_load): Return early if in_initial_library_scan is
+	set.
+	* remote.c (remote_new_objfile): Return early if
+	in_initial_library_scan is set.
+
+Change-Id: I7a279836cfbb2b362b4fde11b196b4aab82f5efb
+
+diff --git a/gdb/infcmd.c b/gdb/infcmd.c
+--- a/gdb/infcmd.c
++++ b/gdb/infcmd.c
+@@ -313,6 +313,10 @@ post_create_inferior (struct target_ops *target, int from_tty)
+       const unsigned solib_add_generation
+ 	= current_program_space->solib_add_generation;
+ 
++      scoped_restore restore_in_initial_library_scan
++	= make_scoped_restore (&current_inferior ()->in_initial_library_scan,
++			       true);
++
+       /* Create the hooks to handle shared library load and unload
+ 	 events.  */
+       solib_create_inferior_hook (from_tty);
+diff --git a/gdb/inferior.h b/gdb/inferior.h
+--- a/gdb/inferior.h
++++ b/gdb/inferior.h
+@@ -511,6 +511,10 @@ class inferior : public refcounted_object
+      architecture/description.  */
+   bool needs_setup = false;
+ 
++  /* True when we are reading the library list of the inferior during an
++     attach or handling a fork child.  */
++  bool in_initial_library_scan = false;
++
+   /* Private data used by the target vector implementation.  */
+   std::unique_ptr<private_inferior> priv;
+ 
+diff --git a/gdb/infrun.c b/gdb/infrun.c
+--- a/gdb/infrun.c
++++ b/gdb/infrun.c
+@@ -540,6 +540,9 @@ holding the child stopped.  Try \"set detach-on-fork\" or \
+ 		 breakpoint.  If a "cloned-VM" event was propagated
+ 		 better throughout the core, this wouldn't be
+ 		 required.  */
++	      scoped_restore restore_in_initial_library_scan
++		= make_scoped_restore (&child_inf->in_initial_library_scan,
++				       true);
+ 	      solib_create_inferior_hook (0);
+ 	    }
+ 	}
+@@ -675,6 +678,8 @@ holding the child stopped.  Try \"set detach-on-fork\" or \
+ 	     shared libraries, and install the solib event breakpoint.
+ 	     If a "cloned-VM" event was propagated better throughout
+ 	     the core, this wouldn't be required.  */
++	  scoped_restore restore_in_initial_library_scan
++	    = make_scoped_restore (&child_inf->in_initial_library_scan, true);
+ 	  solib_create_inferior_hook (0);
+ 	}
+ 
+diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
+--- a/gdb/linux-thread-db.c
++++ b/gdb/linux-thread-db.c
+@@ -1012,8 +1012,17 @@ try_thread_db_load (const char *library, bool check_auto_load_safe)
+   if (strchr (library, '/') != NULL)
+     info->filename = gdb_realpath (library).release ();
+ 
+-  if (try_thread_db_load_1 (info))
+-    return true;
++  try
++    {
++      if (try_thread_db_load_1 (info))
++	return true;
++    }
++  catch (const gdb_exception_error &except)
++    {
++      if (libthread_db_debug)
++	exception_fprintf (gdb_stdlog, except,
++			   "Warning: While trying to load libthread_db: ");
++    }
+ 
+   /* This library "refused" to work on current inferior.  */
+   delete_thread_db_info (current_inferior ()->process_target (),
+@@ -1184,10 +1193,15 @@ has_libpthread (void)
+ static bool
+ thread_db_load (void)
+ {
+-  struct thread_db_info *info;
++  inferior *inf = current_inferior ();
+ 
+-  info = get_thread_db_info (current_inferior ()->process_target (),
+-			     inferior_ptid.pid ());
++  /* When attaching / handling fork child, don't try loading libthread_db
++     until we know about all shared libraries.  */
++  if (inf->in_initial_library_scan)
++    return false;
++
++  thread_db_info *info = get_thread_db_info (inf->process_target (),
++					     inferior_ptid.pid ());
+ 
+   if (info != NULL)
+     return true;
+diff --git a/gdb/remote.c b/gdb/remote.c
+--- a/gdb/remote.c
++++ b/gdb/remote.c
+@@ -14299,8 +14299,26 @@ remote_new_objfile (struct objfile *objfile)
+ {
+   remote_target *remote = get_current_remote_target ();
+ 
+-  if (remote != NULL)			/* Have a remote connection.  */
+-    remote->remote_check_symbols ();
++  /* First, check whether the current inferior's process target is a remote
++     target.  */
++  if (remote == nullptr)
++    return;
++
++  /* When we are attaching or handling a fork child and the shared library
++     subsystem reads the list of loaded libraries, we receive new objfile
++     events in between each found library.  The libraries are read in an
++     undefined order, so if we gave the remote side a chance to look up
++     symbols between each objfile, we might give it an inconsistent picture
++     of the inferior.  It could appear that a library A appears loaded but
++     a library B does not, even though library A requires library B.  That
++     would present a state that couldn't normally exist in the inferior.
++
++     So, skip these events, we'll give the remote a chance to look up symbols
++     once all the loaded libraries and their symbols are known to GDB.  */
++    if (current_inferior ()->in_initial_library_scan)
++      return;
++
++  remote->remote_check_symbols ();
+ }
+ 
+ /* Pull all the tracepoints defined on the target and create local

SOURCES/gdb-rhbz1971095-libthread_db-update-2of5.patch

@@ -0,0 +1,148 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Wed, 9 Jun 2021 18:07:45 -0700
+Subject: gdb-rhbz1971095-libthread_db-update-2of5.patch
+
+;; Backport "libthread_db initialization changes related to upcoming
+;; glibc-2.34"
+;; (Kevin Buettner, RH BZ 19710950
+
+This commit makes some adjustments to accomodate the upcoming
+glibc-2.34 release.  Beginning with glibc-2.34, functionality formerly
+contained in libpthread has been moved to libc.  For the time being,
+libpthread.so still exists in the file system, but it won't show up in
+ldd output and therefore won't be able to trigger initialization of
+libthread_db related code.  E.g...
+
+Fedora 34 / glibc-2.33.9000:
+
+[kev@f34-2 gdb]$ ldd testsuite/outputs/gdb.threads/tls/tls
+	linux-vdso.so.1 (0x00007ffcf94fa000)
+	libstdc++.so.6 => /lib64/libstdc++.so.6 (0x00007ff0ba9af000)
+	libm.so.6 => /lib64/libm.so.6 (0x00007ff0ba8d4000)
+	libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x00007ff0ba8b9000)
+	libc.so.6 => /lib64/libc.so.6 (0x00007ff0ba6c6000)
+	/lib64/ld-linux-x86-64.so.2 (0x00007ff0babf0000)
+
+Fedora 34 / glibc-2.33:
+
+[kev@f34-1 gdb]$ ldd testsuite/outputs/gdb.threads/tls/tls
+	linux-vdso.so.1 (0x00007fff32dc0000)
+	libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f815f6de000)
+	libstdc++.so.6 => /lib64/libstdc++.so.6 (0x00007f815f4bf000)
+	libm.so.6 => /lib64/libm.so.6 (0x00007f815f37b000)
+	libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x00007f815f360000)
+	libc.so.6 => /lib64/libc.so.6 (0x00007f815f191000)
+	/lib64/ld-linux-x86-64.so.2 (0x00007f815f721000)
+
+Note that libpthread is missing from the ldd output for the
+glibc-2.33.9000 machine.
+
+This means that (unless we happen to think of some entirely different
+mechanism), we'll now need to potentially match "libc" in addition to
+"libpthread" as libraries which might be thread libraries.  This
+accounts for the change made in solib.c.  Note that the new code
+attempts to match "/libc." via strstr().  That trailing dot (".")
+avoids inadvertently matching libraries such as libcrypt (and
+all the other many libraries which begin with "libc").
+
+To avoid attempts to load libthread_db when encountering older
+versions of libc, we now attempt to find "pthread_create" (which is a
+symbol that we'd expect to be in any pthread library) in the
+associated objfile.  This accounts for the changes in
+linux-thread-db.c.
+
+I think that other small adjustments will need to be made elsewhere
+too.  I've been working through regressions on my glibc-2.33.9000
+machine; I've fixed some fairly "obvious" changes in the testsuite
+(which are in other commits).  For the rest, it's not yet clear to me
+whether the handful of remaining failures represent a problem in glibc
+or gdb.  I'm still investigating, however, I'll note that these are
+problems that I only see on my glibc-2.33.9000 machine.
+
+gdb/ChangeLog:
+
+	* solib.c (libpthread_name_p): Match "libc" in addition
+	to "libpthread".
+	* linux-thread-db.c (libpthread_objfile_p): New function.
+	(libpthread_name_p): Adjust preexisting callers to use
+	libpthread_objfile_p().
+
+diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
+--- a/gdb/linux-thread-db.c
++++ b/gdb/linux-thread-db.c
+@@ -800,6 +800,24 @@ check_thread_db (struct thread_db_info *info, bool log_progress)
+   return test_passed;
+ }
+ 
++/* Predicate which tests whether objfile OBJ refers to the library
++   containing pthread related symbols.  Historically, this library has
++   been named in such a way that looking for "libpthread" in the name
++   was sufficient to identify it.  As of glibc-2.34, the C library
++   (libc) contains the thread library symbols.  Therefore we check
++   that the name matches a possible thread library, but we also check
++   that it contains at least one of the symbols (pthread_create) that
++   we'd expect to find in the thread library.  */
++
++static bool
++libpthread_objfile_p (objfile *obj)
++{
++  return (libpthread_name_p (objfile_name (obj))
++          && lookup_minimal_symbol ("pthread_create",
++	                            NULL,
++				    obj).minsym != NULL);
++}
++
+ /* Attempt to initialize dlopen()ed libthread_db, described by INFO.
+    Return true on success.
+    Failure could happen if libthread_db does not have symbols we expect,
+@@ -1072,7 +1090,7 @@ try_thread_db_load_from_pdir (const char *subdir)
+     return false;
+ 
+   for (objfile *obj : current_program_space->objfiles ())
+-    if (libpthread_name_p (objfile_name (obj)))
++    if (libpthread_objfile_p (obj))
+       {
+ 	if (try_thread_db_load_from_pdir_1 (obj, subdir))
+ 	  return true;
+@@ -1181,7 +1199,7 @@ static bool
+ has_libpthread (void)
+ {
+   for (objfile *obj : current_program_space->objfiles ())
+-    if (libpthread_name_p (objfile_name (obj)))
++    if (libpthread_objfile_p (obj))
+       return true;
+ 
+   return false;
+@@ -1295,7 +1313,7 @@ thread_db_new_objfile (struct objfile *objfile)
+ 	 of the list of shared libraries to load, and in an app of several
+ 	 thousand shared libraries, this can otherwise be painful.  */
+       && ((objfile->flags & OBJF_MAINLINE) != 0
+-	  || libpthread_name_p (objfile_name (objfile))))
++	  || libpthread_objfile_p (objfile)))
+     check_for_thread_db ();
+ }
+ 
+diff --git a/gdb/solib.c b/gdb/solib.c
+--- a/gdb/solib.c
++++ b/gdb/solib.c
+@@ -906,12 +906,17 @@ Do you need \"set solib-search-path\" or \"set sysroot\"?"),
+ 
+    Uses a fairly simplistic heuristic approach where we check
+    the file name against "/libpthread".  This can lead to false
+-   positives, but this should be good enough in practice.  */
++   positives, but this should be good enough in practice.
++
++   As of glibc-2.34, functions formerly residing in libpthread have
++   been moved to libc, so "/libc." needs to be checked too.  (Matching
++   the "." will avoid matching libraries such as libcrypt.) */
+ 
+ bool
+ libpthread_name_p (const char *name)
+ {
+-  return (strstr (name, "/libpthread") != NULL);
++  return (strstr (name, "/libpthread") != NULL
++          || strstr (name, "/libc.") != NULL );
+ }
+ 
+ /* Return non-zero if SO is the libpthread shared library.  */

SOURCES/gdb-rhbz1971095-libthread_db-update-3of5.patch

@@ -0,0 +1,71 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Wed, 9 Jun 2021 18:56:23 -0700
+Subject: gdb-rhbz1971095-libthread_db-update-3of5.patch
+
+;; Backport "testsuite/glib-2.34: Match/consume optional libthread_db
+;; related output"
+;; (Kevin Buettner, RH BZ 19710950
+
+When using glibc-2.34, we now see messages related to the loading of
+the thread library for non-thread programs.  E.g.  for the test case,
+gdb.base/execl-update-breakpoints.exp, we will see the following when
+starting the program:
+
+(gdb) break -qualified main
+Breakpoint 1 at 0x100118c: file /ironwood1/sourceware-git/f34-2-glibc244_fix/bld/../../worktree-glibc244_fix/gdb/testsuite/gdb.base/execl-update-breakpoints.c, line 34.
+(gdb) run
+Starting program: [...]/execl-update-breakpoints1
+[Thread debugging using libthread_db enabled]
+Using host libthread_db library "/lib64/libthread_db.so.1".
+
+The two lines of output related to libthread_db are new; we didn't see
+these in the past.  This is a side effect of libc now containing the
+pthread API - we can no longer tell whether the program is
+multi-threaded by simply looking for libpthread.so.  That said, I
+think that we now want to load libthread_db anyway since it's used to
+resolve TLS variables; i.e. we need it for correctly determining the
+value of errno.
+
+This commit adds the necessary regular expressions to match this
+(optional) additional output in the two tests which were failing
+without it.
+
+gdb/testsuite/ChangeLog:
+
+	* gdb.base/execl-update-breakpoints.exp: Add regular
+	expression for optionally matching output related to
+	libthread_db.
+	* gdb.base/fork-print-inferior-events.exp: Likewise.
+
+diff --git a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
+--- a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
++++ b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
+@@ -132,6 +132,7 @@ proc test { always_inserted } {
+ 	"Continuing\\.\r\n" \
+ 	"${not_nl} is executing new program: ${not_nl}\r\n" \
+ 	"(Reading ${not_nl} from remote target\\.\\.\\.\r\n)*" \
++	"(?:.Thread debugging using .*? enabled.\r\nUsing .*? library .*?\\.\r\n)?" \
+ 	"\r\n" \
+ 	"Breakpoint 1, main.*$gdb_prompt $"
+     set message "continue across exec"
+diff --git a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp b/gdb/testsuite/gdb.base/fork-print-inferior-events.exp
+--- a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp
++++ b/gdb/testsuite/gdb.base/fork-print-inferior-events.exp
+@@ -59,6 +59,7 @@ set detach_child_re "${reading_re}\\\[Detaching after fork from child .*\\\]\r\n
+ set detach_parent_re "${reading_re}\\\[Detaching after fork from parent .*\\\]\r\n"
+ set new_inf_re "${reading_re}\\\[New inferior $decimal \\(.*\\)\\\]\r\n"
+ set inf_detached_re "${reading_re}\\\[Inferior $decimal \\(.*\\) detached\\\]\r\n"
++set thread_db_re "(?:\\\[Thread debugging using .*? enabled\\\]\r\nUsing .*? library .*?\\.\r\n)?"
+ 
+ set expected_output [list \
+ 			 "${attach_child_re}${new_inf_re}${detach_parent_re}${inf_detached_re}" \
+@@ -84,7 +85,7 @@ foreach_with_prefix print_inferior_events { "on" "off" } {
+ 	    set output [lindex $expected_output $i]
+ 	    # Always add the "Starting program..." string so that we
+ 	    # match exactly the lines we want.
+-	    set output "Starting program: $binfile\\s*\r\n${output}${exited_normally_re}"
++	    set output "Starting program: $binfile\\s*\r\n${thread_db_re}${output}${thread_db_re}${exited_normally_re}"
+ 	    set i [expr $i + 1]
+ 	    gdb_test "run" $output
+ 	}

SOURCES/gdb-rhbz1971095-libthread_db-update-4of5.patch

@@ -0,0 +1,88 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Wed, 9 Jun 2021 19:31:18 -0700
+Subject: gdb-rhbz1971095-libthread_db-update-4of5.patch
+
+;; Backport "print-symbol-loading.exp: Allow libc symbols to be already loaded"
+;; (Kevin Buettner, RH BZ 1971095)
+
+One consequence of changing libpthread_name_p() in solib.c to (also)
+match libc is that the symbols for libc will now be loaded by
+solib_add() in solib.c.  I think this is mostly harmless because
+we'll likely want these symbols to be loaded anyway, but it did cause
+two failures in gdb.base/print-symbol-loading.exp.
+
+Specifically...
+
+1)
+
+sharedlibrary .*
+(gdb) PASS: gdb.base/print-symbol-loading.exp: shlib off: load shared-lib
+
+now looks like this:
+
+sharedlibrary .*
+Symbols already loaded for /lib64/libc.so.6
+(gdb) PASS: gdb.base/print-symbol-loading.exp: shlib off: load shared-lib
+
+2)
+
+sharedlibrary .*
+Loading symbols for shared libraries: .*
+(gdb) PASS: gdb.base/print-symbol-loading.exp: shlib brief: load shared-lib
+
+now looks like this:
+
+sharedlibrary .*
+Loading symbols for shared libraries: .*
+Symbols already loaded for /lib64/libc.so.6
+(gdb) PASS: gdb.base/print-symbol-loading.exp: shlib brief: load shared-lib
+
+Fixing case #2 ended up being easier than #1.  #1 had been using
+gdb_test_no_output to correctly match this no-output case.  I
+ended up replacing it with gdb_test_multiple, matching the exact
+expected output for each of the two now acceptable cases.
+
+For case #2, I simply added an optional non-capturing group
+for the potential new output.
+
+gdb/testsuite/ChangeLog:
+
+	* gdb.base/print-symbol-loading.exp (proc test_load_shlib):
+	Allow "Symbols already loaded for..." messages.
+
+diff --git a/gdb/testsuite/gdb.base/print-symbol-loading.exp b/gdb/testsuite/gdb.base/print-symbol-loading.exp
+--- a/gdb/testsuite/gdb.base/print-symbol-loading.exp
++++ b/gdb/testsuite/gdb.base/print-symbol-loading.exp
+@@ -96,6 +96,7 @@ test_load_core full
+ 
+ proc test_load_shlib { print_symbol_loading } {
+     global binfile
++    global gdb_prompt
+     with_test_prefix "shlib ${print_symbol_loading}" {
+ 	clean_restart ${binfile}
+ 	gdb_test_no_output "set auto-solib-add off"
+@@ -106,12 +107,20 @@ proc test_load_shlib { print_symbol_loading } {
+ 	set test_name "load shared-lib"
+ 	switch ${print_symbol_loading} {
+ 	    "off" {
+-		gdb_test_no_output "sharedlibrary .*" \
+-		    ${test_name}
++		set cmd "sharedlibrary .*"
++		set cmd_regex [string_to_regexp $cmd]
++		gdb_test_multiple $cmd $test_name {
++		    -re "^$cmd_regex\r\n$gdb_prompt $" {
++			pass $test_name
++		    }
++		    -re "^$cmd_regex\r\nSymbols already loaded for\[^\r\n\]*\\/libc\\.\[^\r\n\]*\r\n$gdb_prompt $" {
++			pass $test_name
++		    }
++		}
+ 	    }
+ 	    "brief" {
+ 		gdb_test "sharedlibrary .*" \
+-		    "Loading symbols for shared libraries: \\.\\*" \
++		    "Loading symbols for shared libraries: \\.\\*.*?(?:Symbols already loaded for .*?libc)?" \
+ 		    ${test_name}
+ 	    }
+ 	    "full" {