Merge remote-tracking branch 'up/main' into main-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,4 +1,4 @@
-/binutils-gdb
+/new-fedora-release
 /gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz
-/v2.0.2.tar.gz
-/gdb-10.1.tar.xz
+/v2.0.5.tar.gz
+/gdb-14.1.tar.xz

_gdb.spec.Patch.include

@@ -1,384 +1,204 @@
-# Match the Fedora's version info.
-#=fedora
+# Check distro name is included in the version output.
 Patch001: gdb-6.3-rh-testversion-20041202.patch
 
-# VLA (Fortran dynamic arrays) from Intel + archer-jankratochvil-vla tests.
-#=push
-Patch002: gdb-vla-intel-fortran-strides.patch
-
-#=push
-Patch003: gdb-vla-intel-fortran-vla-strings.patch
-
-#=push+jan
-Patch004: gdb-vla-intel-stringbt-fix.patch
-
 # Add a wrapper script to GDB that implements pstack using the
 # --readnever option.
 #=push
-Patch005: gdb-6.3-gstack-20050411.patch
-
-# VSYSCALL and PIE
-#=fedoratest
-Patch006: gdb-6.3-test-pie-20050107.patch
-
-# Get selftest working with sep-debug-info
-#=fedoratest
-Patch007: gdb-6.3-test-self-20050110.patch
-
-# Test support of multiple destructors just like multiple constructors
-#=fedoratest
-Patch008: gdb-6.3-test-dtorfix-20050121.patch
-
-# Fix to support executable moving
-#=fedoratest
-Patch009: gdb-6.3-test-movedir-20050125.patch
-
-# Test sibling threads to set threaded watchpoints for x86 and x86-64
-#=fedoratest
-Patch010: gdb-6.3-threaded-watchpoints2-20050225.patch
-
-# Verify printing of inherited members test
-#=fedoratest
-Patch012: gdb-6.3-inheritancetest-20050726.patch
+Patch002: gdb-6.3-gstack-20050411.patch
 
 # Support TLS symbols (+`errno' suggestion if no pthread is found) (BZ 185337).
 #=push+jan: It should be replaced by Infinity project.
-Patch013: 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.
-Patch014: 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.
-Patch015: gdb-6.5-BEA-testsuite.patch
-
-# Testcase for deadlocking on last address space byte; for corrupted backtraces.
-#=fedoratest
-Patch016: gdb-6.5-last-address-space-byte-test.patch
-
-# Fix readline segfault on excessively long hand-typed lines.
-#=fedoratest
-Patch017: gdb-6.5-readline-long-line-crash-test.patch
+Patch003: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
 
 # Test sideeffects of skipping ppc .so libs trampolines (BZ 218379).
 #=fedoratest
-Patch018: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
-
-# Fix lockup on trampoline vs. its function lookup; unreproducible (BZ 218379).
-#=fedora
-Patch019: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
-
-# Find symbols properly at their original (included) file (BZ 109921).
-#=fedoratest
-Patch020: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
-
-# Update PPC unwinding patches to their upstream variants (BZ 140532).
-#=fedoratest
-Patch021: gdb-6.3-bz140532-ppc-unwinding-test.patch
-
-# Testcase for exec() from threaded program (BZ 202689).
-#=fedoratest
-Patch022: gdb-6.3-bz202689-exec-from-pthread-test.patch
-
-# Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
-#=fedoratest
-Patch023: gdb-6.6-bz230000-power6-disassembly-test.patch
+Patch004: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
 
 # Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
 #=fedoratest
-Patch024: gdb-6.6-bz229517-gcore-without-terminal.patch
+Patch005: gdb-6.6-bz229517-gcore-without-terminal.patch
 
 # Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
 #=fedoratest
-Patch025: gdb-6.6-testsuite-timeouts.patch
+Patch006: gdb-6.6-testsuite-timeouts.patch
 
 # Support for stepping over PPC atomic instruction sequences (BZ 237572).
 #=fedoratest
-Patch026: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
+Patch007: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
+
+# Test kernel VDSO decoding while attaching to an i386 process.
+#=fedoratest
+Patch008: gdb-6.3-attach-see-vdso-test.patch
 
 # Test leftover zombie process (BZ 243845).
 #=fedoratest
-Patch028: gdb-6.5-bz243845-stale-testing-zombie-test.patch
+Patch009: gdb-6.5-bz243845-stale-testing-zombie-test.patch
 
 # New locating of the matching binaries from the pure core file (build-id).
 #=push+jan
-Patch029: gdb-6.6-buildid-locate.patch
+Patch010: 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
-Patch030: gdb-6.6-buildid-locate-solib-missing-ids.patch
+Patch011: gdb-6.6-buildid-locate-solib-missing-ids.patch
 
 #=push+jan
-Patch031: 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.
-Patch032: gdb-6.7-charsign-test.patch
+Patch012: gdb-6.6-buildid-locate-rpm.patch
 
 # Test PPC hiding of call-volatile parameter register.
 #=fedoratest
-Patch033: gdb-6.7-ppc-clobbered-registers-O2-test.patch
+Patch013: gdb-6.7-ppc-clobbered-registers-O2-test.patch
 
-# Testsuite fixes for more stable/comparable results.
+# Test gcore memory and time requirements for large inferiors.
 #=fedoratest
-Patch034: gdb-6.7-testsuite-stable-results.patch
-
-# Test ia64 memory leaks of the code using libunwind.
-#=fedoratest
-Patch035: gdb-6.5-ia64-libunwind-leak-test.patch
-
-# Test hiding unexpected breakpoints on intentional step commands.
-#=fedoratest
-Patch036: gdb-6.5-missed-trap-on-step-test.patch
+Patch014: 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.
-Patch038: gdb-6.3-mapping-zero-inode-test.patch
-
-# Test a crash on `focus cmd', `focus prev' commands.
-#=fedoratest
-Patch039: gdb-6.3-focus-cmd-prev-test.patch
-
-# Test various forms of threads tracking across exec() (BZ 442765).
-#=fedoratest
-Patch040: gdb-6.8-bz442765-threaded-exec-test.patch
+Patch015: gdb-6.3-mapping-zero-inode-test.patch
 
 # Test a crash on libraries missing the .text section.
 #=fedoratest
-Patch041: gdb-6.5-section-num-fixup-test.patch
+Patch016: gdb-6.5-section-num-fixup-test.patch
 
 # Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 #=fedoratest
-Patch042: gdb-6.8-bz466901-backtrace-full-prelinked.patch
+Patch017: gdb-6.8-bz466901-backtrace-full-prelinked.patch
 
 # New test for step-resume breakpoint placed in multiple threads at once.
 #=fedoratest
-Patch043: gdb-simultaneous-step-resume-breakpoint-test.patch
+Patch018: 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@.*>
-Patch044: gdb-core-open-vdso-warning.patch
-
-# Fix stepping with OMP parallel Fortran sections (BZ 533176).
-#=push+jan: It requires some better DWARF annotations.
-Patch045: gdb-bz533176-fortran-omp-step.patch
-
-# Workaround ccache making lineno non-zero for command-line definitions.
-#=fedoratest: ccache is rarely used and it is even fixed now.
-Patch046: gdb-ccache-workaround.patch
-
-#=push+jan: May get obsoleted by Tom's unrelocated objfiles patch.
-Patch047: gdb-archer-pie-addons.patch
-
-#=push+jan: Breakpoints disabling matching should not be based on address.
-Patch048: gdb-archer-pie-addons-keep-disabled.patch
-
-# Testcase for "Do not make up line information" fix by Daniel Jacobowitz.
-#=fedoratest
-Patch049: gdb-lineno-makeup-test.patch
-
-# Test power7 ppc disassembly.
-#=fedoratest
-Patch050: gdb-ppc-power7-test.patch
-
-# Workaround non-stop moribund locations exploited by kernel utrace (BZ 590623).
-#=push+jan: Currently it is still not fully safe.
-Patch051: gdb-moribund-utrace-workaround.patch
+Patch019: gdb-core-open-vdso-warning.patch
 
 # Fix follow-exec for C++ programs (bugreported by Martin Stransky).
 #=fedoratest
-Patch052: gdb-archer-next-over-throw-cxx-exec.patch
-
-# Backport DWARF-4 support (BZ 601887, Tom Tromey).
-#=fedoratest
-Patch053: gdb-bz601887-dwarf4-rh-test.patch
-
-#=push+jan
-Patch054: gdb-6.6-buildid-locate-core-as-arg.patch
+Patch020: gdb-archer-next-over-throw-cxx-exec.patch
 
 # Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
 #=push+jan
-Patch055: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+Patch021: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 
 # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
 #=fedoratest
-Patch056: gdb-test-bt-cfi-without-die.patch
+Patch022: gdb-test-bt-cfi-without-die.patch
 
 # Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
 #=fedoratest
-Patch057: gdb-bz634108-solib_address.patch
-
-# New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435).
-#=fedoratest
-Patch058: gdb-test-pid0-core.patch
+Patch023: gdb-bz634108-solib_address.patch
 
 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch059: gdb-test-dw2-aranges.patch
-
-# [archer-keiths-expr-cumulative+upstream] Import C++ testcases.
-#=fedoratest
-Patch060: gdb-test-expr-cumulative-archer.patch
-
-# Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
-#=fedoratest
-Patch061: gdb-physname-pr11734-test.patch
-
-# Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
-#=fedoratest
-Patch062: gdb-physname-pr12273-test.patch
-
-# Test GDB opcodes/ disassembly of Intel Ivy Bridge instructions (BZ 696890).
-#=fedoratest
-Patch063: gdb-test-ivy-bridge.patch
-
-# Hack for proper PIE run of the testsuite.
-#=fedoratest
-Patch064: gdb-runtest-pie-override.patch
-
-# Print reasons for failed attach/spawn incl. SELinux deny_ptrace (BZ 786878).
-#=push+jan
-Patch065: gdb-attach-fail-reasons-5of5.patch
+Patch024: gdb-test-dw2-aranges.patch
 
 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedoratest: Compatibility with RHELs (unchecked which ones).
-Patch066: gdb-glibc-strstr-workaround.patch
-
-# Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789).
-#=fedoratest
-Patch067: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
+Patch025: gdb-glibc-strstr-workaround.patch
 
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch068: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch026: 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
-Patch069: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
-
-# Fix crash of -readnow /usr/lib/debug/usr/bin/gnatbind.debug (BZ 1069211).
-#=push+jan
-Patch070: gdb-gnat-dwarf-crash-3of3.patch
+Patch027: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
 
 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch071: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch028: 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
-Patch072: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
-
-#=fedoratest
-Patch073: gdb-archer-vla-tests.patch
-
-#=fedoratest
-Patch074: gdb-vla-intel-tests.patch
-
-# Continue backtrace even if a frame filter throws an exception (Phil Muldoon).
-#=push
-Patch075: gdb-btrobust.patch
-
-# Display Fortran strings in backtraces.
-#=fedoratest
-Patch076: gdb-fortran-frame-string.patch
+Patch029: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 
 # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 # crash.' (RH BZ 1156192).
 #=fedoratest
-Patch077: gdb-rhbz1156192-recursive-dlopen-test.patch
-
-# Fix jit-reader.h for multi-lib.
-#=push+jan
-Patch078: gdb-jit-reader-multilib.patch
+Patch030: gdb-rhbz1156192-recursive-dlopen-test.patch
 
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch079: 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
-Patch080: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
-
-# Test 'info type-printers' Python error (RH BZ 1350436).
-#=fedoratest
-Patch081: gdb-rhbz1350436-type-printers-error.patch
+Patch031: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 
 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch082: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
-
-# Never kill PID on: gdb exec PID (Jan Kratochvil, RH BZ 1219747).
-#=push+jan
-Patch083: gdb-bz1219747-attach-kills.patch
+Patch032: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch084: gdb-fedora-libncursesw.patch
-
-# Test clflushopt instruction decode (for RH BZ 1262471).
-#=fedoratest
-Patch085: gdb-opcodes-clflushopt-test.patch
-
-# [rhel6] DTS backward Python compatibility API (BZ 1020004, Phil Muldoon).
-#=fedora
-Patch086: gdb-dts-rhel6-python-compat.patch
-
-# [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
-#=push+jan
-Patch087: gdb-6.6-buildid-locate-rpm-scl.patch
-
-# Make the GDB quit processing non-abortable to cleanup everything properly.
-#=fedora: It was useful only after gdb-6.8-attach-signalled-detach-stopped.patch .
-Patch088: gdb-6.8-quit-never-aborts.patch
+Patch033: gdb-fedora-libncursesw.patch
 
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch089: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch034: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 
 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch090: gdb-container-rh-pkg.patch
-
-# New test for Python "Cannot locate object file for block" (for RH BZ 1325795).
-#=fedoratest
-Patch091: gdb-rhbz1325795-framefilters-test.patch
+Patch035: gdb-container-rh-pkg.patch
 
 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch092: gdb-linux_perf-bundle.patch
+Patch036: gdb-linux_perf-bundle.patch
 
-# Fix gdb-headless /usr/bin/ executables (BZ 1390251).
+# Update gdb-add-index.sh such that, when the GDB environment
+# variable is not set, the script is smarter than just looking for
+# 'gdb' in the $PATH.
 #
-# Also, make /usr/bin/gdb.minimal be the default GDB used, if it's
-# present.  For rationale, see:
+# The actual search order is now: /usr/bin/gdb.minimal, gdb (in the
+# $PATH), then /usr/libexec/gdb.
+#
+# For the rationale of looking for gdb.minimal see:
 #
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
+#
 #=fedora
-Patch093: gdb-libexec-add-index.patch
+Patch037: gdb-add-index.patch
 
-# New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
-#=fedoratest
-Patch094: gdb-rhbz1398387-tab-crash-test.patch
+# Back-port upstream commit 1f0fab7ff86 as part of a fix for
+# non-deterministic gdb-index generation (RH BZ 2232086).
+Patch038: gdb-rhbz2232086-refactor-selftest-support.patch
 
-# Python patches of: http://sourceware.org/gdb/wiki/ProjectArcher
-#=push
-Patch095: gdb-archer.patch
+# Back-port upstream commit aa19bc1d259 as part of a fix for
+# non-deterministic gdb-index generation (RH BZ 2232086).
+Patch039: gdb-rhbz-2232086-reduce-size-of-gdb-index.patch
 
-# Revert upstream commit 469412dd9ccc4de5874fd3299b105833f36b34cd
-Patch096: gdb-vla-intel-fix-print-char-array.patch
+# Back-port upstream commit acc117b57f7 as part of a fix for
+# non-deterministic gdb-index generation (RH BZ 2232086).
+Patch040: gdb-rhbz-2232086-cpp-ify-mapped-symtab.patch
 
-# [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
-# =fedoratest
-Patch097: gdb-rhbz1553104-s390x-arch12-test.patch
+# Back-port upstream commit aff250145af as part of a fix for
+# non-deterministic gdb-index generation (RH BZ 2232086).
+Patch041: gdb-rhbz-2232086-generate-gdb-index-consistently.patch
+
+# Back-port upstream commit 3644f41dc80 as part of a fix for
+# non-deterministic gdb-index generation (RH BZ 2232086).
+Patch042: gdb-rhbz-2232086-generate-dwarf-5-index-consistently.patch
+
+
+Patch043: gdb-rhbz2250652-gdbpy_gil.patch
+
+
+Patch044: gdb-rhbz2250652-avoid-PyOS_ReadlineTState.patch
+
+# Backport potential fix for RH BZ 2257562.
+Patch045: gdb-rhbz2257562-cp-namespace-null-ptr-check.patch
+
+
+Patch046: gdb-ftbs-swapped-calloc-args.patch
+
+# Backport gdb: fix "list ." related crash
+Patch047: gdb-rhbz2259850-list-period-crash-fix.patch
+
+# Backport upstream workaround for GCC 14 problem which cause assertion
+# failures in GDB.
+Patch048: gdb-rhbz2261580-intrusive_list-assertion-fix.patch
 

_gdb.spec.patch.include

@@ -1,94 +1,48 @@
-%patch001 -p1
-%patch002 -p1
-%patch003 -p1
-%patch004 -p1
-%patch005 -p1
-%patch006 -p1
-%patch007 -p1
-%patch008 -p1
-%patch009 -p1
-%patch010 -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
-%patch028 -p1
-%patch029 -p1
-%patch030 -p1
-%patch031 -p1
-%patch032 -p1
-%patch033 -p1
-%patch034 -p1
-%patch035 -p1
-%patch036 -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
+%patch -p1 -P001
+%patch -p1 -P002
+%patch -p1 -P003
+%patch -p1 -P004
+%patch -p1 -P005
+%patch -p1 -P006
+%patch -p1 -P007
+%patch -p1 -P008
+%patch -p1 -P009
+%patch -p1 -P010
+%patch -p1 -P011
+%patch -p1 -P012
+%patch -p1 -P013
+%patch -p1 -P014
+%patch -p1 -P015
+%patch -p1 -P016
+%patch -p1 -P017
+%patch -p1 -P018
+%patch -p1 -P019
+%patch -p1 -P020
+%patch -p1 -P021
+%patch -p1 -P022
+%patch -p1 -P023
+%patch -p1 -P024
+%patch -p1 -P025
+%patch -p1 -P026
+%patch -p1 -P027
+%patch -p1 -P028
+%patch -p1 -P029
+%patch -p1 -P030
+%patch -p1 -P031
+%patch -p1 -P032
+%patch -p1 -P033
+%patch -p1 -P034
+%patch -p1 -P035
+%patch -p1 -P036
+%patch -p1 -P037
+%patch -p1 -P038
+%patch -p1 -P039
+%patch -p1 -P040
+%patch -p1 -P041
+%patch -p1 -P042
+%patch -p1 -P043
+%patch -p1 -P044
+%patch -p1 -P045
+%patch -p1 -P046
+%patch -p1 -P047
+%patch -p1 -P048

_git_upstream_commit

@@ -1 +1 @@
-606e3fd147ed9a00df165e46f30fe5c46dcda345
+6bda1c19bcd16eff8488facb8a67d52a436f70e7

_patch_order

@@ -1,26 +1,7 @@
 gdb-6.3-rh-testversion-20041202.patch
-gdb-vla-intel-fortran-strides.patch
-gdb-vla-intel-fortran-vla-strings.patch
-gdb-vla-intel-stringbt-fix.patch
 gdb-6.3-gstack-20050411.patch
-gdb-6.3-test-pie-20050107.patch
-gdb-6.3-test-self-20050110.patch
-gdb-6.3-test-dtorfix-20050121.patch
-gdb-6.3-test-movedir-20050125.patch
-gdb-6.3-threaded-watchpoints2-20050225.patch
-gdb-6.3-inferior-notification-20050721.patch
-gdb-6.3-inheritancetest-20050726.patch
 gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
-gdb-6.5-sharedlibrary-path.patch
-gdb-6.5-BEA-testsuite.patch
-gdb-6.5-last-address-space-byte-test.patch
-gdb-6.5-readline-long-line-crash-test.patch
 gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
-gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
-gdb-6.5-bz109921-DW_AT_decl_file-test.patch
-gdb-6.3-bz140532-ppc-unwinding-test.patch
-gdb-6.3-bz202689-exec-from-pthread-test.patch
-gdb-6.6-bz230000-power6-disassembly-test.patch
 gdb-6.6-bz229517-gcore-without-terminal.patch
 gdb-6.6-testsuite-timeouts.patch
 gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
@@ -29,69 +10,39 @@ gdb-6.5-bz243845-stale-testing-zombie-test.patch
 gdb-6.6-buildid-locate.patch
 gdb-6.6-buildid-locate-solib-missing-ids.patch
 gdb-6.6-buildid-locate-rpm.patch
-gdb-6.7-charsign-test.patch
 gdb-6.7-ppc-clobbered-registers-O2-test.patch
-gdb-6.7-testsuite-stable-results.patch
-gdb-6.5-ia64-libunwind-leak-test.patch
-gdb-6.5-missed-trap-on-step-test.patch
 gdb-6.5-gcore-buffer-limit-test.patch
 gdb-6.3-mapping-zero-inode-test.patch
-gdb-6.3-focus-cmd-prev-test.patch
-gdb-6.8-bz442765-threaded-exec-test.patch
 gdb-6.5-section-num-fixup-test.patch
 gdb-6.8-bz466901-backtrace-full-prelinked.patch
 gdb-simultaneous-step-resume-breakpoint-test.patch
 gdb-core-open-vdso-warning.patch
-gdb-bz533176-fortran-omp-step.patch
-gdb-ccache-workaround.patch
-gdb-archer-pie-addons.patch
-gdb-archer-pie-addons-keep-disabled.patch
-gdb-lineno-makeup-test.patch
-gdb-ppc-power7-test.patch
-gdb-moribund-utrace-workaround.patch
 gdb-archer-next-over-throw-cxx-exec.patch
-gdb-bz601887-dwarf4-rh-test.patch
-gdb-6.6-buildid-locate-core-as-arg.patch
 gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 gdb-test-bt-cfi-without-die.patch
 gdb-bz634108-solib_address.patch
-gdb-test-pid0-core.patch
 gdb-test-dw2-aranges.patch
-gdb-test-expr-cumulative-archer.patch
-gdb-physname-pr11734-test.patch
-gdb-physname-pr12273-test.patch
-gdb-test-ivy-bridge.patch
-gdb-runtest-pie-override.patch
-gdb-attach-fail-reasons-5of5.patch
 gdb-glibc-strstr-workaround.patch
-gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
 gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
 gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
-gdb-gnat-dwarf-crash-3of3.patch
 gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
 gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
-gdb-archer-vla-tests.patch
-gdb-vla-intel-tests.patch
-gdb-btrobust.patch
-gdb-fortran-frame-string.patch
 gdb-rhbz1156192-recursive-dlopen-test.patch
-gdb-jit-reader-multilib.patch
 gdb-rhbz1149205-catch-syscall-after-fork-test.patch
-gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
-gdb-rhbz1350436-type-printers-error.patch
 gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
-gdb-bz1219747-attach-kills.patch
 gdb-fedora-libncursesw.patch
-gdb-opcodes-clflushopt-test.patch
-gdb-dts-rhel6-python-compat.patch
-gdb-6.6-buildid-locate-rpm-scl.patch
-gdb-6.8-quit-never-aborts.patch
 gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 gdb-container-rh-pkg.patch
-gdb-rhbz1325795-framefilters-test.patch
 gdb-linux_perf-bundle.patch
-gdb-libexec-add-index.patch
-gdb-rhbz1398387-tab-crash-test.patch
-gdb-archer.patch
-gdb-vla-intel-fix-print-char-array.patch
-gdb-rhbz1553104-s390x-arch12-test.patch
+gdb-add-index.patch
+gdb-rhbz2232086-refactor-selftest-support.patch
+gdb-rhbz-2232086-reduce-size-of-gdb-index.patch
+gdb-rhbz-2232086-cpp-ify-mapped-symtab.patch
+gdb-rhbz-2232086-generate-gdb-index-consistently.patch
+gdb-rhbz-2232086-generate-dwarf-5-index-consistently.patch
+gdb-rhbz2250652-gdbpy_gil.patch
+gdb-rhbz2250652-avoid-PyOS_ReadlineTState.patch
+gdb-rhbz2257562-cp-namespace-null-ptr-check.patch
+gdb-ftbs-swapped-calloc-args.patch
+gdb-rhbz2259850-list-period-crash-fix.patch
+gdb-rhbz2261580-intrusive_list-assertion-fix.patch

gating.yaml

@@ -0,0 +1,19 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

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

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

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

@@ -1,320 +0,0 @@
-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
- }

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

@@ -1,109 +0,0 @@
-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"
-+   }
-+}

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

@@ -1,53 +0,0 @@
-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
-+    }
-+}

gdb-6.3-gstack-20050411.patch

@@ -16,7 +16,7 @@ Subject: gdb-6.3-gstack-20050411.patch
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
-@@ -1726,7 +1726,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
+@@ -2035,7 +2035,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
  install: all
  	@$(MAKE) $(FLAGS_TO_PASS) install-only
  
@@ -25,7 +25,7 @@ diff --git a/gdb/Makefile.in b/gdb/Makefile.in
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e "$$t"` ; \
  		if test "x$$transformed_name" = x; then \
-@@ -1775,7 +1775,25 @@ install-guile:
+@@ -2085,7 +2085,25 @@ install-guile:
  install-python:
  	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_DATADIR)/python/gdb
  
@@ -52,8 +52,8 @@ diff --git a/gdb/Makefile.in b/gdb/Makefile.in
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e $$t` ; \
  		if test "x$$transformed_name" = x; then \
-@@ -1798,6 +1816,18 @@ uninstall: force $(CONFIG_UNINSTALL)
- 	fi
+@@ -2116,6 +2134,18 @@ uninstall: force $(CONFIG_UNINSTALL)
+ 	rm -f $(DESTDIR)$(bindir)/$$transformed_name
  	@$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
  
 +.PHONY: uninstall-gstack
@@ -67,7 +67,7 @@ diff --git a/gdb/Makefile.in b/gdb/Makefile.in
 +		fi ; \
 +		rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \
 +		      $(DESTDIR)$(man1dir)/$$transformed_name.1
-+ 
++
  # The C++ name parser can be built standalone for testing.
  test-cp-name-parser.o: cp-name-parser.c
  	$(COMPILE) -DTEST_CPNAMES cp-name-parser.c
@@ -109,7 +109,7 @@ new file mode 100644
 +
 +# Run GDB, strip out unwanted noise.
 +# --readnever is no longer used since .gdb_index is now in use.
-+$GDB --quiet -nx $GDBARGS /proc/$1/exe $1 <<EOF 2>&1 | 
++$GDB --quiet -nx $GDBARGS /proc/$1/exe $1 <<EOF 2>&1 |
 +set width 0
 +set height 0
 +set pagination no
@@ -153,7 +153,7 @@ new file mode 100644
 +  /* Use the most simple notification not to get caught by attach on exiting
 +     the function.  */
 +  write (1, msg, strlen (msg));
-+  
++
 +  for (;;);
 +}
 +

gdb-6.3-inferior-notification-20050721.patch

@@ -1,323 +0,0 @@
-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,245 @@
-+# Copyright 2005 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+# 
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+# 
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# 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 [is_remote target] then {
-+    return 0
-+}
-+
-+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);
-+}

gdb-6.3-inheritancetest-20050726.patch

@@ -1,161 +0,0 @@
-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,32 @@
-+#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) {}

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

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

gdb-6.3-rh-testversion-20041202.patch

@@ -1,38 +1,34 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Elena Zannoni <ezannoni@redhat.com>
+From: Andrew Burgess <aburgess@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
+;; Check distro name is included in the version output.
 
-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, "Fedora %d.%d.%d", &vmajor, &vminor, &vrevision);
-   set_internalvar_integer (major_version_var, vmajor);
-   set_internalvar_integer (minor_version_var, vminor + (vrevision > 0));
- }
+diff --git a/gdb/testsuite/gdb.base/fedora-version.exp b/gdb/testsuite/gdb.base/fedora-version.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/fedora-version.exp
+@@ -0,0 +1,22 @@
++# Copyright 2023 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/>.
++
++# Start with a fresh gdb
++clean_restart
++
++# Check the version string contains either the Fedora or RHEL distro
++# name, and that the version number looks roughly correct in format.
++gdb_test "show version" \
++    "GNU gdb \\((Fedora Linux|Red Hat Enterprise Linux)\\) \[0-9\]+\\.\[0-9\]+-\[0-9\]+.*"

gdb-6.3-test-dtorfix-20050121.patch

@@ -1,247 +0,0 @@
-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"

gdb-6.3-test-movedir-20050125.patch

@@ -1,103 +0,0 @@
-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,10 @@
-+#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,7 @@
-+#include <stdlib.h>
-+
-+void other() {
-+  const char* ostring = "other";
-+  printf ("%s\n", ostring);;
-+}
-+

gdb-6.3-test-self-20050110.patch

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

gdb-6.3-threaded-watchpoints2-20050225.patch

@@ -1,254 +0,0 @@
-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,66 @@
-+/* 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].*in thread_function \\\(arg=0x2\\\) at .*watchthreads-threaded.c:$inc_line.*$gdb_prompt $"
-+       { set args_2 [expr $args_2+1]; set test_flag 1 }
-+    -re "Hardware watchpoint 4: args\\\[3\\\].*Old value = $args_3.*New value = [expr $args_3+1].*in thread_function \\\(arg=0x3\\\) at .*watchthreads-threaded.c:$inc_line.*$gdb_prompt $"
-+       { set args_3 [expr $args_3+1]; set test_flag 1 }
-+  }
-+  # If we fail above, don't bother continuing loop
-+  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 
-+}

gdb-6.5-BEA-testsuite.patch

@@ -1,938 +0,0 @@
-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

gdb-6.5-bz109921-DW_AT_decl_file-test.patch

@@ -1,134 +0,0 @@
-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;

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

@@ -44,17 +44,18 @@ glibc-debuginfo-2.7-2.x86_64: /usr/lib/debug/lib64/libc.so.6.debug:
 diff --git a/gdb/printcmd.c b/gdb/printcmd.c
 --- a/gdb/printcmd.c
 +++ b/gdb/printcmd.c
-@@ -1210,6 +1210,10 @@ print_command_1 (const char *args, int voidprint)
+@@ -1308,6 +1308,11 @@ process_print_command_args (const char *args, value_print_options *print_opts,
  
    if (exp != nullptr && *exp)
      {
 +      /* '*((int *(*) (void)) __errno_location) ()' is incompatible with
 +	 function descriptors.  */
-+      if (target_has_execution && strcmp (exp, "errno") == 0)
++      if (target_has_execution () && strcmp (exp, "errno") == 0)
 +	exp = "*(*(int *(*)(void)) __errno_location) ()";
-       expression_up expr = parse_expression (exp);
-       val = evaluate_expression (expr.get ());
-     }
++
+       /* This setting allows large arrays to be printed by limiting the
+ 	 number of elements that are loaded into GDB's memory; we only
+ 	 need to load as many array elements as we plan to print.  */
 diff --git a/gdb/testsuite/gdb.dwarf2/dw2-errno.c b/gdb/testsuite/gdb.dwarf2/dw2-errno.c
 new file mode 100644
 --- /dev/null

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

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

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

@@ -1,27 +0,0 @@
-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

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

@@ -10,26 +10,27 @@ diff --git a/gdb/testsuite/gdb.base/tracefork-zombie.exp b/gdb/testsuite/gdb.bas
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/tracefork-zombie.exp
-@@ -0,0 +1,75 @@
+@@ -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 [is_remote target] then {
-+    return 0
++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

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

@@ -24,7 +24,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+ 
++
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -40,7 +40,7 @@ new file mode 100644
 +int main()
 +{
 +  void *mem;
-+  
++
 +  mem = malloc (MEGS * 1024ULL * 1024ULL);
 +
 +  for (;;)
@@ -52,22 +52,27 @@ diff --git a/gdb/testsuite/gdb.base/gcore-excessive-memory.exp b/gdb/testsuite/g
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gcore-excessive-memory.exp
-@@ -0,0 +1,94 @@
+@@ -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.  
++# 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

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

@@ -1,130 +0,0 @@
-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,83 @@
-+# Copyright 2007 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+# 
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+# 
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
-+
-+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
-+    }
-+}

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

@@ -1,62 +0,0 @@
-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}

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

@@ -1,95 +0,0 @@
-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"

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

@@ -1,119 +0,0 @@
-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,104 @@
-+# 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(INPUTRC) 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
-+
-+    # Don't let a .inputrc file or an existing setting of INPUTRC mess up
-+    # the test results.  Even if /dev/null doesn't exist on the particular
-+    # platform, the readline library will use the default setting just by
-+    # failing to open the file.  OTOH, opening /dev/null successfully will
-+    # also result in the default settings being used since nothing will be
-+    # read from this file.
-+    set env(INPUTRC) "/dev/null"
-+
-+    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"
-+}

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

@@ -24,7 +24,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+ 
++
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -51,7 +51,7 @@ new file mode 100644
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
-+ 
++
 +   You should have received a copy of the GNU General Public License
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -68,22 +68,27 @@ diff --git a/gdb/testsuite/gdb.base/datalib.exp b/gdb/testsuite/gdb.base/datalib
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/datalib.exp
-@@ -0,0 +1,51 @@
+@@ -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.  
++# 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

gdb-6.5-sharedlibrary-path.patch

@@ -1,180 +0,0 @@
-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,25 @@
-+/* 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  */
-+
-+int main()
-+{
-+  return 0;
-+}
-diff --git a/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c b/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c
-new file mode 100644
---- /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,87 @@
-+# Copyright 2006 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+# 
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+# 
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
-+
-+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"
-+}

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

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

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

@@ -6,29 +6,6 @@ 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

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

@@ -1,128 +0,0 @@
-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
-@@ -3025,6 +3025,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)
- 	{
-@@ -3036,6 +3046,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),

gdb-6.6-buildid-locate-rpm.patch

@@ -1,6 +1,6 @@
 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
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Wed, 22 Feb 2023 22:30:40 -0700
 Subject: gdb-6.6-buildid-locate-rpm.patch
 
 ;;=push+jan
@@ -14,7 +14,7 @@ diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
  
 +# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 +# serial 1 (pkg-config-0.24)
-+# 
++#
 +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 +#
 +# This program is free software; you can redistribute it and/or modify
@@ -133,11 +133,11 @@ diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
 +See the pkg-config man page for more details.])
 +
 +if test $pkg_failed = yes; then
-+   	AC_MSG_RESULT([no])
++        AC_MSG_RESULT([no])
 +        _PKG_SHORT_ERRORS_SUPPORTED
 +        if test $_pkg_short_errors_supported = yes; then
 +	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-+        else 
++        else
 +	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
 +        fi
 +	# Put the nasty error message in config.log where it belongs
@@ -154,7 +154,7 @@ diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
 +_PKG_TEXT])[]dnl
 +        ])
 +elif test $pkg_failed = untried; then
-+     	AC_MSG_RESULT([no])
++        AC_MSG_RESULT([no])
 +	m4_default([$4], [AC_MSG_FAILURE(
 +[The pkg-config script could not be found or is too old.  Make sure it
 +is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -235,458 +235,41 @@ diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
 diff --git a/gdb/build-id.c b/gdb/build-id.c
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
-@@ -33,6 +33,7 @@
- #include "gdb_bfd.h"
- #include "gdbcmd.h"
- #include "gdbcore.h"
-+#include "inferior.h"
- #include "objfiles.h"
- #include "observable.h"
- #include "symfile.h"
-@@ -697,8 +698,374 @@ build_id_to_filename (const struct bfd_build_id *build_id, char **link_return)
-   return result;
- }
+@@ -780,10 +780,10 @@ missing_rpm_enlist_1 (const char *filename, int verify_vendor)
+   static rpmts (*rpmtsCreate_p) (void);
+   extern rpmts rpmtsFree(rpmts ts);
+   static rpmts (*rpmtsFree_p) (rpmts ts);
+-  extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag,
++  extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmDbiTagVal rpmtag,
+                                               const void * keyp, size_t keylen);
+   static rpmdbMatchIterator (*rpmtsInitIterator_p) (const rpmts ts,
+-						    rpmTag rpmtag,
++						    rpmDbiTagVal rpmtag,
+ 						    const void *keyp,
+ 						    size_t keylen);
+ #else	/* !DLOPEN_LIBRPM */
+@@ -838,7 +838,7 @@ missing_rpm_enlist_1 (const char *filename, int verify_vendor)
+ 	      && (rpmdbNextIterator_p = (Header (*) (rpmdbMatchIterator mi)) dlsym (h, "rpmdbNextIterator"))
+ 	      && (rpmtsCreate_p = (rpmts (*) (void)) dlsym (h, "rpmtsCreate"))
+ 	      && (rpmtsFree_p = (rpmts (*) (rpmts ts)) dlsym (h, "rpmtsFree"))
+-	      && (rpmtsInitIterator_p = (rpmdbMatchIterator (*) (const rpmts ts, rpmTag rpmtag, const void *keyp, size_t keylen)) dlsym (h, "rpmtsInitIterator"))))
++	      && (rpmtsInitIterator_p = (rpmdbMatchIterator (*) (const rpmts ts, rpmDbiTagVal rpmtag, const void *keyp, size_t keylen)) dlsym (h, "rpmtsInitIterator"))))
+ 	  {
+ 	    warning (_("Opened library \"%s\" is incompatible (%s), "
+ 		      "missing debuginfos notifications will not be displayed"),
+@@ -926,7 +926,7 @@ missing_rpm_enlist_1 (const char *filename, int verify_vendor)
  
-+#ifdef HAVE_LIBRPM
-+
-+#include <rpm/rpmlib.h>
-+#include <rpm/rpmts.h>
-+#include <rpm/rpmdb.h>
-+#include <rpm/header.h>
-+#ifdef DLOPEN_LIBRPM
-+#include <dlfcn.h>
-+#endif
-+
-+/* This MISSING_RPM_HASH tracker is used to collect all the missing rpm files
-+   and avoid their duplicities during a single inferior run.  */
-+
-+static struct htab *missing_rpm_hash;
-+
-+/* This MISSING_RPM_LIST tracker is used to collect and print as a single line
-+   all the rpms right before the nearest GDB prompt.  It gets cleared after
-+   each such print (it is questionable if we should clear it after the print).
-+   */
-+
-+struct missing_rpm
-+  {
-+    struct missing_rpm *next;
-+    char rpm[1];
-+  };
-+static struct missing_rpm *missing_rpm_list;
-+static int missing_rpm_list_entries;
-+
-+/* Returns the count of newly added rpms.  */
-+
-+static int
-+missing_rpm_enlist (const char *filename)
-+{
-+  static int rpm_init_done = 0;
-+  rpmts ts;
-+  rpmdbMatchIterator mi;
-+  int count = 0;
-+
-+#ifdef DLOPEN_LIBRPM
-+  /* Duplicate here the declarations to verify they match.  The same sanity
-+     check is present also in `configure.ac'.  */
-+  extern char * headerFormat(Header h, const char * fmt, errmsg_t * errmsg);
-+  static char *(*headerFormat_p) (Header h, const char * fmt, errmsg_t *errmsg);
-+  extern int rpmReadConfigFiles(const char * file, const char * target);
-+  static int (*rpmReadConfigFiles_p) (const char * file, const char * target);
-+  extern rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi);
-+  static rpmdbMatchIterator (*rpmdbFreeIterator_p) (rpmdbMatchIterator mi);
-+  extern Header rpmdbNextIterator(rpmdbMatchIterator mi);
-+  static Header (*rpmdbNextIterator_p) (rpmdbMatchIterator mi);
-+  extern rpmts rpmtsCreate(void);
-+  static rpmts (*rpmtsCreate_p) (void);
-+  extern rpmts rpmtsFree(rpmts ts);
-+  static rpmts (*rpmtsFree_p) (rpmts ts);
-+  extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag,
-+                                              const void * keyp, size_t keylen);
-+  static rpmdbMatchIterator (*rpmtsInitIterator_p) (const rpmts ts,
-+						    rpmTag rpmtag,
-+						    const void *keyp,
-+						    size_t keylen);
-+#else	/* !DLOPEN_LIBRPM */
-+# define headerFormat_p headerFormat
-+# define rpmReadConfigFiles_p rpmReadConfigFiles
-+# define rpmdbFreeIterator_p rpmdbFreeIterator
-+# define rpmdbNextIterator_p rpmdbNextIterator
-+# define rpmtsCreate_p rpmtsCreate
-+# define rpmtsFree_p rpmtsFree
-+# define rpmtsInitIterator_p rpmtsInitIterator
-+#endif	/* !DLOPEN_LIBRPM */
-+
-+  gdb_assert (filename != NULL);
-+
-+  if (strcmp (filename, BUILD_ID_MAIN_EXECUTABLE_FILENAME) == 0)
-+    return 0;
-+
-+  if (is_target_filename (filename))
-+    return 0;
-+
-+  if (filename[0] != '/')
-+    {
-+      warning (_("Ignoring non-absolute filename: <%s>"), filename);
-+      return 0;
-+    }
-+
-+  if (!rpm_init_done)
-+    {
-+      static int init_tried;
-+
-+      /* Already failed the initialization before?  */
-+      if (init_tried)
-+      	return 0;
-+      init_tried = 1;
-+
-+#ifdef DLOPEN_LIBRPM
-+      {
-+	void *h;
-+
-+	h = dlopen (DLOPEN_LIBRPM, RTLD_LAZY);
-+	if (!h)
-+	  {
-+	    warning (_("Unable to open \"%s\" (%s), "
-+		      "missing debuginfos notifications will not be displayed"),
-+		     DLOPEN_LIBRPM, dlerror ());
-+	    return 0;
-+	  }
-+
-+	if (!((headerFormat_p = (char *(*) (Header h, const char * fmt, errmsg_t *errmsg)) dlsym (h, "headerFormat"))
-+	      && (rpmReadConfigFiles_p = (int (*) (const char * file, const char * target)) dlsym (h, "rpmReadConfigFiles"))
-+	      && (rpmdbFreeIterator_p = (rpmdbMatchIterator (*) (rpmdbMatchIterator mi)) dlsym (h, "rpmdbFreeIterator"))
-+	      && (rpmdbNextIterator_p = (Header (*) (rpmdbMatchIterator mi)) dlsym (h, "rpmdbNextIterator"))
-+	      && (rpmtsCreate_p = (rpmts (*) (void)) dlsym (h, "rpmtsCreate"))
-+	      && (rpmtsFree_p = (rpmts (*) (rpmts ts)) dlsym (h, "rpmtsFree"))
-+	      && (rpmtsInitIterator_p = (rpmdbMatchIterator (*) (const rpmts ts, rpmTag rpmtag, const void *keyp, size_t keylen)) dlsym (h, "rpmtsInitIterator"))))
-+	  {
-+	    warning (_("Opened library \"%s\" is incompatible (%s), "
-+		      "missing debuginfos notifications will not be displayed"),
-+		     DLOPEN_LIBRPM, dlerror ());
-+	    if (dlclose (h))
-+	      warning (_("Error closing library \"%s\": %s\n"), DLOPEN_LIBRPM,
-+		       dlerror ());
-+	    return 0;
-+	  }
-+      }
-+#endif	/* DLOPEN_LIBRPM */
-+
-+      if (rpmReadConfigFiles_p (NULL, NULL) != 0)
-+	{
-+	  warning (_("Error reading the rpm configuration files"));
-+	  return 0;
-+	}
-+
-+      rpm_init_done = 1;
-+    }
-+
-+  ts = rpmtsCreate_p ();
-+
-+  mi = rpmtsInitIterator_p (ts, RPMTAG_BASENAMES, filename, 0);
-+  if (mi != NULL)
-+    {
-+      for (;;)
-+	{
-+	  Header h;
-+	  char *debuginfo, **slot, *s, *s2;
-+	  errmsg_t err;
-+	  size_t srcrpmlen = sizeof (".src.rpm") - 1;
-+	  size_t debuginfolen = sizeof ("-debuginfo") - 1;
-+	  rpmdbMatchIterator mi_debuginfo;
-+
-+	  h = rpmdbNextIterator_p (mi);
-+	  if (h == NULL)
-+	    break;
-+
-+	  /* Verify the debuginfo file is not already installed.  */
-+
-+	  debuginfo = headerFormat_p (h, "%{sourcerpm}-debuginfo.%{arch}",
-+				      &err);
-+	  if (!debuginfo)
-+	    {
-+	      warning (_("Error querying the rpm file `%s': %s"), filename,
-+	               err);
-+	      continue;
-+	    }
-+	  /* s = `.src.rpm-debuginfo.%{arch}' */
-+	  s = strrchr (debuginfo, '-') - srcrpmlen;
-+	  s2 = NULL;
-+	  if (s > debuginfo && memcmp (s, ".src.rpm", srcrpmlen) == 0)
-+	    {
-+	      /* s2 = `-%{release}.src.rpm-debuginfo.%{arch}' */
-+	      s2 = (char *) memrchr (debuginfo, '-', s - debuginfo);
-+	    }
-+	  if (s2)
-+	    {
-+	      /* s2 = `-%{version}-%{release}.src.rpm-debuginfo.%{arch}' */
-+	      s2 = (char *) memrchr (debuginfo, '-', s2 - debuginfo);
-+	    }
-+	  if (!s2)
-+	    {
-+	      warning (_("Error querying the rpm file `%s': %s"), filename,
-+	               debuginfo);
-+	      xfree (debuginfo);
-+	      continue;
-+	    }
-+	  /* s = `.src.rpm-debuginfo.%{arch}' */
-+	  /* s2 = `-%{version}-%{release}.src.rpm-debuginfo.%{arch}' */
-+	  memmove (s2 + debuginfolen, s2, s - s2);
-+	  memcpy (s2, "-debuginfo", debuginfolen);
-+	  /* s = `XXXX.%{arch}' */
-+	  /* strlen ("XXXX") == srcrpmlen + debuginfolen */
-+	  /* s2 = `-debuginfo-%{version}-%{release}XX.%{arch}' */
-+	  /* strlen ("XX") == srcrpmlen */
-+	  memmove (s + debuginfolen, s + srcrpmlen + debuginfolen,
-+		   strlen (s + srcrpmlen + debuginfolen) + 1);
-+	  /* s = `-debuginfo-%{version}-%{release}.%{arch}' */
-+
-+	  /* RPMDBI_PACKAGES requires keylen == sizeof (int).  */
-+	  /* RPMDBI_LABEL is an interface for NVR-based dbiFindByLabel().  */
-+	  mi_debuginfo = rpmtsInitIterator_p (ts, (rpmTag) RPMDBI_LABEL, debuginfo, 0);
-+	  xfree (debuginfo);
-+	  if (mi_debuginfo)
-+	    {
-+	      rpmdbFreeIterator_p (mi_debuginfo);
-+	      count = 0;
-+	      break;
-+	    }
-+
-+	  /* The allocated memory gets utilized below for MISSING_RPM_HASH.  */
-+	  debuginfo = headerFormat_p (h,
-+				      "%{name}-%{version}-%{release}.%{arch}",
-+				      &err);
-+	  if (!debuginfo)
-+	    {
-+	      warning (_("Error querying the rpm file `%s': %s"), filename,
-+	               err);
-+	      continue;
-+	    }
-+
-+	  /* Base package name for `debuginfo-install'.  We do not use the
-+	     `yum' command directly as the line
-+		 yum --enablerepo='*debug*' install NAME-debuginfo.ARCH
-+	     would be more complicated than just:
-+		 debuginfo-install NAME-VERSION-RELEASE.ARCH
-+	     Do not supply the rpm base name (derived from .src.rpm name) as
-+	     debuginfo-install is unable to install the debuginfo package if
-+	     the base name PKG binary rpm is not installed while for example
-+	     PKG-libs would be installed (RH Bug 467901).
-+	     FUTURE: After multiple debuginfo versions simultaneously installed
-+	     get supported the support for the VERSION-RELEASE tags handling
-+	     may need an update.  */
-+
-+	  if (missing_rpm_hash == NULL)
-+	    {
-+	      /* DEL_F is passed NULL as MISSING_RPM_LIST's HTAB_DELETE
-+		 should not deallocate the entries.  */
-+
-+	      missing_rpm_hash = htab_create_alloc (64, htab_hash_string,
-+			       (int (*) (const void *, const void *)) streq,
-+						    NULL, xcalloc, xfree);
-+	    }
-+	  slot = (char **) htab_find_slot (missing_rpm_hash, debuginfo, INSERT);
-+	  /* XCALLOC never returns NULL.  */
-+	  gdb_assert (slot != NULL);
-+	  if (*slot == NULL)
-+	    {
-+	      struct missing_rpm *missing_rpm;
-+
-+	      *slot = debuginfo;
-+
-+	      missing_rpm = (struct missing_rpm *) xmalloc (sizeof (*missing_rpm) + strlen (debuginfo));
-+	      strcpy (missing_rpm->rpm, debuginfo);
-+	      missing_rpm->next = missing_rpm_list;
-+	      missing_rpm_list = missing_rpm;
-+	      missing_rpm_list_entries++;
-+	    }
-+	  else
-+	    xfree (debuginfo);
-+	  count++;
-+	}
-+
-+      rpmdbFreeIterator_p (mi);
-+    }
-+
-+  rpmtsFree_p (ts);
-+
-+  return count;
-+}
-+
-+static bool
-+missing_rpm_list_compar (const char *ap, const char *bp)
-+{
-+  return strcoll (ap, bp) < 0;
-+}
-+
-+/* It returns a NULL-terminated array of strings needing to be FREEd.  It may
-+   also return only NULL.  */
-+
-+static void
-+missing_rpm_list_print (void)
-+{
-+  struct missing_rpm *list_iter;
-+
-+  if (missing_rpm_list_entries == 0)
-+    return;
-+
-+  std::vector<const char *> array (missing_rpm_list_entries);
-+  size_t idx = 0;
-+
-+  for (list_iter = missing_rpm_list; list_iter != NULL;
-+       list_iter = list_iter->next)
-+    {
-+      array[idx++] = list_iter->rpm;
-+    }
-+  gdb_assert (idx == missing_rpm_list_entries);
-+
-+  std::sort (array.begin (), array.end (), missing_rpm_list_compar);
-+
-+  /* We zero out the number of missing RPMs here because of a nasty
-+     bug (see RHBZ 1801974).
-+
-+     When we call 'puts_unfiltered' below, if pagination is on and if
-+     the number of missing RPMs is big enough to trigger pagination,
-+     we will end up in an infinite recursion.  The call chain looks
-+     like this:
-+
-+     missing_rpm_list_print -> puts_unfiltered -> fputs_maybe_filtered
-+     -> prompt_for_continue -> display_gdb_prompt ->
-+     debug_flush_missing -> missing_rpm_list_print ...
-+
-+     For this reason, we make sure MISSING_RPM_LIST_ENTRIES is zero
-+     *before* calling any print function.  */
-+  missing_rpm_list_entries = 0;
-+
-+  printf_unfiltered (_("Missing separate debuginfos, use: %s"),
-+#ifdef DNF_DEBUGINFO_INSTALL
-+		     "dnf "
-+#endif
-+		     "debuginfo-install");
-+  for (const char *el : array)
-+    {
-+      puts_unfiltered (" ");
-+      puts_unfiltered (el);
-+    }
-+  puts_unfiltered ("\n");
-+
-+  while (missing_rpm_list != NULL)
-+    {
-+      list_iter = missing_rpm_list;
-+      missing_rpm_list = list_iter->next;
-+      xfree (list_iter);
-+    }
-+}
-+
-+static void
-+missing_rpm_change (void)
-+{
-+  debug_flush_missing ();
-+
-+  gdb_assert (missing_rpm_list == NULL);
-+  if (missing_rpm_hash != NULL)
-+    {
-+      htab_delete (missing_rpm_hash);
-+      missing_rpm_hash = NULL;
-+    }
-+}
-+
-+enum missing_exec
-+  {
-+    /* Init state.  EXEC_BFD also still could be NULL.  */
-+    MISSING_EXEC_NOT_TRIED,
-+    /* We saw a non-NULL EXEC_BFD but RPM has no info about it.  */
-+    MISSING_EXEC_NOT_FOUND,
-+    /* We found EXEC_BFD by RPM and we either have its symbols (either embedded
-+       or separate) or the main executable's RPM is now contained in
-+       MISSING_RPM_HASH.  */
-+    MISSING_EXEC_ENLISTED
-+  };
-+static enum missing_exec missing_exec = MISSING_EXEC_NOT_TRIED;
-+
-+#endif	/* HAVE_LIBRPM */
-+
-+void
-+debug_flush_missing (void)
-+{
-+#ifdef HAVE_LIBRPM
-+  missing_rpm_list_print ();
-+#endif
-+}
-+
- /* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages
--     Try to install the hash file ...
-+     yum --enablerepo='*debug*' install ...
-    avoidance.  */
- 
- struct missing_filepair
-@@ -752,11 +1119,17 @@ missing_filepair_change (void)
-       /* All their memory came just from missing_filepair_OBSTACK.  */
-       missing_filepair_hash = NULL;
-     }
-+#ifdef HAVE_LIBRPM
-+  missing_exec = MISSING_EXEC_NOT_TRIED;
-+#endif
- }
- 
- static void
- debug_print_executable_changed (void)
- {
-+#ifdef HAVE_LIBRPM
-+  missing_rpm_change ();
-+#endif
-   missing_filepair_change ();
- }
- 
-@@ -823,14 +1196,38 @@ debug_print_missing (const char *binary, const char *debug)
- 
-   *slot = missing_filepair;
- 
--  /* We do not collect and flush these messages as each such message
--     already requires its own separate lines.  */
-+#ifdef HAVE_LIBRPM
-+  if (missing_exec == MISSING_EXEC_NOT_TRIED)
-+    {
-+      const char *execfilename = get_exec_file (0);
- 
--  fprintf_unfiltered (gdb_stdlog,
--		      _("Missing separate debuginfo for %s\n"), binary);
--  if (debug != NULL)
--    fprintf_unfiltered (gdb_stdlog, _("Try to install the hash file %s\n"),
--			debug);
-+      if (execfilename != NULL)
-+	{
-+	  if (missing_rpm_enlist (execfilename) == 0)
-+	    missing_exec = MISSING_EXEC_NOT_FOUND;
-+	  else
-+	    missing_exec = MISSING_EXEC_ENLISTED;
-+	}
-+    }
-+  if (missing_exec != MISSING_EXEC_ENLISTED)
-+    if ((binary[0] == 0 || missing_rpm_enlist (binary) == 0)
-+	&& (debug == NULL || missing_rpm_enlist (debug) == 0))
-+#endif	/* HAVE_LIBRPM */
-+      {
-+	/* We do not collect and flush these messages as each such message
-+	   already requires its own separate lines.  */
-+
-+	fprintf_unfiltered (gdb_stdlog,
-+			    _("Missing separate debuginfo for %s\n"), binary);
-+        if (debug != NULL)
-+	  fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"),
-+#ifdef DNF_DEBUGINFO_INSTALL
-+			      "dnf"
-+#else
-+			      "yum"
-+#endif
-+			      " --enablerepo='*debug*' install", debug);
-+      }
- }
- 
- /* See build-id.h.  */
+ 	  /* RPMDBI_PACKAGES requires keylen == sizeof (int).  */
+ 	  /* RPMDBI_LABEL is an interface for NVR-based dbiFindByLabel().  */
+-	  mi_debuginfo = rpmtsInitIterator_p (ts, (rpmTag) RPMDBI_LABEL, debuginfo, 0);
++	  mi_debuginfo = rpmtsInitIterator_p (ts, (rpmDbiTagVal) RPMDBI_LABEL, debuginfo, 0);
+ 	  xfree (debuginfo);
+ 	  if (mi_debuginfo)
+ 	    {
 diff --git a/gdb/config.in b/gdb/config.in
 --- a/gdb/config.in
 +++ b/gdb/config.in
-@@ -39,6 +39,9 @@
+@@ -42,6 +42,9 @@
  /* Handle .ctf type-info sections */
  #undef ENABLE_LIBCTF
  
@@ -696,9 +279,9 @@ diff --git a/gdb/config.in b/gdb/config.in
  /* Define to 1 if translation of program messages to the user's native
     language is requested. */
  #undef ENABLE_NLS
-@@ -247,6 +250,9 @@
- /* Define if you have the mpfr library. */
- #undef HAVE_LIBMPFR
+@@ -265,6 +268,9 @@
+ /* Define to 1 if you have the `m' library (-lm). */
+ #undef HAVE_LIBM
  
 +/* Define if librpm library is being used. */
 +#undef HAVE_LIBRPM
@@ -709,9 +292,9 @@ diff --git a/gdb/config.in b/gdb/config.in
 diff --git a/gdb/configure b/gdb/configure
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -769,6 +769,11 @@ PKG_CONFIG
- HAVE_NATIVE_GCORE_TARGET
- TARGET_OBS
+@@ -778,6 +778,11 @@ AMD_DBGAPI_CFLAGS
+ ENABLE_BFD_64_BIT_FALSE
+ ENABLE_BFD_64_BIT_TRUE
  subdirs
 +RPM_LIBS
 +RPM_CFLAGS
@@ -721,25 +304,25 @@ diff --git a/gdb/configure b/gdb/configure
  GDB_DATADIR
  DEBUGDIR
  MAKEINFO_EXTRA_FLAGS
-@@ -873,6 +878,7 @@ with_gdb_datadir
+@@ -911,6 +916,7 @@ with_gdb_datadir
  with_relocated_sources
  with_auto_load_dir
  with_auto_load_safe_path
 +with_rpm
  enable_targets
  enable_64_bit_bfd
- enable_gdbmi
-@@ -949,6 +955,8 @@ PKG_CONFIG_PATH
- PKG_CONFIG_LIBDIR
+ with_amd_dbgapi
+@@ -988,6 +994,8 @@ AMD_DBGAPI_CFLAGS
+ AMD_DBGAPI_LIBS
  DEBUGINFOD_CFLAGS
  DEBUGINFOD_LIBS
 +RPM_CFLAGS
 +RPM_LIBS
  YACC
  YFLAGS
- XMKMF'
-@@ -1621,6 +1629,8 @@ Optional Packages:
-                           do not restrict auto-loaded files locations
+ ZSTD_CFLAGS
+@@ -1679,6 +1687,8 @@ Optional Packages:
+   --with-amd-dbgapi       support for the amd-dbgapi target (yes / no / auto)
    --with-debuginfod       Enable debuginfo lookups with debuginfod
                            (auto/yes/no)
 +  --with-rpm              query rpm database for missing debuginfos (yes/no,
@@ -747,7 +330,7 @@ diff --git a/gdb/configure b/gdb/configure
    --with-libunwind-ia64   use libunwind frame unwinding for ia64 targets
    --with-curses           use the curses library instead of the termcap
                            library
-@@ -1702,6 +1712,8 @@ Some influential environment variables:
+@@ -1759,6 +1769,8 @@ Some influential environment variables:
                C compiler flags for DEBUGINFOD, overriding pkg-config
    DEBUGINFOD_LIBS
                linker flags for DEBUGINFOD, overriding pkg-config
@@ -756,7 +339,7 @@ diff --git a/gdb/configure b/gdb/configure
    YACC        The `Yet Another Compiler Compiler' implementation to use.
                Defaults to the first program found out of: `bison -y', `byacc',
                `yacc'.
-@@ -6666,6 +6678,494 @@ _ACEOF
+@@ -18039,6 +18051,495 @@ _ACEOF
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_auto_load_safe_path" >&5
  $as_echo "$with_auto_load_safe_path" >&6; }
  
@@ -820,6 +403,7 @@ diff --git a/gdb/configure b/gdb/configure
 +#include <rpm/rpmlib.h>
 +#include <dlfcn.h>
 +#include <errno.h>
++#include <string.h>
 +
 +int
 +main ()
@@ -936,7 +520,7 @@ diff --git a/gdb/configure b/gdb/configure
 +extern Header rpmdbNextIterator(rpmdbMatchIterator mi);
 +extern rpmts rpmtsCreate(void);
 +extern rpmts rpmtsFree(rpmts ts);
-+extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag,
++extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmDbiTagVal rpmtag,
 +					    const void * keyp, size_t keylen);
 +
 +int
@@ -1148,7 +732,7 @@ diff --git a/gdb/configure b/gdb/configure
 +
 +
 +if test $pkg_failed = yes; then
-+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +
 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -1166,7 +750,7 @@ diff --git a/gdb/configure b/gdb/configure
 +
 +	HAVE_LIBRPM=false
 +elif test $pkg_failed = untried; then
-+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +	HAVE_LIBRPM=false
 +else
@@ -1198,7 +782,7 @@ diff --git a/gdb/configure b/gdb/configure
 +extern Header rpmdbNextIterator(rpmdbMatchIterator mi);
 +extern rpmts rpmtsCreate(void);
 +extern rpmts rpmtsFree(rpmts ts);
-+extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag,
++extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmDbiTagVal rpmtag,
 +					    const void * keyp, size_t keylen);
 +
 +int
@@ -1254,7 +838,7 @@ diff --git a/gdb/configure b/gdb/configure
 diff --git a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -143,6 +143,199 @@ AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escape_dir,
+@@ -173,6 +173,200 @@ AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escape_dir,
  	      [Directories safe to hold auto-loaded files.])
  AC_MSG_RESULT([$with_auto_load_safe_path])
  
@@ -1304,6 +888,7 @@ diff --git a/gdb/configure.ac b/gdb/configure.ac
 +#include <rpm/rpmlib.h>
 +#include <dlfcn.h>
 +#include <errno.h>
++#include <string.h>
 +  ]], [[
 +    void *h;
 +    const char *const *rpmverp;
@@ -1398,7 +983,7 @@ diff --git a/gdb/configure.ac b/gdb/configure.ac
 +extern Header rpmdbNextIterator(rpmdbMatchIterator mi);
 +extern rpmts rpmtsCreate(void);
 +extern rpmts rpmtsFree(rpmts ts);
-+extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag,
++extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmDbiTagVal rpmtag,
 +					    const void * keyp, size_t keylen);
 +    ]]), [
 +      LIBRPM_COMPAT=true
@@ -1450,22 +1035,22 @@ diff --git a/gdb/configure.ac b/gdb/configure.ac
 +    fi
 +  fi
 +fi
-+ 
++
  AC_CONFIG_SUBDIRS(testsuite)
  
  # Check whether to support alternative target configurations
 diff --git a/gdb/event-top.c b/gdb/event-top.c
 --- a/gdb/event-top.c
 +++ b/gdb/event-top.c
-@@ -42,6 +42,7 @@
- #include "gdbsupport/gdb_select.h"
- #include "gdbsupport/gdb-sigmask.h"
+@@ -43,6 +43,7 @@
  #include "async-event.h"
+ #include "bt-utils.h"
+ #include "pager.h"
 +#include "symfile.h"
  
  /* readline include files.  */
  #include "readline/readline.h"
-@@ -364,6 +365,8 @@ display_gdb_prompt (const char *new_prompt)
+@@ -404,6 +405,8 @@ display_gdb_prompt (const char *new_prompt)
    /* Reset the nesting depth used when trace-commands is set.  */
    reset_command_nest_depth ();
  
@@ -1474,7 +1059,7 @@ diff --git a/gdb/event-top.c b/gdb/event-top.c
    /* Do not call the python hook on an explicit prompt change as
       passed to this function, as this forms a secondary/local prompt,
       IE, displayed but not set.  */
-@@ -773,7 +776,10 @@ command_line_handler (gdb::unique_xmalloc_ptr<char> &&rl)
+@@ -788,7 +791,10 @@ command_line_handler (gdb::unique_xmalloc_ptr<char> &&rl)
        command_handler (cmd);
  
        if (ui->prompt_state != PROMPTED)
@@ -1489,11 +1074,11 @@ diff --git a/gdb/event-top.c b/gdb/event-top.c
 diff --git a/gdb/symfile.h b/gdb/symfile.h
 --- a/gdb/symfile.h
 +++ b/gdb/symfile.h
-@@ -560,6 +560,7 @@ extern void generic_load (const char *args, int from_tty);
+@@ -367,6 +367,7 @@ extern void generic_load (const char *args, int from_tty);
  /* build-id support.  */
  extern struct bfd_build_id *build_id_addr_get (CORE_ADDR addr);
  extern void debug_print_missing (const char *binary, const char *debug);
 +extern void debug_flush_missing (void);
  #define BUILD_ID_MAIN_EXECUTABLE_FILENAME _("the main executable file")
  
- /* From dwarf2read.c */
+ /* From minidebug.c.  */

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

@@ -14,7 +14,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1339862
 diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
 --- a/gdb/solib-svr4.c
 +++ b/gdb/solib-svr4.c
-@@ -1340,14 +1340,27 @@ svr4_read_so_list (svr4_info *info, CORE_ADDR lm, CORE_ADDR prev_lm,
+@@ -1320,14 +1320,28 @@ svr4_read_so_list (svr4_info *info, CORE_ADDR lm, CORE_ADDR prev_lm,
  	}
  
        {
@@ -38,13 +38,14 @@ diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
 +	   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)
++	if (current_program_space->symfile_object_file != NULL
++	    && (current_program_space->symfile_object_file->flags
++	         & OBJF_BUILD_ID_CORE_LOADED) != 0)
 +	  build_id = build_id_addr_get (li->l_ld);
  	if (build_id != NULL)
  	  {
  	    char *name, *build_id_filename;
-@@ -1362,23 +1375,7 @@ svr4_read_so_list (svr4_info *info, CORE_ADDR lm, CORE_ADDR prev_lm,
+@@ -1342,23 +1356,7 @@ svr4_read_so_list (svr4_info *info, CORE_ADDR lm, CORE_ADDR prev_lm,
  		xfree (name);
  	      }
  	    else
@@ -60,8 +61,8 @@ diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
 -		   instead) if the on-disk files no longer match the
 -		   running program version.  */
 -
--		if (symfile_objfile != NULL
--		    && (symfile_objfile->flags
+-		if (current_program_space->symfile_object_file != NULL
+-		    && (current_program_space->symfile_object_file->flags
 -			& OBJF_BUILD_ID_CORE_LOADED) != 0)
 -		  newobj->so_name[0] = 0;
 -	      }

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

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

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

@@ -1,94 +0,0 @@
-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	*/

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

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

gdb-6.6-testsuite-timeouts.patch

@@ -9,7 +9,7 @@ Subject: gdb-6.6-testsuite-timeouts.patch
 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
+@@ -37,6 +37,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
  
  clean_restart ${binfile}
  
@@ -21,7 +21,7 @@ diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1
 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
+@@ -36,6 +36,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
  
  clean_restart ${binfile}
  

gdb-6.7-charsign-test.patch

@@ -1,130 +0,0 @@
-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}

gdb-6.7-testsuite-stable-results.patch

@@ -1,104 +0,0 @@
-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

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

@@ -1,181 +0,0 @@
-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 ${binfile_nothreads} ${binfile_threads} 0
- 
- gdb_test_multiple {} "Program exited" {
-    -re "\r\n\\\[Inferior .* exited normally\\\]\r\n$gdb_prompt $" {

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

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

gdb-6.8-quit-never-aborts.patch

@@ -1,78 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.8-quit-never-aborts.patch
-
-;; Make the GDB quit processing non-abortable to cleanup everything properly.
-;;=fedora: It was useful only after gdb-6.8-attach-signalled-detach-stopped.patch .
-
-We may abort the process of detaching threads with multiple SIGINTs - which are
-being sent during a testcase terminating its child GDB.
-
-Some of the threads may not be properly PTRACE_DETACHed which hurts if they
-should have been detached with SIGSTOP (as they are accidentally left running
-on the debugger termination).
-
-diff --git a/gdb/defs.h b/gdb/defs.h
---- a/gdb/defs.h
-+++ b/gdb/defs.h
-@@ -177,6 +177,10 @@ extern void default_quit_handler (void);
- /* Flag that function quit should call quit_force.  */
- extern volatile int sync_quit_force_run;
- 
-+#ifdef NEED_DETACH_SIGSTOP
-+extern int quit_flag_cleanup;
-+#endif
-+
- extern void quit (void);
- 
- /* Helper for the QUIT macro.  */
-diff --git a/gdb/extension.c b/gdb/extension.c
---- a/gdb/extension.c
-+++ b/gdb/extension.c
-@@ -769,6 +769,11 @@ check_quit_flag (void)
- {
-   int result = 0;
- 
-+#ifdef NEED_DETACH_SIGSTOP
-+  if (quit_flag_cleanup)
-+    return 0;
-+#endif
-+
-   for (const struct extension_language_defn *extlang : extension_languages)
-     {
-       if (extlang->ops != nullptr
-diff --git a/gdb/top.c b/gdb/top.c
---- a/gdb/top.c
-+++ b/gdb/top.c
-@@ -1770,7 +1770,13 @@ quit_force (int *exit_arg, int from_tty)
-   else if (return_child_result)
-     exit_code = return_child_result_value;
- 
-+#ifndef NEED_DETACH_SIGSTOP
-   /* We want to handle any quit errors and exit regardless.  */
-+#else
-+  /* We want to handle any quit errors and exit regardless but we should never
-+     get user-interrupted to properly detach the inferior.  */
-+  quit_flag_cleanup = 1;
-+#endif
- 
-   /* Get out of tfind mode, and kill or detach all inferiors.  */
-   try
-diff --git a/gdb/utils.c b/gdb/utils.c
---- a/gdb/utils.c
-+++ b/gdb/utils.c
-@@ -103,6 +103,13 @@ static std::chrono::steady_clock::duration prompt_for_continue_wait_time;
- 
- static bool debug_timestamp = false;
- 
-+#ifdef NEED_DETACH_SIGSTOP
-+/* Nonzero means we are already processing the quitting cleanups and we should
-+   no longer get aborted.  */
-+
-+int quit_flag_cleanup;
-+#endif
-+
- /* True means that strings with character values >0x7F should be printed
-    as octal escapes.  False means just print the value (e.g. it's an
-    international character, and the terminal or window can cope.)  */

gdb-add-index.patch

@@ -0,0 +1,77 @@
+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-add-index.patch
+
+;; Update gdb-add-index.sh such that, when the GDB environment
+;; variable is not set, the script is smarter than just looking for
+;; 'gdb' in the $PATH.
+;;
+;; The actual search order is now: /usr/bin/gdb.minimal, gdb (in the
+;; $PATH), then /usr/libexec/gdb.
+;;
+;; For the rationale of looking for gdb.minimal 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
+@@ -16,14 +16,52 @@
+ # 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 program assumes gdb and objcopy are in $PATH.
+-# If not, or you want others, pass the following in the environment
+-GDB=${GDB:=gdb}
++# This program assumes objcopy and readelf are in $PATH.  If not, or
++# you want others, pass the following in the environment
+ OBJCOPY=${OBJCOPY:=objcopy}
+ READELF=${READELF:=readelf}
+ 
+ myname="${0##*/}"
+ 
++# For GDB itself we need to be a little smarter.  If GDB is set in the
++# environment then we will use that.  But if GDB is not set in the
++# environment then we have a couple of options that we need to check
++# through.
++#
++# Our default choice is for /usr/bin/gdb.minimal.  For an explanation
++# of why this is chosen, check out:
++#   https://bugzilla.redhat.com/show_bug.cgi?id=1695015
++#   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
++#
++# If gdb.minimal is not found then we look for a 'gdb' executable on
++# the path.
++#
++# And finally, we check for /usr/libexec/gdb.
++#
++# If none of those result in a useable GDB then we give an error and
++# exit.
++if test -z "$GDB"; then
++    for possible_gdb in /usr/bin/gdb.minimal gdb /usr/libexec/gdb; do
++        if ! which "$possible_gdb" >/dev/null 2>&1; then
++            continue
++        fi
++
++        possible_gdb=$(which "$possible_gdb")
++
++        if ! test -x "$possible_gdb"; then
++            continue
++        fi
++
++        GDB="$possible_gdb"
++        break
++    done
++
++    if test -z "$GDB"; then
++        echo "$myname: Failed to find a useable GDB binary" 1>&2
++        exit 1
++    fi
++fi
++
+ dwarf5=""
+ if [ "$1" = "-dwarf-5" ]; then
+     dwarf5="$1"

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

@@ -1,89 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-archer-pie-addons-keep-disabled.patch
-
-;;=push+jan: Breakpoints disabling matching should not be based on address.
-
-diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
---- a/gdb/breakpoint.c
-+++ b/gdb/breakpoint.c
-@@ -15431,6 +15431,50 @@ static struct cmd_list_element *enablebreaklist = NULL;
- 
- cmd_list_element *commands_cmd_element = nullptr;
- 
-+void
-+breakpoints_relocate (struct objfile *objfile, section_offsets &delta)
-+{
-+  struct bp_location *bl, **blp_tmp;
-+  int changed = 0;
-+
-+  gdb_assert (objfile->separate_debug_objfile_backlink == NULL);
-+
-+  ALL_BP_LOCATIONS (bl, blp_tmp)
-+    {
-+      struct obj_section *osect;
-+
-+      /* BL->SECTION can be correctly NULL for breakpoints with multiple
-+         locations expanded through symtab.  */
-+
-+      ALL_OBJFILE_OSECTIONS (objfile, osect)
-+	{
-+	  CORE_ADDR relocated_address;
-+	  CORE_ADDR delta_offset;
-+
-+	  delta_offset = delta[osect->the_bfd_section->index];
-+	  if (delta_offset == 0)
-+	    continue;
-+	  relocated_address = bl->address + delta_offset;
-+
-+	  if (obj_section_addr (osect) <= relocated_address
-+	      && relocated_address < obj_section_endaddr (osect))
-+	    {
-+	      if (bl->inserted)
-+		remove_breakpoint (bl);
-+
-+	      bl->address += delta_offset;
-+	      bl->requested_address += delta_offset;
-+
-+	      changed = 1;
-+	    }
-+	}
-+    }
-+
-+  if (changed)
-+    std::sort (bp_locations, bp_locations + bp_locations_count,
-+	       bp_location_is_less_than);
-+}
-+
- void _initialize_breakpoint ();
- void
- _initialize_breakpoint ()
-diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
---- a/gdb/breakpoint.h
-+++ b/gdb/breakpoint.h
-@@ -1691,6 +1691,9 @@ extern const char *ep_parse_optional_if_clause (const char **arg);
-    UIOUT iff debugging multiple threads.  */
- extern void maybe_print_thread_hit_breakpoint (struct ui_out *uiout);
- 
-+extern void breakpoints_relocate (struct objfile *objfile,
-+				  section_offsets &delta);
-+
- /* Print the specified breakpoint.  */
- extern void print_breakpoint (breakpoint *bp);
- 
-diff --git a/gdb/objfiles.c b/gdb/objfiles.c
---- a/gdb/objfiles.c
-+++ b/gdb/objfiles.c
-@@ -742,6 +742,11 @@ objfile_relocate1 (struct objfile *objfile,
- 				obj_section_addr (s));
-     }
- 
-+  /* Final call of breakpoint_re_set can keep breakpoint locations disabled if
-+     their addresses match.  */
-+  if (objfile->separate_debug_objfile_backlink == NULL)
-+    breakpoints_relocate (objfile, delta);
-+
-   /* Data changed.  */
-   return 1;
- }

gdb-archer-pie-addons.patch

@@ -1,39 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-archer-pie-addons.patch
-
-;;=push+jan: May get obsoleted by Tom's unrelocated objfiles patch.
-
-diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
---- a/gdb/gdbtypes.h
-+++ b/gdb/gdbtypes.h
-@@ -649,6 +649,7 @@ enum field_loc_kind
-   {
-     FIELD_LOC_KIND_BITPOS,	/**< bitpos */
-     FIELD_LOC_KIND_ENUMVAL,	/**< enumval */
-+    /* This address is unrelocated by the objfile's ANOFFSET.  */
-     FIELD_LOC_KIND_PHYSADDR,	/**< physaddr */
-     FIELD_LOC_KIND_PHYSNAME,	/**< physname */
-     FIELD_LOC_KIND_DWARF_BLOCK	/**< dwarf_block */
-@@ -699,6 +700,7 @@ union field_location
-      field.  Otherwise, physname is the mangled label of the
-      static field.  */
- 
-+  /* This address is unrelocated by the objfile's ANOFFSET.  */
-   CORE_ADDR physaddr;
-   const char *physname;
- 
-diff --git a/gdb/value.c b/gdb/value.c
---- a/gdb/value.c
-+++ b/gdb/value.c
-@@ -2850,7 +2850,8 @@ value_static_field (struct type *type, int fieldno)
-     {
-     case FIELD_LOC_KIND_PHYSADDR:
-       retval = value_at_lazy (type->field (fieldno).type (),
--			      TYPE_FIELD_STATIC_PHYSADDR (type, fieldno));
-+			      TYPE_FIELD_STATIC_PHYSADDR (type, fieldno)
-+			      + (TYPE_OBJFILE (type) == NULL ? 0 : TYPE_OBJFILE (type)->section_offsets[SECT_OFF_TEXT (TYPE_OBJFILE (type))]));
-       break;
-     case FIELD_LOC_KIND_PHYSNAME:
-     {

gdb-archer.patch

@@ -1,187 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-archer.patch
-
-;; Python patches of: http://sourceware.org/gdb/wiki/ProjectArcher
-;;=push
-
-http://sourceware.org/gdb/wiki/ProjectArcher
-http://sourceware.org/gdb/wiki/ArcherBranchManagement
-
-GIT snapshot:
-commit 718a1618b2f691a7f407213bb50f100ac59f91c3
-
-tromey/python
-
-diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
---- a/gdb/data-directory/Makefile.in
-+++ b/gdb/data-directory/Makefile.in
-@@ -80,6 +80,7 @@ PYTHON_FILE_LIST = \
- 	gdb/unwinder.py \
- 	gdb/xmethod.py \
- 	gdb/command/__init__.py \
-+	gdb/command/ignore_errors.py \
- 	gdb/command/explore.py \
- 	gdb/command/backtrace.py \
- 	gdb/command/frame_filters.py \
-@@ -92,6 +93,7 @@ PYTHON_FILE_LIST = \
- 	gdb/function/as_string.py \
- 	gdb/function/caller_is.py \
- 	gdb/function/strfns.py \
-+	gdb/function/in_scope.py \
- 	gdb/printer/__init__.py \
- 	gdb/printer/bound_registers.py
- 
-diff --git a/gdb/gdb-gdb.gdb.in b/gdb/gdb-gdb.gdb.in
---- a/gdb/gdb-gdb.gdb.in
-+++ b/gdb/gdb-gdb.gdb.in
-@@ -1,5 +1,15 @@
- echo Setting up the environment for debugging gdb.\n
- 
-+# Set up the Python library and "require" command.
-+python
-+from os.path import abspath
-+gdb.datadir = abspath ('@srcdir@/python/lib')
-+gdb.pythonlibdir = gdb.datadir
-+gdb.__path__ = [gdb.datadir + '/gdb']
-+sys.path.insert(0, gdb.datadir)
-+end
-+source @srcdir@/python/lib/gdb/__init__.py
-+
- if !$gdb_init_done
-   set variable $gdb_init_done = 1
- 
-diff --git a/gdb/python/lib/gdb/command/ignore_errors.py b/gdb/python/lib/gdb/command/ignore_errors.py
-new file mode 100644
---- /dev/null
-+++ b/gdb/python/lib/gdb/command/ignore_errors.py
-@@ -0,0 +1,37 @@
-+# Ignore errors in user commands.
-+
-+# Copyright (C) 2008 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+import gdb
-+
-+class IgnoreErrorsCommand (gdb.Command):
-+    """Execute a single command, ignoring all errors.
-+Only one-line commands are supported.
-+This is primarily useful in scripts."""
-+
-+    def __init__ (self):
-+        super (IgnoreErrorsCommand, self).__init__ ("ignore-errors",
-+                                                    gdb.COMMAND_OBSCURE,
-+                                                    # FIXME...
-+                                                    gdb.COMPLETE_COMMAND)
-+
-+    def invoke (self, arg, from_tty):
-+        try:
-+            gdb.execute (arg, from_tty)
-+        except:
-+            pass
-+
-+IgnoreErrorsCommand ()
-diff --git a/gdb/python/lib/gdb/function/in_scope.py b/gdb/python/lib/gdb/function/in_scope.py
-new file mode 100644
---- /dev/null
-+++ b/gdb/python/lib/gdb/function/in_scope.py
-@@ -0,0 +1,47 @@
-+# In-scope function.
-+
-+# Copyright (C) 2008 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+import gdb
-+
-+class InScope (gdb.Function):
-+    """Return True if all the given variables or macros are in scope.
-+Takes one argument for each variable name to be checked."""
-+
-+    def __init__ (self):
-+        super (InScope, self).__init__ ("in_scope")
-+
-+    def invoke (self, *vars):
-+        if len (vars) == 0:
-+            raise (TypeError, "in_scope takes at least one argument")
-+
-+        # gdb.Value isn't hashable so it can't be put in a map.
-+        # Convert to string first.
-+        wanted = set (map (lambda x: x.string (), vars))
-+        found = set ()
-+        block = gdb.selected_frame ().block ()
-+        while block:
-+            for sym in block:
-+                if (sym.is_argument or sym.is_constant
-+                      or sym.is_function or sym.is_variable):
-+                    if sym.name in wanted:
-+                        found.add (sym.name)
-+
-+            block = block.superblock
-+
-+        return wanted == found
-+
-+InScope ()
-diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp
---- a/gdb/testsuite/gdb.python/py-frame.exp
-+++ b/gdb/testsuite/gdb.python/py-frame.exp
-@@ -95,6 +95,8 @@ gdb_test "python print ('result = %s' % f0.read_var ('a'))" " = 1" "test Frame.r
- 
- gdb_test "python print ('result = %s' % (gdb.selected_frame () == f1))" " = True" "test gdb.selected_frame"
- 
-+gdb_test "python print ('result = %s' % (f0.block ()))" "<gdb.Block object at 0x\[\[:xdigit:\]\]+>" "test Frame.block"
-+
- # Can read SP register.
- gdb_test "python print ('result = %s' % (gdb.selected_frame ().read_register ('sp') == gdb.parse_and_eval ('\$sp')))" \
-   " = True" \
-diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
---- a/gdb/testsuite/gdb.python/py-value.exp
-+++ b/gdb/testsuite/gdb.python/py-value.exp
-@@ -419,6 +419,15 @@ proc test_value_after_death {} {
-     "print value's type"
- }
- 
-+# Regression test for a cast failure.  The bug was that if we cast a
-+# value to its own type, gdb could crash.  This happened because we
-+# could end up double-freeing a struct value.
-+proc test_cast_regression {} {
-+  gdb_test "python v = gdb.Value(5)" "" "create value for cast test"
-+  gdb_test "python v = v.cast(v.type)" "" "cast value for cast test"
-+  gdb_test "python print(v)" "5" "print value for cast test"
-+}
-+
- # Regression test for invalid subscript operations.  The bug was that
- # the type of the value was not being checked before allowing a
- # subscript operation to proceed.
-@@ -606,6 +615,7 @@ test_value_in_inferior
- test_value_from_buffer
- test_inferior_function_call
- test_value_after_death
-+test_cast_regression
- 
- # Test either C or C++ values. 
- 

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

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

gdb-bfd-aliasing.patch

@@ -1,196 +0,0 @@
-http://sourceware.org/ml/binutils/2016-03/msg00119.html
-Subject: [patch] aout+coff: Fix strict-aliasing rules error
-
-
---IJpNTDwzlM2Ie8A6
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-
-Hi,
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1315191 by Dan Horak
-gcc (GCC) 6.0.0 20160308 (experimental)
-gcc-6.0.0-0.15.fc24
-gcc-6.0.0-0.15.fc25
-It did compile with:
-gcc-6.0.0-0.14.fc24
-
-aoutx.h:2504:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-       int type_code = aout_symbol (symbol)->type & 0xff;
-       ^~~
-coffcode.h:1817:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-   coffsymbol (section->symbol)->native = native;
-   ^~~~~~~~~~
-
-Full log attached.
-
-This fix is probably wrong as it drops the type safety.  But ({ statements as
-expressions }) are probably not allowed in GDB.
-
-
-Jan
-
---IJpNTDwzlM2Ie8A6
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline; filename=1
-
-bfd/
-2016-03-08  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-	Fix strict-aliasing rules compilation error.
-	* libaout.h (aout_symbol): Remove type safe indirection.
-	* libcoff-in.h (coffsymbol): Likewise.
-	* libcoff.h: Regenerate.
-
-diff --git a/bfd/libaout.h b/bfd/libaout.h
-index 8b70a9f..b60c40c 100644
---- a/bfd/libaout.h
-+++ b/bfd/libaout.h
-@@ -448,9 +448,7 @@ struct  aout_data_struct
- #define obj_aout_sym_hashes(bfd)           (adata (bfd).sym_hashes)
- #define obj_aout_dynamic_info(bfd)         (adata (bfd).dynamic_info)
- 
--/* We take the address of the first element of an asymbol to ensure that the
--   macro is only ever applied to an asymbol.  */
--#define aout_symbol(asymbol) ((aout_symbol_type *)(&(asymbol)->the_bfd))
-+#define aout_symbol(asymbol) ((aout_symbol_type *) (asymbol))
- 
- /* Information we keep for each a.out section.  This is currently only
-    used by the a.out backend linker.  */
-diff --git a/bfd/libcoff-in.h b/bfd/libcoff-in.h
-index 80f999d..fa1e9ac 100644
---- a/bfd/libcoff-in.h
-+++ b/bfd/libcoff-in.h
-@@ -188,9 +188,7 @@ struct xcoff_tdata
- 
- #define xcoff_data(abfd) ((abfd)->tdata.xcoff_obj_data)
- 
--/* We take the address of the first element of an asymbol to ensure that the
--   macro is only ever applied to an asymbol.  */
--#define coffsymbol(asymbol) ((coff_symbol_type *)(&((asymbol)->the_bfd)))
-+#define coffsymbol(asymbol) ((coff_symbol_type *) (asymbol))
- 
- /* Tdata for sections in XCOFF files.  This is used by the linker.  */
- 
-diff --git a/bfd/libcoff.h b/bfd/libcoff.h
-index bbed3e0..8ce525b 100644
---- a/bfd/libcoff.h
-+++ b/bfd/libcoff.h
-@@ -192,9 +192,7 @@ struct xcoff_tdata
- 
- #define xcoff_data(abfd) ((abfd)->tdata.xcoff_obj_data)
- 
--/* We take the address of the first element of an asymbol to ensure that the
--   macro is only ever applied to an asymbol.  */
--#define coffsymbol(asymbol) ((coff_symbol_type *)(&((asymbol)->the_bfd)))
-+#define coffsymbol(asymbol) ((coff_symbol_type *) (asymbol))
- 
- /* Tdata for sections in XCOFF files.  This is used by the linker.  */
- 
-
---IJpNTDwzlM2Ie8A6
-Content-Type: text/plain; charset=iso-2022-jp
-Content-Disposition: inline; filename=2
-
-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I. -I. -I./../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_aout_linux_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -DHAVE_plugin_vec -DBINDIR=\"/usr/local/bin\" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Werror -I./../zlib -g -O2 -MT aout32.lo -MD -MP -MF .deps/aout32.Tpo -c aout32.c -o aout32.o
-In file included from aout32.c:24:0:
-aoutx.h: In function $B!F(Baout_32_write_syms$B!G(B:
-aoutx.h:1871:4: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-    H_PUT_16 (abfd, aout_symbol (g)->desc,  nsp.e_desc);
-    ^~~~~~~~
-aoutx.h:1872:4: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-    H_PUT_8  (abfd, aout_symbol (g)->other, nsp.e_other);
-    ^~~~~~~
-aoutx.h:1873:4: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-    H_PUT_8  (abfd, aout_symbol (g)->type,  nsp.e_type);
-    ^~~~~~~
-aoutx.h: In function $B!F(Baout_32_get_symbol_info$B!G(B:
-aoutx.h:2504:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-       int type_code = aout_symbol (symbol)->type & 0xff;
-       ^~~
-aoutx.h:2515:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-       ret->stab_other = (unsigned) (aout_symbol (symbol)->other & 0xff);
-       ^~~
-aoutx.h:2516:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-       ret->stab_desc = (unsigned) (aout_symbol (symbol)->desc & 0xffff);
-       ^~~
-aoutx.h: In function $B!F(Baout_32_print_symbol$B!G(B:
-aoutx.h:2537:9: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-         (unsigned) (aout_symbol (symbol)->desc & 0xffff),
-         ^
-aoutx.h:2538:9: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-         (unsigned) (aout_symbol (symbol)->other & 0xff),
-         ^
-aoutx.h:2539:9: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-         (unsigned) (aout_symbol (symbol)->type));
-         ^
-aoutx.h:2549:4: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-    (unsigned) (aout_symbol (symbol)->desc & 0xffff),
-    ^
-aoutx.h:2550:4: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-    (unsigned) (aout_symbol (symbol)->other & 0xff),
-    ^
-aoutx.h:2551:4: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-    (unsigned) (aout_symbol (symbol)->type & 0xff));
-    ^
-cc1: all warnings being treated as errors
-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I. -I. -I./../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_aout_linux_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -DHAVE_plugin_vec -DBINDIR=\"/usr/local/bin\" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Werror -I./../zlib -g -O2 -MT pei-i386.lo -MD -MP -MF .deps/pei-i386.Tpo -c pei-i386.c -o pei-i386.o
-In file included from coff-i386.c:614:0,
-                 from pei-i386.c:45:
-coffcode.h: In function $B!F(Bcoff_new_section_hook$B!G(B:
-coffcode.h:1817:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-   coffsymbol (section->symbol)->native = native;
-   ^~~~~~~~~~
-cc1: all warnings being treated as errors
-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I. -I. -I./../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_aout_linux_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -DHAVE_plugin_vec -DBINDIR=\"/usr/local/bin\" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Werror -I./../zlib -g -O2 -MT coffgen.lo -MD -MP -MF .deps/coffgen.Tpo -c coffgen.c -o coffgen.o
-coffgen.c: In function $B!F(Bcoff_get_lineno$B!G(B:
-coffgen.c:1510:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-   return coffsymbol (symbol)->lineno;
-   ^~~~~~
-coffgen.c: In function $B!F(Bcoff_get_symbol_info$B!G(B:
-coffgen.c:2034:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-   if (coffsymbol (symbol)->native != NULL
-   ^~
-coffgen.c:2035:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-       && coffsymbol (symbol)->native->fix_value
-       ^~
-coffgen.c:2036:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-       && coffsymbol (symbol)->native->is_sym)
-       ^~
-coffgen.c:2037:5: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-     ret->value = coffsymbol (symbol)->native->u.syment.n_value -
-     ^~~
-coffgen.c: In function $B!F(Bcoff_print_symbol$B!G(B:
-coffgen.c:2059:9: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-         coffsymbol (symbol)->native ? "n" : "g",
-         ^~~~~~~~~~
-coffgen.c:2060:9: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-         coffsymbol (symbol)->lineno ? "l" : " ");
-         ^~~~~~~~~~
-coffgen.c:2064:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-       if (coffsymbol (symbol)->native)
-       ^~
-coffgen.c:2068:4: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-    combined_entry_type *combined = coffsymbol (symbol)->native;
-    ^~~~~~~~~~~~~~~~~~~
-coffgen.c:2070:11: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-    struct lineno_cache_entry *l = coffsymbol (symbol)->lineno;
-           ^~~~~~~~~~~~~~~~~~
-coffgen.c:2191:6: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-      coffsymbol (symbol)->native ? "n" : "g",
-      ^~~~~~~~~~
-coffgen.c:2192:6: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-      coffsymbol (symbol)->lineno ? "l" : " ",
-      ^~~~~~~~~~
-cc1: all warnings being treated as errors
-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I. -I. -I./../include -DHAVE_x86_64_elf64_vec -DHAVE_i386_elf32_vec -DHAVE_iamcu_elf32_vec -DHAVE_x86_64_elf32_vec -DHAVE_i386_aout_linux_vec -DHAVE_i386_pei_vec -DHAVE_x86_64_pei_vec -DHAVE_l1om_elf64_vec -DHAVE_k1om_elf64_vec -DHAVE_elf64_le_vec -DHAVE_elf64_be_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -DHAVE_plugin_vec -DBINDIR=\"/usr/local/bin\" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Werror -I./../zlib -g -O2 -MT pei-x86_64.lo -MD -MP -MF .deps/pei-x86_64.Tpo -c pei-x86_64.c -o pei-x86_64.o
-In file included from coff-x86_64.c:741:0,
-                 from pei-x86_64.c:763:
-coffcode.h: In function $B!F(Bcoff_new_section_hook$B!G(B:
-coffcode.h:1817:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-   coffsymbol (section->symbol)->native = native;
-   ^~~~~~~~~~
-cc1: all warnings being treated as errors
-
---IJpNTDwzlM2Ie8A6--
-

gdb-btrobust.patch

@@ -1,45 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-btrobust.patch
-
-;; Continue backtrace even if a frame filter throws an exception (Phil Muldoon).
-;;=push
-
-This should fix the error  with glib.  An error message will still be
-printed, but a default backtrace will occur in this case.
-
---
-
-diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
---- a/gdb/python/py-framefilter.c
-+++ b/gdb/python/py-framefilter.c
-@@ -1204,6 +1204,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
- 				       htab_eq_pointer,
- 				       NULL));
- 
-+  int count_printed = 0;
-   while (true)
-     {
-       gdbpy_ref<> item (PyIter_Next (iterable.get ()));
-@@ -1212,8 +1213,8 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
- 	{
- 	  if (PyErr_Occurred ())
- 	    {
--	      gdbpy_print_stack_or_quit ();
--	      return EXT_LANG_BT_ERROR;
-+	      gdbpy_print_stack ();
-+	      return count_printed > 0 ? EXT_LANG_BT_ERROR : EXT_LANG_BT_NO_FILTERS;
- 	    }
- 	  break;
- 	}
-@@ -1245,7 +1246,8 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
-       /* Do not exit on error printing a single frame.  Print the
- 	 error and continue with other frames.  */
-       if (success == EXT_LANG_BT_ERROR)
--	gdbpy_print_stack_or_quit ();
-+	gdbpy_print_stack ();
-+      count_printed++;
-     }
- 
-   return success;

gdb-bz1219747-attach-kills.patch

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

gdb-bz533176-fortran-omp-step.patch

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

gdb-bz601887-dwarf4-rh-test.patch

@@ -1,254 +0,0 @@
-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\)}

gdb-bz634108-solib_address.patch

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

gdb-ccache-workaround.patch

@@ -1,26 +0,0 @@
-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}" \

gdb-config.patch

@@ -1,56 +0,0 @@
-diff -Nrup a/gnulib/import/m4/alloca.m4 b/gnulib/import/m4/alloca.m4
---- a/gnulib/import/m4/alloca.m4	2019-11-18 18:49:20.000000000 -0700
-+++ b/gnulib/import/m4/alloca.m4	2020-01-11 01:07:36.200483085 -0700
-@@ -89,7 +89,7 @@ AC_CACHE_CHECK([stack direction for C al
-                [ac_cv_c_stack_direction],
- [AC_RUN_IFELSE([AC_LANG_SOURCE(
- [AC_INCLUDES_DEFAULT
--int
-+__attribute__ (noinline,noclone)) int
- find_stack_direction (int *addr, int depth)
- {
-   int dir, dummy = 0;
-diff -Nrup a/libiberty/aclocal.m4 b/libiberty/aclocal.m4
---- a/libiberty/aclocal.m4	2019-01-19 09:01:34.000000000 -0700
-+++ b/libiberty/aclocal.m4	2020-01-09 22:00:27.183312982 -0700
-@@ -147,7 +147,7 @@ if test $ac_cv_os_cray = yes; then
- fi
- 
- AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
--[AC_TRY_RUN([find_stack_direction ()
-+[AC_TRY_RUN([__attribute__ ((noclone,noinline)) find_stack_direction ()
- {
-   static char *addr = 0;
-   auto char dummy;
-diff --git a/config/intdiv0.m4 b/config/intdiv0.m4
-index 55dddcf1..ba906efc 100644
---- a/config/intdiv0.m4
-+++ b/config/intdiv0.m4
-@@ -31,10 +31,10 @@ sigfpe_handler (sig) int sig;
-   exit (sig != SIGFPE);
- }
- 
--int x = 1;
--int y = 0;
--int z;
--int nan;
-+volatile int x = 1;
-+volatile int y = 0;
-+volatile int z;
-+volatile int nan;
- 
- int main ()
- {
-diff --git a/libiberty/configure.ac b/libiberty/configure.ac
-index f1ce7601..fc20d228 100644
---- a/libiberty/configure.ac
-+++ b/libiberty/configure.ac
-@@ -661,7 +661,7 @@ if test -z "${setobjs}"; then
-   for v in $vars; do
-     AC_MSG_CHECKING([for $v])
-     AC_CACHE_VAL(libiberty_cv_var_$v,
--      [AC_LINK_IFELSE([AC_LANG_PROGRAM([[int *p;]],[[extern int $v []; p = $v;]])],
-+      [AC_LINK_IFELSE([AC_LANG_PROGRAM([[__attribute__ ((used)) int *p;]],[[extern int $v []; p = $v;]])],
- 		      [eval "libiberty_cv_var_$v=yes"],
- 		      [eval "libiberty_cv_var_$v=no"])])
-     if eval "test \"`echo '$libiberty_cv_var_'$v`\" = yes"; then

gdb-container-rh-pkg.patch

@@ -9,10 +9,10 @@ Subject: gdb-container-rh-pkg.patch
 diff --git a/gdb/remote.c b/gdb/remote.c
 --- a/gdb/remote.c
 +++ b/gdb/remote.c
-@@ -14031,7 +14031,17 @@ remote_target::pid_to_exec_file (int pid)
+@@ -14742,7 +14742,17 @@ remote_target::pid_to_exec_file (int pid)
    char *annex = NULL;
  
-   if (packet_support (PACKET_qXfer_exec_file) != PACKET_ENABLE)
+   if (m_features.packet_support (PACKET_qXfer_exec_file) != PACKET_ENABLE)
 -    return NULL;
 +    {
 +      warning (_("Remote gdbserver does not support determining executable "

gdb-core-open-vdso-warning.patch

@@ -19,24 +19,22 @@ 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"
+@@ -27,6 +27,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" \
+ if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
+      || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
+@@ -61,4 +62,28 @@ 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
@@ -49,10 +47,12 @@ diff --git a/gdb/testsuite/gdb.base/solib-symbol.exp b/gdb/testsuite/gdb.base/so
 +	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"
++
+ gdb_exit

gdb-dts-rhel6-python-compat.patch

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

gdb-entryval-crash-1of3.patch

@@ -1,194 +0,0 @@
-http://sourceware.org/ml/gdb-patches/2014-07/msg00530.html
-Subject: [read_frame_arg patch] Handle partially optimized out values similarly to unavailable values (Re: [patchv2] Fix crash on optimized-out entry data values)
-
-
---V88s5gaDVPzZ0KCq
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-
-On Thu, 17 Jul 2014 14:23:06 +0200, Pedro Alves wrote:
-> On 07/16/2014 10:58 PM, Jan Kratochvil wrote:
-> > This patch is apparently not suitable for gdb-7.8 which is I guess often
-> > crashing on -O2 -g entry values so there could be some rather minimal crash
-> > avoiding patch instead.
-> 
-> Yeah.
-> 
-> So this was originally "caused" (more exposed) by 4f14910f:
->     
->         gdb/ChangeLog
->         2013-11-26  Andrew Burgess  <aburgess@broadcom.com>
->     
->             * value.c (allocate_optimized_out_value): Mark value as non-lazy.
-> 
-> I tried a few approaches in value_available_contents_eq
-> today, and ended up thinking that the simplest should be to
-> just revert that patch until we have the fuller fix in place.
-
-OK, that seems as the best solution for 7.8 to me.
-
-
-> While doing just that fixes the crash, it surprisingly causes
-> one of your new tests to FAIL:
-> 
->  (gdb) frame
->  #0  bar (ref=ref@entry=@0x7fffffffd184: 10) at gdb.arch/amd64-entry-value-paramref.cc:23
->  23        vv++; /* break-here */
->  (gdb) FAIL: gdb.arch/amd64-entry-value-paramref.exp: frame
-
-There is a bug in that entry value code of mine, fix attached.
-The testcase then PASSes with the reverted optimization by Andrew Burgess.
-
-For the attached fix - if you nitpick the missing conditional case:
-	value_optimized_out (val_deref) && value_optimized_out (entryval_deref)
-It is not detected there but that IMO does not matter much as
- * It is for 7.8 only, for trunk it will get compared correctly thanks to the
-   new implementation of value_available_contents_eq()
-   called value_contents_eq().
- * If the conditional
-                      if (val != val_deref
-                          && !value_optimized_out (val_deref)
-                          && !value_optimized_out (entryval_deref)
-                          && value_available_contents_eq (val_deref, 0,
-                                                          entryval_deref, 0,
-                                                      TYPE_LENGTH (type_deref)))
-                        val_equal = 1;
-   fails it may just print
-     bar (ref=@0x7fffffffd904: <optimized out>, ref@entry=@0x7fffffffd904: <optimized out>)
-   (or some variant with some partially optimized-out/unavailable parts)
-   instead of the more correct
-     bar (ref=ref@entry=@0x7fffffffd904: <optimized out>)
-   which is not much a bug.
-
-The attached fix no longe makes sense after the new implementation
-of value_available_contents_eq() called value_contents_eq() gets applied as it
-handles all the optimized-out/unavailable values on its own, therefore the
-attached patch is really only for 7.8.
-
-
-> Turns out it's the code disabled in value_of_dwarf_reg_entry:
-> 
->   target_val = dwarf_entry_parameter_to_value (parameter,
-> 					       TYPE_LENGTH (target_type),
-> 					       target_type, caller_frame,
-> 					       caller_per_cu);
-> 
->   /* value_as_address dereferences TYPE_CODE_REF.  */
->   addr = extract_typed_address (value_contents (outer_val), checked_type);
-> 
->   /* The target entry value has artificial address of the entry value
->      reference.  */
->   VALUE_LVAL (target_val) = lval_memory;
->   set_value_address (target_val, addr);
-> 
-> It looks quite wrong to me to just change a value's lval like that.
-> 
-> I ran the testsuite with that code disabled (like in the patch below),
-> and that caused no regressions.  I can't say I really understand the
-> intention here though.  What would we be missing if we removed that code?
-
-I cannot reproduce any wrong case having the code above #if 0-ed.
-
-I just do not find it correct to have it disabled.  But at the same time I do
-like much / I do not find correct the code myself.  It is a bit problematic to
-have struct value describing a memory content which is no longer present
-there.
-
-What happens there:
-------------------------------------------------------------------------------
-volatile int vv;
-static __attribute__((noinline)) int
-bar (int &ref) {
-  ref = 20;
-  vv++; /* break-here */
-  return ref;
-}
-int main (void) {
-  int var = 10;
-  return bar (var);
-}
-------------------------------------------------------------------------------
- <4><c7>: Abbrev Number: 13 (DW_TAG_GNU_call_site_parameter)
-    <c8>   DW_AT_location    : 1 byte block: 55         (DW_OP_reg5 (rdi))
-    <ca>   DW_AT_GNU_call_site_value: 2 byte block: 91 74       (DW_OP_fbreg: -12)
-    <cd>   DW_AT_GNU_call_site_data_value: 1 byte block: 3a     (DW_OP_lit10)
-------------------------------------------------------------------------------
-gdb -ex 'b value_addr' -ex r --args ../gdb ./1 -ex 'watch vv' -ex r -ex 'p &ref@entry'
-->
-6    return ref;
-bar (ref=@0x7fffffffd944: 20, ref@entry=@0x7fffffffd944: 10) at 1.C:25
-------------------------------------------------------------------------------
-At /* break-here */ struct value variable 'ref' is TYPE_CODE_REF.
-
-With FSF GDB HEAD:
-(gdb) x/gx arg1.contents
-0x6004000a4ad0: 0x00007fffffffd944
-(gdb) p ((struct value *)arg1.location.computed.closure).lval
-$1 = lval_memory
-(gdb) p/x ((struct value *)arg1.location.computed.closure).location.address
-$3 = 0x7fffffffd944
-
-With your #if0-ed code:
-(gdb) x/gx arg1.contents
-0x6004000a4ad0: 0x00007fffffffd944
-(gdb) p ((struct value *)arg1.location.computed.closure).lval
-$8 = not_lval
-(gdb) p/x ((struct value *)arg1.location.computed.closure).location.address
-$9 = 0x0
-
-I do not see how to access
-	((struct value *)arg1.location.computed.closure).location.address
-from GDB CLI.  Trying
-(gdb) p &ref@entry
-will invoke value_addr()'s:
-  if (TYPE_CODE (type) == TYPE_CODE_REF)
-      /* Copy the value, but change the type from (T&) to (T*).  We
-         keep the same location information, which is efficient, and
-         allows &(&X) to get the location containing the reference.  */
-and therefore the address gets fetched already from
-  arg1.contents
-and not from
-  ((struct value *)arg1.location.computed.closure).location.address
-.
-
-And for any other type than TYPE_CODE_REF this code you #if 0-ed does not get
-executed at all.  This DW_AT_GNU_call_site_data_value DWARF was meant
-primarily for Fortran but with -O0 entry values do not get produced
-and with -Og and higher Fortran always optimizes out the passing by reference.
-
-If you do not like the #if 0 code there I am OK with removing it as I do not
-know how to make it's use reproducible for user anyway.  In the worst case
-- if there really is some way how to exploit it - one should just get
-  Attempt to take address of value not located in memory.
-instead of some wrong value and it may be easy to fix then.
-
-
-Thanks for the analysis,
-Jan
-
---V88s5gaDVPzZ0KCq
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline; filename=1
-
-gdb/
-2014-07-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-	* stack.c (read_frame_arg): Verify value_optimized_out before calling
-	value_available_contents_eq.
-
-diff --git a/gdb/stack.c b/gdb/stack.c
-index 0d6d8e7..4db5df5 100644
---- a/gdb/stack.c
-+++ b/gdb/stack.c
-@@ -413,6 +413,8 @@ read_frame_arg (struct symbol *sym, struct frame_info *frame,
- 		      /* If the reference addresses match but dereferenced
- 			 content does not match print them.  */
- 		      if (val != val_deref
-+		          && !value_optimized_out (val_deref)
-+		          && !value_optimized_out (entryval_deref)
- 			  && value_available_contents_eq (val_deref, 0,
- 							  entryval_deref, 0,
- 						      TYPE_LENGTH (type_deref)))
-
---V88s5gaDVPzZ0KCq--
-

gdb-entryval-crash-2of3.patch

@@ -1,44 +0,0 @@
-revert:
-commit 4f14910fa1331398cc695011a6af43a89252b4b1
-Author: Andrew Burgess <aburgess@broadcom.com>
-Date:   Tue Nov 26 16:21:53 2013 +0000
-
-    Mark entirely optimized out value as non-lazy.
-    
-    If a value is entirely optimized out, then there's nothing for
-    value_fetch_lazy to fetch.  Sequences like:
-    
-     if (value_lazy (retval))
-       value_fetch_lazy (retval);
-    
-    End up allocating the value contents buffer, wasting memory, for no
-    use.
-    
-    gdb/ChangeLog
-    2013-11-26  Andrew Burgess  <aburgess@broadcom.com>
-    
-    	* value.c (allocate_optimized_out_value): Mark value as non-lazy.
-
-### a/gdb/ChangeLog
-### b/gdb/ChangeLog
-## -1,3 +1,7 @@
-+2013-11-26  Andrew Burgess  <aburgess@broadcom.com>
-+
-+	* value.c (allocate_optimized_out_value): Mark value as non-lazy.
-+
- 2013-11-26  Tom Tromey  <tromey@redhat.com>
- 
- 	* dwarf2-frame.c (dwarf2_frame_cache): Revert patch from
-diff --git a/gdb/value.c b/gdb/value.c
-index 29abe5f..f073d71 100644
---- a/gdb/value.c
-+++ b/gdb/value.c
-@@ -906,7 +906,7 @@ allocate_optimized_out_value (struct type *type)
-   struct value *retval = allocate_value_lazy (type);
- 
-   set_value_optimized_out (retval, 1);
--  set_value_lazy (retval, 0);
-+
-   return retval;
- }
- 

gdb-fedora-libncursesw.patch

@@ -12,7 +12,269 @@ 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
+@@ -780,9 +780,6 @@ ENABLE_BFD_64_BIT_TRUE
+ subdirs
+ RPM_LIBS
+ RPM_CFLAGS
+-PKG_CONFIG_LIBDIR
+-PKG_CONFIG_PATH
+-PKG_CONFIG
+ GDB_DATADIR
+ DEBUGDIR
+ MAKEINFO_EXTRA_FLAGS
+@@ -990,12 +987,12 @@ PKG_CONFIG_PATH
+ PKG_CONFIG_LIBDIR
+ MAKEINFO
+ MAKEINFOFLAGS
++RPM_CFLAGS
++RPM_LIBS
+ AMD_DBGAPI_CFLAGS
+ AMD_DBGAPI_LIBS
+ DEBUGINFOD_CFLAGS
+ DEBUGINFOD_LIBS
+-RPM_CFLAGS
+-RPM_LIBS
+ YACC
+ YFLAGS
+ ZSTD_CFLAGS
+@@ -1684,11 +1681,11 @@ Optional Packages:
+                           [--with-auto-load-dir]
+   --without-auto-load-safe-path
+                           do not restrict auto-loaded files locations
++  --with-rpm              query rpm database for missing debuginfos (yes/no,
++                          def. auto=librpm.so)
+   --with-amd-dbgapi       support for the amd-dbgapi target (yes / no / auto)
+   --with-debuginfod       Enable debuginfo lookups with debuginfod
+                           (auto/yes/no)
+-  --with-rpm              query rpm database for missing debuginfos (yes/no,
+-                          def. auto=librpm.so)
+   --with-libunwind-ia64   use libunwind frame unwinding for ia64 targets
+   --with-curses           use the curses library instead of the termcap
+                           library
+@@ -1761,6 +1758,8 @@ Some influential environment variables:
+   MAKEINFO    Parent configure detects if it is of sufficient version.
+   MAKEINFOFLAGS
+               Parameters for MAKEINFO.
++  RPM_CFLAGS  C compiler flags for RPM, overriding pkg-config
++  RPM_LIBS    linker flags for RPM, overriding pkg-config
+   AMD_DBGAPI_CFLAGS
+               C compiler flags for AMD_DBGAPI, overriding pkg-config
+   AMD_DBGAPI_LIBS
+@@ -1769,8 +1768,6 @@ Some influential environment variables:
+               C compiler flags for DEBUGINFOD, overriding pkg-config
+   DEBUGINFOD_LIBS
+               linker flags for DEBUGINFOD, overriding pkg-config
+-  RPM_CFLAGS  C compiler flags for RPM, overriding pkg-config
+-  RPM_LIBS    linker flags for RPM, overriding pkg-config
+   YACC        The `Yet Another Compiler Compiler' implementation to use.
+               Defaults to the first program found out of: `bison -y', `byacc',
+               `yacc'.
+@@ -11495,7 +11492,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11486 "configure"
++#line 11495 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11601,7 +11598,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11592 "configure"
++#line 11601 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -18102,8 +18099,8 @@ $as_echo_n "checking specific librpm version... " >&6; }
+   if test "$cross_compiling" = yes; then :
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot run test program while cross compiling
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+@@ -18275,132 +18272,12 @@ $as_echo "#define HAVE_LIBRPM 1" >>confdefs.h
+ $as_echo "no" >&6; }
+     LIBS="$save_LIBS"
+     if $DLOPEN_REQUIRE; then
+-      as_fn_error "Specific name $LIBRPM was requested but it could not be opened." "$LINENO" 5
++      as_fn_error $? "Specific name $LIBRPM was requested but it could not be opened." "$LINENO" 5
+     fi
+ 
+-
+-
+-
+-
+-
+-
+-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+-	if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $PKG_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_path_PKG_CONFIG"; then
+-  ac_pt_PKG_CONFIG=$PKG_CONFIG
+-  # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $ac_pt_PKG_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+-if test -n "$ac_pt_PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_pt_PKG_CONFIG" = x; then
+-    PKG_CONFIG=""
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    PKG_CONFIG=$ac_pt_PKG_CONFIG
+-  fi
+-else
+-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+-fi
+-
+-fi
+-if test -n "$PKG_CONFIG"; then
+-	_pkg_min_version=0.9.0
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	else
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-		PKG_CONFIG=""
+-	fi
+-fi
+-
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RPM" >&5
+-$as_echo_n "checking for RPM... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rpm" >&5
++$as_echo_n "checking for rpm... " >&6; }
+ 
+ if test -n "$RPM_CFLAGS"; then
+     pkg_cv_RPM_CFLAGS="$RPM_CFLAGS"
+@@ -18437,6 +18314,30 @@ fi
+     pkg_failed=untried
+ fi
+ 
++if test $pkg_failed = no; then
++  pkg_save_LDFLAGS="$LDFLAGS"
++  LDFLAGS="$LDFLAGS $pkg_cv_RPM_LIBS"
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++
++else
++  pkg_failed=yes
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++  LDFLAGS=$pkg_save_LDFLAGS
++fi
++
+ 
+ 
+ if test $pkg_failed = yes; then
+@@ -18531,7 +18432,7 @@ $as_echo "#define HAVE_LIBRPM 1" >>confdefs.h
+       LIBS="$LIBS $RPM_LIBS"
+     else
+       if $RPM_REQUIRE; then
+-	as_fn_error "$RPM_PKG_ERRORS" "$LINENO" 5
++	as_fn_error $? "$RPM_PKG_ERRORS" "$LINENO" 5
+       else
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $RPM_PKG_ERRORS" >&5
+ $as_echo "$as_me: WARNING: $RPM_PKG_ERRORS" >&2;}
+@@ -21164,6 +21065,7 @@ if test x"$prefer_curses" = xyes; then
    # search /usr/local/include, if ncurses is installed in /usr/local.  A
    # default installation of ncurses on alpha*-dec-osf* will lead to such
    # a situation.
@@ -20,7 +282,7 @@ diff --git a/gdb/configure b/gdb/configure
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing waddstr" >&5
  $as_echo_n "checking for library containing waddstr... " >&6; }
  if ${ac_cv_search_waddstr+:} false; then :
-@@ -9673,7 +9674,7 @@ return waddstr ();
+@@ -21188,7 +21090,7 @@ return waddstr ();
    return 0;
  }
  _ACEOF
@@ -29,7 +291,7 @@ diff --git a/gdb/configure b/gdb/configure
    if test -z "$ac_lib"; then
      ac_res="none required"
    else
-@@ -9747,6 +9748,7 @@ case $host_os in
+@@ -21260,6 +21162,7 @@ case $host_os in
  esac
  
  # These are the libraries checked by Readline.
@@ -37,7 +299,7 @@ diff --git a/gdb/configure b/gdb/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
  $as_echo_n "checking for library containing tgetent... " >&6; }
  if ${ac_cv_search_tgetent+:} false; then :
-@@ -9771,7 +9773,7 @@ return tgetent ();
+@@ -21284,7 +21187,7 @@ return tgetent ();
    return 0;
  }
  _ACEOF
@@ -49,17 +311,17 @@ diff --git a/gdb/configure b/gdb/configure
 diff --git a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -712,7 +712,8 @@ if test x"$prefer_curses" = xyes; then
+@@ -749,7 +749,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])
+-  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
++  AC_SEARCH_LIBS(waddstr, [ncursesw],
+                  [curses_found=yes
+                   AC_DEFINE([HAVE_LIBCURSES], [1],
+                             [Define to 1 if curses is enabled.])
+@@ -789,7 +790,8 @@ case $host_os in
  esac
  
  # These are the libraries checked by Readline.

gdb-fortran-frame-string.patch

@@ -1,104 +0,0 @@
-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

gdb-ftbs-swapped-calloc-args.patch

@@ -0,0 +1,42 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Wed, 17 Jan 2024 12:53:53 -0700
+Subject: gdb-ftbs-swapped-calloc-args.patch
+
+Backport upstream commit 54195469c18ec9873cc5ba6907f768509473fa9b
+which fixes a build problem in which arguments to calloc were swapped.
+
+[opcodes] ARC + PPC: Fix -Walloc-size warnings
+
+Recently, -Walloc-size warnings started to kick in. Fix these two
+calloc() calls to match the intended usage pattern.
+
+opcodes/ChangeLog:
+
+	* arc-dis.c (init_arc_disasm_info): Fix calloc() call.
+	* ppc-dis.c (powerpc_init_dialect): Ditto.
+
+diff --git a/opcodes/arc-dis.c b/opcodes/arc-dis.c
+--- a/opcodes/arc-dis.c
++++ b/opcodes/arc-dis.c
+@@ -147,7 +147,7 @@ static bool
+ init_arc_disasm_info (struct disassemble_info *info)
+ {
+   struct arc_disassemble_info *arc_infop
+-    = calloc (sizeof (*arc_infop), 1);
++    = calloc (1, sizeof (*arc_infop));
+ 
+   if (arc_infop == NULL)
+     return false;
+diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
+--- a/opcodes/ppc-dis.c
++++ b/opcodes/ppc-dis.c
+@@ -348,7 +348,7 @@ powerpc_init_dialect (struct disassemble_info *info)
+ {
+   ppc_cpu_t dialect = 0;
+   ppc_cpu_t sticky = 0;
+-  struct dis_private *priv = calloc (sizeof (*priv), 1);
++  struct dis_private *priv = calloc (1, sizeof (*priv));
+ 
+   if (priv == NULL)
+     return;

gdb-gcc-13-backport-self-move-diagnostic-fix

@@ -0,0 +1,43 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Fri, 20 Jan 2023 15:15:59 -0700
+Subject: gdb-gcc-13-backport-self-move-diagnostic-fix
+
+;; gcc 13 fallout: Backport Jan-Benedict Glaw's fix for the self-move
+;; warning check
+
+Fix self-move warning check for GCC 13+
+
+GCC 13 got the self-move warning (0abb78dda084a14b3d955757c6431fff71c263f3),
+but that warning is only checked for clang, resulting in:
+
+/usr/lib/gcc-snapshot/bin/g++ -x c++    -I. -I. -I./config -DLOCALEDIR="\"/tmp/gdb-m68k-linux/share/locale\"" -DHAVE_CONFIG_H -I./../include/opcode -I./../readline/readline/.. -I./../zlib  -I../bfd -I./../bfd -I./../include -I../libdecnumber -I./../libdecnumber  -I./../gnulib/import -I../gnulib/import -I./.. -I.. -I./../libbacktrace/ -I../libbacktrace/  -DTUI=1    -I./.. -pthread  -Wall -Wpointer-arith -Wno-unused -Wunused-value -Wunused-variable -Wunused-function -Wno-switch -Wno-char-subscripts -Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable -Wno-sign-compare -Wno-error=maybe-uninitialized -Wno-mismatched-tags -Wsuggest-override -Wimplicit-fallthrough=3 -Wduplicated-cond -Wshadow=local -Wdeprecated-copy -Wdeprecated-copy-dtor -Wredundant-move -Wmissing-declarations -Wstrict-null-sentinel -Wformat -Wformat-nonliteral -Werror -g -O2   -c -o unittests/environ-selftests.o -MT unittests/environ-selftests.o -MMD -MP -MF unittests/.deps/environ-selftests.Tpo unittests/environ-selftests.c
+unittests/environ-selftests.c: In function 'void selftests::gdb_environ_tests::test_self_move()':
+unittests/environ-selftests.c:228:7: error: moving 'env' of type 'gdb_environ' to itself [-Werror=self-move]
+  228 |   env = std::move (env);
+      |   ~~~~^~~~~~~~~~~~~~~~~
+unittests/environ-selftests.c:228:7: note: remove 'std::move' call
+cc1plus: all warnings being treated as errors
+make[1]: *** [Makefile:1896: unittests/environ-selftests.o] Error 1
+make[1]: Leaving directory '/var/lib/laminar/run/gdb-m68k-linux/3/binutils-gdb/gdb'
+make: *** [Makefile:13193: all-gdb] Error 2
+
+diff --git a/include/diagnostics.h b/include/diagnostics.h
+--- a/include/diagnostics.h
++++ b/include/diagnostics.h
+@@ -79,6 +79,15 @@
+ # define DIAGNOSTIC_IGNORE_FORMAT_NONLITERAL \
+   DIAGNOSTIC_IGNORE ("-Wformat-nonliteral")
+ 
++# if __GNUC__ >= 5
++#  define DIAGNOSTIC_IGNORE_UNUSED_BUT_SET_VARIABLE \
++   DIAGNOSTIC_IGNORE ("-Wunused-but-set-variable")
++# endif
++
++# if __GNUC__ >= 13
++#  define DIAGNOSTIC_IGNORE_SELF_MOVE DIAGNOSTIC_IGNORE ("-Wself-move")
++# endif
++
+ /* GCC 4.8's "diagnostic push/pop" seems broken when using this, -Wswitch
+    remains enabled at the error level even after a pop.  Therefore, don't
+    use it for GCC < 5.  */

gdb-glibc-strstr-workaround.patch

@@ -10,7 +10,7 @@ diff --git a/gdb/testsuite/gdb.base/gnu-ifunc-strstr-workaround.exp b/gdb/testsu
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gnu-ifunc-strstr-workaround.exp
-@@ -0,0 +1,115 @@
+@@ -0,0 +1,119 @@
 +# Copyright (C) 2012 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -56,6 +56,10 @@ new file mode 100644
 +	untested "$test (no DWARF)"
 +	return 0
 +    }
++    -re "type = <unknown return type> \\(\\)\r\n$gdb_prompt $" {
++	untested "$test (no DWARF)"
++	return 0
++    }
 +}
 +
 +set addr ""
@@ -124,5 +128,5 @@ new file mode 100644
 +    }
 +}
 +
-+gdb_test {print strstr("abc","b")} { = 0x[0-9a-f]+ "bc"}
-+gdb_test {print strstr("def","e")} { = 0x[0-9a-f]+ "ef"}
++gdb_test {print (char *)strstr("abc","b")} { = 0x[0-9a-f]+ "bc"}
++gdb_test {print (char *)strstr("def","e")} { = 0x[0-9a-f]+ "ef"}

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

@@ -1,219 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-gnat-dwarf-crash-3of3.patch
-
-;; Fix crash of -readnow /usr/lib/debug/usr/bin/gnatbind.debug (BZ 1069211).
-;;=push+jan
-
-http://sourceware.org/ml/gdb-patches/2014-02/msg00731.html
-
---6TrnltStXW4iwmi0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-
-Hi,
-
-PR 16581:
-	GDB crash on inherit_abstract_dies infinite recursion
-	https://sourceware.org/bugzilla/show_bug.cgi?id=16581
-
-fixed crash from an infinite recursion.  But in rare cases the new code can
-now gdb_assert() due to weird DWARF file.
-
-I do not yet fully understand why the DWARF is as it is but just GDB should
-never crash due to invalid DWARF anyway.  The "invalid" DWARF I see only in
-Fedora GCC build, not in FSF GCC build, more info at:
-	https://bugzilla.redhat.com/show_bug.cgi?id=1069382
-	http://people.redhat.com/jkratoch/gcc-debuginfo-4.8.2-7.fc20.x86_64-gnatbind.debug
-
-Thanks,
-Jan
-
---6TrnltStXW4iwmi0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline; filename="complaint.patch"
-
-gdb/
-2014-02-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-	* dwarf2read.c (process_die): Change gdb_assert to complaint.
-
-diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
---- a/gdb/dwarf2/read.c
-+++ b/gdb/dwarf2/read.c
-@@ -10162,6 +10162,13 @@ class process_die_scope
- static void
- process_die (struct die_info *die, struct dwarf2_cu *cu)
- {
-+  if (die->in_process)
-+    {
-+      complaint (_("DIE at 0x%s attempted to be processed twice"),
-+		 sect_offset_str (die->sect_off));
-+      return;
-+    }
-+
-   process_die_scope scope (die, cu);
- 
-   switch (die->tag)
-diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
---- a/gdb/linux-nat.c
-+++ b/gdb/linux-nat.c
-@@ -190,6 +190,12 @@ struct linux_nat_target *linux_target;
- /* Does the current host support PTRACE_GETREGSET?  */
- enum tribool have_ptrace_getregset = TRIBOOL_UNKNOWN;
- 
-+#ifdef NEED_DETACH_SIGSTOP
-+/* PID of the inferior stopped by SIGSTOP before attaching (or zero).  */
-+static pid_t pid_was_stopped;
-+
-+#endif
-+
- static unsigned int debug_linux_nat;
- static void
- show_debug_linux_nat (struct ui_file *file, int from_tty,
-@@ -1044,6 +1050,9 @@ linux_nat_post_attach_wait (ptid_t ptid, int *signalled)
-   if (linux_proc_pid_is_stopped (pid))
-     {
-       linux_nat_debug_printf ("Attaching to a stopped process");
-+#ifdef NEED_DETACH_SIGSTOP
-+      pid_was_stopped = ptid.pid ();
-+#endif
- 
-       /* The process is definitely stopped.  It is in a job control
- 	 stop, unless the kernel predates the TASK_STOPPED /
-@@ -1359,6 +1368,25 @@ get_detach_signal (struct lwp_info *lp)
-       return gdb_signal_to_host (signo);
-     }
- 
-+#ifdef NEED_DETACH_SIGSTOP
-+  /* Workaround RHEL-5 kernel which has unreliable PTRACE_DETACH, SIGSTOP (that
-+     many TIDs are left unstopped).  See RH Bug 496732.  */
-+  if (lp->ptid.pid () == pid_was_stopped)
-+    {
-+      int err;
-+
-+      errno = 0;
-+      err = kill_lwp (lp->ptid.lwp (), SIGSTOP);
-+      if (debug_linux_nat)
-+	{
-+	  fprintf_unfiltered (gdb_stdlog,
-+			      "SC:  lwp kill %d %s\n",
-+			      err,
-+			      errno ? safe_strerror (errno) : "ERRNO-OK");
-+	}
-+    }
-+
-+#endif
-   return 0;
- }
- 
-@@ -1502,6 +1530,10 @@ linux_nat_target::detach (inferior *inf, int from_tty)
-       detach_one_lwp (main_lwp, &signo);
- 
-       detach_success (inf);
-+
-+#ifdef NEED_DETACH_SIGSTOP
-+      pid_was_stopped = 0;
-+#endif
-     }
- }
- 
-@@ -1744,6 +1776,16 @@ linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
-       return;
-     }
- 
-+#ifdef NEED_DETACH_SIGSTOP
-+  /* At this point, we are going to resume the inferior and if we
-+     have attached to a stopped process, we no longer should leave
-+     it as stopped if the user detaches.  PTID variable has PID set to LWP
-+     while we need to check the real PID here.  */
-+
-+  if (!step && lp && pid_was_stopped == lp->ptid.pid ())
-+    pid_was_stopped = 0;
-+
-+#endif
-   if (resume_many)
-     iterate_over_lwps (ptid, [=] (struct lwp_info *info)
- 			     {
-@@ -3617,6 +3659,10 @@ linux_nat_target::mourn_inferior ()
- 
-   /* Let the arch-specific native code know this process is gone.  */
-   linux_target->low_forget_process (pid);
-+#ifdef NEED_DETACH_SIGSTOP
-+
-+  pid_was_stopped = 0;
-+#endif
- }
- 
- /* Convert a native/host siginfo object, into/from the siginfo in the
-diff --git a/gdb/testsuite/gdb.threads/attach-stopped.exp b/gdb/testsuite/gdb.threads/attach-stopped.exp
---- a/gdb/testsuite/gdb.threads/attach-stopped.exp
-+++ b/gdb/testsuite/gdb.threads/attach-stopped.exp
-@@ -56,7 +56,65 @@ proc corefunc { threadtype } {
-     gdb_reinitialize_dir $srcdir/$subdir
-     gdb_load ${binfile}
- 
--    # Verify that we can attach to the stopped process.
-+    # Verify that we can attach to the process by first giving its
-+    # executable name via the file command, and using attach with the
-+    # process ID.
-+
-+    set test "$threadtype: set file, before attach1 to stopped process"
-+    gdb_test_multiple "file $binfile" "$test" {
-+       -re "Load new symbol table from.*y or n. $" {
-+	    gdb_test "y" "Reading symbols from $escapedbinfile\.\.\.*done." \
-+		    "$test (re-read)"
-+	}
-+	-re "Reading symbols from $escapedbinfile\.\.\.*done.*$gdb_prompt $" {
-+	    pass "$test"
-+	}
-+    }
-+
-+    set test "$threadtype: attach1 to stopped, after setting file"
-+    gdb_test_multiple "attach $testpid" "$test" {
-+	-re "Attaching to program.*`?$escapedbinfile'?, process $testpid.*$gdb_prompt $" {
-+	    pass "$test"
-+	}
-+    }
-+
-+    # ".*sleep.*clone.*" would fail on s390x as bt stops at START_THREAD there.
-+    if {[string equal $threadtype threaded]} {
-+	gdb_test "thread apply all bt" ".*sleep.*start_thread.*" "$threadtype: attach1 to stopped bt"
-+    } else {
-+	gdb_test "bt" ".*sleep.*main.*" "$threadtype: attach1 to stopped bt"
-+    }
-+
-+    # Exit and detach the process.
-+       
-+    gdb_exit
-+
-+    # Avoid some race:
-+    sleep 2
-+
-+    if [catch {open /proc/${testpid}/status r} fileid] {
-+	set line2 "NOTFOUND"
-+    } else {
-+	gets $fileid line1;
-+	gets $fileid line2;
-+	close $fileid;
-+    }
-+
-+    set test "$threadtype: attach1, exit leaves process stopped"
-+    if {[string match "*(stopped)*" $line2]} {
-+      pass $test
-+    } else {
-+      fail $test
-+    }
-+
-+    # At this point, the process should still be stopped
-+
-+    gdb_start
-+    gdb_reinitialize_dir $srcdir/$subdir
-+    gdb_load ${binfile}
-+
-+    # Verify that we can attach to the process just by giving the
-+    # process ID.
-        
-     set test "$threadtype: attach2 to stopped, after setting file"
-     gdb_test_multiple "attach $testpid" "$test" {

gdb-jit-reader-multilib.patch

@@ -1,46 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-jit-reader-multilib.patch
-
-;; Fix jit-reader.h for multi-lib.
-;;=push+jan
-
-diff --git a/gdb/configure b/gdb/configure
---- a/gdb/configure
-+++ b/gdb/configure
-@@ -9968,10 +9968,12 @@ _ACEOF
- 
- 
- 
--if test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
--  TARGET_PTR="unsigned long"
--elif test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
-+# Try to keep TARGET_PTR the same across archs so that jit-reader.h file
-+# content is the same for multilib distributions.
-+if test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
-   TARGET_PTR="unsigned long long"
-+elif test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
-+  TARGET_PTR="unsigned long"
- elif test "x${ac_cv_sizeof_unsigned___int128}" = "x16"; then
-   TARGET_PTR="unsigned __int128"
- else
-diff --git a/gdb/configure.ac b/gdb/configure.ac
---- a/gdb/configure.ac
-+++ b/gdb/configure.ac
-@@ -803,10 +803,12 @@ AC_CHECK_SIZEOF(unsigned long long)
- AC_CHECK_SIZEOF(unsigned long)
- AC_CHECK_SIZEOF(unsigned __int128)
- 
--if test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
--  TARGET_PTR="unsigned long"
--elif test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
-+# Try to keep TARGET_PTR the same across archs so that jit-reader.h file
-+# content is the same for multilib distributions.
-+if test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
-   TARGET_PTR="unsigned long long"
-+elif test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
-+  TARGET_PTR="unsigned long"
- elif test "x${ac_cv_sizeof_unsigned___int128}" = "x16"; then
-   TARGET_PTR="unsigned __int128"
- else

gdb-libexec-add-index.patch

@@ -1,37 +0,0 @@
-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=""

gdb-lineno-makeup-test.patch

@@ -1,165 +0,0 @@
-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
-+    }
-+}

gdb-linux_perf-bundle.patch

@@ -9,9 +9,9 @@ Subject: gdb-linux_perf-bundle.patch
 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"
+@@ -21,6 +21,10 @@
  #include "interps.h"
+ #include "run-on-main-thread.h"
  
 +#ifdef PERF_ATTR_SIZE_VER5_BUNDLE
 +extern "C" void __libipt_init(void);
@@ -20,6 +20,8 @@ diff --git a/gdb/gdb.c b/gdb/gdb.c
  int
  main (int argc, char **argv)
  {
+@@ -32,6 +36,10 @@ main (int argc, char **argv)
+ 
    struct captured_main_args args;
  
 +#ifdef PERF_ATTR_SIZE_VER5_BUNDLE
@@ -32,7 +34,7 @@ diff --git a/gdb/gdb.c b/gdb/gdb.c
 diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h
 --- a/gdb/nat/linux-btrace.h
 +++ b/gdb/nat/linux-btrace.h
-@@ -27,6 +27,177 @@
+@@ -28,6 +28,177 @@
  #  include <linux/perf_event.h>
  #endif
  
@@ -213,7 +215,7 @@ diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.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], [
+@@ -168,7 +168,7 @@ AC_DEFUN([GDB_AC_COMMON], [
      AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
    #include <linux/perf_event.h>
    #ifndef PERF_ATTR_SIZE_VER5

gdb-moribund-utrace-workaround.patch

@@ -1,25 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-moribund-utrace-workaround.patch
-
-;; Workaround non-stop moribund locations exploited by kernel utrace (BZ 590623).
-;;=push+jan: Currently it is still not fully safe.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=590623
-http://sources.redhat.com/bugzilla/show_bug.cgi?id=11593
-
-Bug in FSF GDB exploited by the ptrace-on-utrace interaction.
-
-diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
---- a/gdb/breakpoint.c
-+++ b/gdb/breakpoint.c
-@@ -11948,6 +11948,8 @@ update_global_location_list (enum ugll_insert_mode insert_mode)
- 		  = 3 * (thread_count (proc_target) + 1);
- 	      else
- 		old_loc->events_till_retirement = 1;
-+	      /* Red Hat Bug 590623.  */
-+	      old_loc->events_till_retirement *= 10;
- 	      old_loc->owner = NULL;
- 
- 	      moribund_locations.push_back (old_loc);

gdb-opcodes-clflushopt-test.patch

@@ -1,62 +0,0 @@
-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"

gdb-physname-pr11734-test.patch

@@ -1,234 +0,0 @@
-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,30 @@
-+/* 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,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  */
-+
-+#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,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  */
-+
-+#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,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  */
-+
-+#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,28 @@
-+/* 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 *);
-+};
-+

gdb-physname-pr12273-test.patch

@@ -1,103 +0,0 @@
-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

gdb-ppc-power7-test.patch

@@ -1,303 +0,0 @@
-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       */

gdb-rhbz-2232086-cpp-ify-mapped-symtab.patch

@@ -0,0 +1,264 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Andrew Burgess <aburgess@redhat.com>
+Date: Sat, 25 Nov 2023 10:35:37 +0000
+Subject: gdb-rhbz-2232086-cpp-ify-mapped-symtab.patch
+
+;; Back-port upstream commit acc117b57f7 as part of a fix for
+;; non-deterministic gdb-index generation (RH BZ 2232086).
+
+gdb: C++-ify mapped_symtab from dwarf2/index-write.c
+
+Make static the functions add_index_entry, find_slot, and hash_expand,
+member functions of the mapped_symtab class.
+
+Fold an additional snippet of code from write_gdbindex into
+mapped_symtab::minimize, this code relates to minimisation, so this
+seems like a good home for it.
+
+Make the n_elements, data, and m_string_obstack member variables of
+mapped_symtab private.  Provide a new obstack() member function to
+provide access to the obstack when needed, and also add member
+functions begin(), end(), cbegin(), and cend() so that the
+mapped_symtab class can be treated like a contained and iterated
+over.
+
+I've also taken this opportunity to split out the logic for whether
+the hash table (m_data) needs expanding, this is the new function
+hash_needs_expanding.  This will be useful in a later commit.
+
+There should be no user visible changes after this commit.
+
+Approved-By: Tom Tromey <tom@tromey.com>
+
+diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
+--- a/gdb/dwarf2/index-write.c
++++ b/gdb/dwarf2/index-write.c
+@@ -187,86 +187,135 @@ struct mapped_symtab
+ {
+   mapped_symtab ()
+   {
+-    data.resize (1024);
++    m_data.resize (1024);
+   }
+ 
+-  /* Minimize each entry in the symbol table, removing duplicates.  */
++  /* If there are no elements in the symbol table, then reduce the table
++     size to zero.  Otherwise call symtab_index_entry::minimize each entry
++     in the symbol table.  */
++
+   void minimize ()
+   {
+-    for (symtab_index_entry &item : data)
++    if (m_element_count == 0)
++      m_data.resize (0);
++
++    for (symtab_index_entry &item : m_data)
+       item.minimize ();
+   }
+ 
+-  offset_type n_elements = 0;
+-  std::vector<symtab_index_entry> data;
++  /* Add an entry to SYMTAB.  NAME is the name of the symbol.  CU_INDEX is
++     the index of the CU in which the symbol appears.  IS_STATIC is one if
++     the symbol is static, otherwise zero (global).  */
++
++  void add_index_entry (const char *name, int is_static,
++			gdb_index_symbol_kind kind, offset_type cu_index);
++
++  /* Access the obstack.  */
++  struct obstack *obstack ()
++  { return &m_string_obstack; }
++
++private:
++
++  /* Find a slot in SYMTAB for the symbol NAME.  Returns a reference to
++     the slot.
++
++     Function is used only during write_hash_table so no index format
++     backward compatibility is needed.  */
++
++  symtab_index_entry &find_slot (const char *name);
++
++  /* Expand SYMTAB's hash table.  */
++
++  void hash_expand ();
++
++  /* Return true if the hash table in data needs to grow.  */
++
++  bool hash_needs_expanding () const
++  { return 4 * m_element_count / 3 >= m_data.size (); }
++
++  /* A vector that is used as a hash table.  */
++  std::vector<symtab_index_entry> m_data;
++
++  /* The number of elements stored in the m_data hash.  */
++  offset_type m_element_count = 0;
+ 
+   /* Temporary storage for names.  */
+   auto_obstack m_string_obstack;
+-};
+ 
+-/* Find a slot in SYMTAB for the symbol NAME.  Returns a reference to
+-   the slot.
++public:
++  using iterator = decltype (m_data)::iterator;
++  using const_iterator = decltype (m_data)::const_iterator;
+ 
+-   Function is used only during write_hash_table so no index format backward
+-   compatibility is needed.  */
++  iterator begin ()
++  { return m_data.begin (); }
+ 
+-static symtab_index_entry &
+-find_slot (struct mapped_symtab *symtab, const char *name)
++  iterator end ()
++  { return m_data.end (); }
++
++  const_iterator cbegin ()
++  { return m_data.cbegin (); }
++
++  const_iterator cend ()
++  { return m_data.cend (); }
++};
++
++/* See class definition.  */
++
++symtab_index_entry &
++mapped_symtab::find_slot (const char *name)
+ {
+   offset_type index, step, hash = mapped_index_string_hash (INT_MAX, name);
+ 
+-  index = hash & (symtab->data.size () - 1);
+-  step = ((hash * 17) & (symtab->data.size () - 1)) | 1;
++  index = hash & (m_data.size () - 1);
++  step = ((hash * 17) & (m_data.size () - 1)) | 1;
+ 
+   for (;;)
+     {
+-      if (symtab->data[index].name == NULL
+-	  || strcmp (name, symtab->data[index].name) == 0)
+-	return symtab->data[index];
+-      index = (index + step) & (symtab->data.size () - 1);
++      if (m_data[index].name == NULL
++	  || strcmp (name, m_data[index].name) == 0)
++	return m_data[index];
++      index = (index + step) & (m_data.size () - 1);
+     }
+ }
+ 
+-/* Expand SYMTAB's hash table.  */
++/* See class definition.  */
+ 
+-static void
+-hash_expand (struct mapped_symtab *symtab)
++void
++mapped_symtab::hash_expand ()
+ {
+-  auto old_entries = std::move (symtab->data);
++  auto old_entries = std::move (m_data);
+ 
+-  symtab->data.clear ();
+-  symtab->data.resize (old_entries.size () * 2);
++  gdb_assert (m_data.size () == 0);
++  m_data.resize (old_entries.size () * 2);
+ 
+   for (auto &it : old_entries)
+     if (it.name != NULL)
+       {
+-	auto &ref = find_slot (symtab, it.name);
++	auto &ref = this->find_slot (it.name);
+ 	ref = std::move (it);
+       }
+ }
+ 
+-/* Add an entry to SYMTAB.  NAME is the name of the symbol.
+-   CU_INDEX is the index of the CU in which the symbol appears.
+-   IS_STATIC is one if the symbol is static, otherwise zero (global).  */
++/* See class definition.  */
+ 
+-static void
+-add_index_entry (struct mapped_symtab *symtab, const char *name,
+-		 int is_static, gdb_index_symbol_kind kind,
+-		 offset_type cu_index)
++void
++mapped_symtab::add_index_entry (const char *name, int is_static,
++				gdb_index_symbol_kind kind,
++				offset_type cu_index)
+ {
+-  symtab_index_entry *slot = &find_slot (symtab, name);
++  symtab_index_entry *slot = &this->find_slot (name);
+   if (slot->name == NULL)
+     {
+       /* This is a new element in the hash table.  */
+-      ++symtab->n_elements;
++      ++this->m_element_count;
+ 
+       /* We might need to grow the hash table.  */
+-      if (4 * symtab->n_elements / 3 >= symtab->data.size ())
++      if (this->hash_needs_expanding ())
+ 	{
+-	  hash_expand (symtab);
++	  this->hash_expand ();
+ 
+ 	  /* This element will have a different slot in the new table.  */
+-	  slot = &find_slot (symtab, name);
++	  slot = &this->find_slot (name);
+ 
+ 	  /* But it should still be a new element in the hash table.  */
+ 	  gdb_assert (slot->name == nullptr);
+@@ -387,7 +436,7 @@ write_hash_table (mapped_symtab *symtab, data_buf &output, data_buf &cpool)
+ 
+     /* We add all the index vectors to the constant pool first, to
+        ensure alignment is ok.  */
+-    for (symtab_index_entry &entry : symtab->data)
++    for (symtab_index_entry &entry : *symtab)
+       {
+ 	if (entry.name == NULL)
+ 	  continue;
+@@ -416,7 +465,7 @@ write_hash_table (mapped_symtab *symtab, data_buf &output, data_buf &cpool)
+ 
+   /* Now write out the hash table.  */
+   std::unordered_map<c_str_view, offset_type, c_str_view_hasher> str_table;
+-  for (const auto &entry : symtab->data)
++  for (const auto &entry : *symtab)
+     {
+       offset_type str_off, vec_off;
+ 
+@@ -1151,7 +1200,7 @@ write_cooked_index (cooked_index *table,
+       const auto it = cu_index_htab.find (entry->per_cu);
+       gdb_assert (it != cu_index_htab.cend ());
+ 
+-      const char *name = entry->full_name (&symtab->m_string_obstack);
++      const char *name = entry->full_name (symtab->obstack ());
+ 
+       if (entry->per_cu->lang () == language_ada)
+ 	{
+@@ -1159,7 +1208,7 @@ write_cooked_index (cooked_index *table,
+ 	     gdb, it has to use the encoded name, with any
+ 	     suffixes stripped.  */
+ 	  std::string encoded = ada_encode (name, false);
+-	  name = obstack_strdup (&symtab->m_string_obstack,
++	  name = obstack_strdup (symtab->obstack (),
+ 				 encoded.c_str ());
+ 	}
+       else if (entry->per_cu->lang () == language_cplus
+@@ -1191,8 +1240,8 @@ write_cooked_index (cooked_index *table,
+       else
+ 	kind = GDB_INDEX_SYMBOL_KIND_TYPE;
+ 
+-      add_index_entry (symtab, name, (entry->flags & IS_STATIC) != 0,
+-		       kind, it->second);
++      symtab->add_index_entry (name, (entry->flags & IS_STATIC) != 0,
++			       kind, it->second);
+     }
+ }
+ 
+@@ -1267,8 +1316,6 @@ write_gdbindex (dwarf2_per_bfd *per_bfd, cooked_index *table,
+   symtab.minimize ();
+ 
+   data_buf symtab_vec, constant_pool;
+-  if (symtab.n_elements == 0)
+-    symtab.data.resize (0);
+ 
+   write_hash_table (&symtab, symtab_vec, constant_pool);
+ 

gdb-rhbz-2232086-generate-dwarf-5-index-consistently.patch

@@ -0,0 +1,101 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Andrew Burgess <aburgess@redhat.com>
+Date: Mon, 27 Nov 2023 13:19:39 +0000
+Subject: gdb-rhbz-2232086-generate-dwarf-5-index-consistently.patch
+
+;; Back-port upstream commit 3644f41dc80 as part of a fix for
+;; non-deterministic gdb-index generation (RH BZ 2232086).
+
+gdb: generate dwarf-5 index identically as worker-thread count changes
+
+Similar to the previous commit, this commit ensures that the dwarf-5
+index files are generated identically as the number of worker-threads
+changes.
+
+Building the dwarf-5 index makes use of a closed hash table, the
+bucket_hash local within debug_names::build().  Entries are added to
+bucket_hash from m_name_to_value_set, which, in turn, is populated
+by calls to debug_names::insert() in write_debug_names.  The insert
+calls are ordered based on the entries within the cooked_index, and
+the ordering within cooked_index depends on the number of worker
+threads that GDB is using.
+
+My proposal is to sort each chain within the bucket_hash closed hash
+table prior to using this to build the dwarf-5 index.
+
+The buckets within bucket_hash will always have the same ordering (for
+a given GDB build with a given executable), and by sorting the chains
+within each bucket, we can be sure that GDB will see each entry in a
+deterministic order.
+
+I've extended the index creation test to cover this case.
+
+Approved-By: Tom Tromey <tom@tromey.com>
+
+diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
+--- a/gdb/dwarf2/index-write.c
++++ b/gdb/dwarf2/index-write.c
+@@ -452,6 +452,11 @@ class c_str_view
+     return strcmp (m_cstr, other.m_cstr) == 0;
+   }
+ 
++  bool operator< (const c_str_view &other) const
++  {
++    return strcmp (m_cstr, other.m_cstr) < 0;
++  }
++
+   /* Return the underlying C string.  Note, the returned string is
+      only a reference with lifetime of this object.  */
+   const char *c_str () const
+@@ -771,10 +776,18 @@ class debug_names
+       }
+     for (size_t bucket_ix = 0; bucket_ix < bucket_hash.size (); ++bucket_ix)
+       {
+-	const std::forward_list<hash_it_pair> &hashitlist
+-	  = bucket_hash[bucket_ix];
++	std::forward_list<hash_it_pair> &hashitlist = bucket_hash[bucket_ix];
+ 	if (hashitlist.empty ())
+ 	  continue;
++
++	/* Sort the items within each bucket.  This ensures that the
++	   generated index files will be the same no matter the order in
++	   which symbols were added into the index.  */
++	hashitlist.sort ([] (const hash_it_pair &a, const hash_it_pair &b)
++	{
++	  return a.it->first < b.it->first;
++	});
++
+ 	uint32_t &bucket_slot = m_bucket_table[bucket_ix];
+ 	/* The hashes array is indexed starting at 1.  */
+ 	store_unsigned_integer (reinterpret_cast<gdb_byte *> (&bucket_slot),
+diff --git a/gdb/testsuite/gdb.gdb/index-file.exp b/gdb/testsuite/gdb.gdb/index-file.exp
+--- a/gdb/testsuite/gdb.gdb/index-file.exp
++++ b/gdb/testsuite/gdb.gdb/index-file.exp
+@@ -47,6 +47,9 @@ remote_exec host "mkdir -p ${dir1}"
+ with_timeout_factor $timeout_factor {
+     gdb_test_no_output "save gdb-index $dir1" \
+ 	"create gdb-index file"
++
++    gdb_test_no_output "save gdb-index -dwarf-5 $dir1" \
++	"create dwarf-index files"
+ }
+ 
+ # Close GDB.
+@@ -143,13 +146,16 @@ if { $worker_threads > 1 } {
+     with_timeout_factor $timeout_factor {
+ 	gdb_test_no_output "save gdb-index $dir2" \
+ 	    "create second gdb-index file"
++
++	gdb_test_no_output "save gdb-index -dwarf-5 $dir2" \
++	    "create second dwarf-index files"
+     }
+ 
+     # Close GDB.
+     gdb_exit
+ 
+     # Now check that the index files are identical.
+-    foreach suffix { gdb-index  } {
++    foreach suffix { gdb-index debug_names debug_str } {
+ 	set result \
+ 	    [remote_exec host \
+ 		 "cmp -s \"$dir1/${index_filename_base}.${suffix}\" \"$dir2/${index_filename_base}.${suffix}\""]

gdb-rhbz-2232086-generate-gdb-index-consistently.patch

@@ -0,0 +1,230 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Andrew Burgess <aburgess@redhat.com>
+Date: Fri, 24 Nov 2023 12:04:36 +0000
+Subject: gdb-rhbz-2232086-generate-gdb-index-consistently.patch
+
+;; Back-port upstream commit aff250145af as part of a fix for
+;; non-deterministic gdb-index generation (RH BZ 2232086).
+
+gdb: generate gdb-index identically regardless of work thread count
+
+It was observed that changing the number of worker threads that GDB
+uses (maintenance set worker-threads NUM) would have an impact on the
+layout of the generated gdb-index.
+
+The cause seems to be how the CU are distributed between threads, and
+then symbols that appear in multiple CU can be encountered earlier or
+later depending on whether a particular CU moves between threads.
+
+I certainly found this behaviour was reproducible when generating an
+index for GDB itself, like:
+
+  gdb -q -nx -nh -batch \
+      -eiex 'maint set worker-threads NUM' \
+      -ex 'save gdb-index /tmp/'
+
+And then setting different values for NUM will change the generated
+index.
+
+Now, the question is: does this matter?
+
+I would like to suggest that yes, this does matter.  At Red Hat we
+generate a gdb-index as part of the build process, and we would
+ideally like to have reproducible builds: for the same source,
+compiled with the same tool-chain, we should get the exact same output
+binary.  And we do .... except for the index.
+
+Now we could simply force GDB to only use a single worker thread when
+we build the index, but, I don't think the idea of reproducible builds
+is that strange, so I think we should ensure that our generated
+indexes are always reproducible.
+
+To achieve this, I propose that we add an extra step when building the
+gdb-index file.  After constructing the initial symbol hash table
+contents, we will pull all the symbols out of the hash, sort them,
+then re-insert them in sorted order.  This will ensure that the
+structure of the generated hash will remain consistent (given the same
+set of symbols).
+
+I've extended the existing index-file test to check that the generated
+index doesn't change if we adjust the number of worker threads used.
+Given that this test is already rather slow, I've only made one change
+to the worker-thread count.  Maybe this test should be changed to use
+a smaller binary, which is quicker to load, and for which we could
+then try many different worker thread counts.
+
+Approved-By: Tom Tromey <tom@tromey.com>
+
+diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
+--- a/gdb/dwarf2/index-write.c
++++ b/gdb/dwarf2/index-write.c
+@@ -210,6 +210,13 @@ struct mapped_symtab
+   void add_index_entry (const char *name, int is_static,
+ 			gdb_index_symbol_kind kind, offset_type cu_index);
+ 
++  /* When entries are originally added into the data hash the order will
++     vary based on the number of worker threads GDB is configured to use.
++     This function will rebuild the hash such that the final layout will be
++     deterministic regardless of the number of worker threads used.  */
++
++  void sort ();
++
+   /* Access the obstack.  */
+   struct obstack *obstack ()
+   { return &m_string_obstack; }
+@@ -296,6 +303,65 @@ mapped_symtab::hash_expand ()
+       }
+ }
+ 
++/* See mapped_symtab class declaration.  */
++
++void mapped_symtab::sort ()
++{
++  /* Move contents out of this->data vector.  */
++  std::vector<symtab_index_entry> original_data = std::move (m_data);
++
++  /* Restore the size of m_data, this will avoid having to expand the hash
++     table (and rehash all elements) when we reinsert after sorting.
++     However, we do reset the element count, this allows for some sanity
++     checking asserts during the reinsert phase.  */
++  gdb_assert (m_data.size () == 0);
++  m_data.resize (original_data.size ());
++  m_element_count = 0;
++
++  /* Remove empty entries from ORIGINAL_DATA, this makes sorting quicker.  */
++  auto it = std::remove_if (original_data.begin (), original_data.end (),
++			    [] (const symtab_index_entry &entry) -> bool
++			    {
++			      return entry.name == nullptr;
++			    });
++  original_data.erase (it, original_data.end ());
++
++  /* Sort the existing contents.  */
++  std::sort (original_data.begin (), original_data.end (),
++	     [] (const symtab_index_entry &a,
++		 const symtab_index_entry &b) -> bool
++	     {
++	       /* Return true if A is before B.  */
++	       gdb_assert (a.name != nullptr);
++	       gdb_assert (b.name != nullptr);
++
++	       return strcmp (a.name, b.name) < 0;
++	     });
++
++  /* Re-insert each item from the sorted list.  */
++  for (auto &entry : original_data)
++    {
++      /* We know that ORIGINAL_DATA contains no duplicates, this data was
++	 taken from a hash table that de-duplicated entries for us, so
++	 count this as a new item.
++
++	 As we retained the original size of m_data (see above) then we
++	 should never need to grow m_data_ during this re-insertion phase,
++	 assert that now.  */
++      ++m_element_count;
++      gdb_assert (!this->hash_needs_expanding ());
++
++      /* Lookup a slot.  */
++      symtab_index_entry &slot = this->find_slot (entry.name);
++
++      /* As discussed above, we should not find duplicates.  */
++      gdb_assert (slot.name == nullptr);
++
++      /* Move this item into the slot we found.  */
++      slot = std::move (entry);
++    }
++}
++
+ /* See class definition.  */
+ 
+ void
+@@ -1311,6 +1377,9 @@ write_gdbindex (dwarf2_per_bfd *per_bfd, cooked_index *table,
+   for (auto map : table->get_addrmaps ())
+     write_address_map (map, addr_vec, cu_index_htab);
+ 
++  /* Ensure symbol hash is built domestically.  */
++  symtab.sort ();
++
+   /* Now that we've processed all symbols we can shrink their cu_indices
+      lists.  */
+   symtab.minimize ();
+diff --git a/gdb/testsuite/gdb.gdb/index-file.exp b/gdb/testsuite/gdb.gdb/index-file.exp
+--- a/gdb/testsuite/gdb.gdb/index-file.exp
++++ b/gdb/testsuite/gdb.gdb/index-file.exp
+@@ -38,6 +38,9 @@ with_timeout_factor $timeout_factor {
+     clean_restart $filename
+ }
+ 
++# Record how many worker threads GDB is using.
++set worker_threads [gdb_get_worker_threads]
++
+ # Generate an index file.
+ set dir1 [standard_output_file "index_1"]
+ remote_exec host "mkdir -p ${dir1}"
+@@ -116,3 +119,41 @@ proc check_symbol_table_usage { filename } {
+ 
+ set index_filename_base [file tail $filename]
+ check_symbol_table_usage "$dir1/${index_filename_base}.gdb-index"
++
++# If GDB is using more than 1 worker thread then reduce the number of
++# worker threads, regenerate the index, and check that we get the same
++# index file back.  At one point the layout of the index would vary
++# based on the number of worker threads used.
++if { $worker_threads > 1 } {
++    # Start GDB, but don't load a file yet.
++    clean_restart
++
++    # Adjust the number of threads to use.
++    set reduced_threads [expr $worker_threads / 2]
++    gdb_test_no_output "maint set worker-threads $reduced_threads"
++
++    with_timeout_factor $timeout_factor {
++	# Now load the test binary.
++	gdb_file_cmd $filename
++    }
++
++    # Generate an index file.
++    set dir2 [standard_output_file "index_2"]
++    remote_exec host "mkdir -p ${dir2}"
++    with_timeout_factor $timeout_factor {
++	gdb_test_no_output "save gdb-index $dir2" \
++	    "create second gdb-index file"
++    }
++
++    # Close GDB.
++    gdb_exit
++
++    # Now check that the index files are identical.
++    foreach suffix { gdb-index  } {
++	set result \
++	    [remote_exec host \
++		 "cmp -s \"$dir1/${index_filename_base}.${suffix}\" \"$dir2/${index_filename_base}.${suffix}\""]
++	gdb_assert { [lindex $result 0] == 0 } \
++	    "$suffix files are identical"
++    }
++}
+diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
+--- a/gdb/testsuite/lib/gdb.exp
++++ b/gdb/testsuite/lib/gdb.exp
+@@ -10033,6 +10033,21 @@ proc is_target_non_stop { {testname ""} } {
+     return $is_non_stop
+ }
+ 
++# Return the number of worker threads that GDB is currently using.
++
++proc gdb_get_worker_threads { {testname ""} } {
++    set worker_threads "UNKNOWN"
++    gdb_test_multiple "maintenance show worker-threads" $testname {
++	-wrap -re "The number of worker threads GDB can use is unlimited \\(currently ($::decimal)\\)\\." {
++	    set worker_threads $expect_out(1,string)
++	}
++	-wrap -re "The number of worker threads GDB can use is ($::decimal)\\." {
++	    set worker_threads $expect_out(1,string)
++	}
++    }
++    return $worker_threads
++}
++
+ # Check if the compiler emits epilogue information associated
+ # with the closing brace or with the last statement line.
+ #

gdb-rhbz-2232086-reduce-size-of-gdb-index.patch

@@ -0,0 +1,222 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Andrew Burgess <aburgess@redhat.com>
+Date: Fri, 24 Nov 2023 11:50:35 +0000
+Subject: gdb-rhbz-2232086-reduce-size-of-gdb-index.patch
+
+;; Back-port upstream commit aa19bc1d259 as part of a fix for
+;; non-deterministic gdb-index generation (RH BZ 2232086).
+
+gdb: reduce size of generated gdb-index file
+
+I noticed in passing that out algorithm for generating the gdb-index
+file is incorrect.  When building the hash table in add_index_entry we
+count every incoming entry rehash when the number of entries gets too
+large.  However, some of the incoming entries will be duplicates,
+which don't actually result in new items being added to the hash
+table.
+
+As a result, we grow the gdb-index hash table far too often.
+
+With an unmodified GDB, generating a gdb-index for GDB, I see a file
+size of 90M, with a hash usage (in the generated index file) of just
+2.6%.
+
+With a patched GDB, generating a gdb-index for the _same_ GDB binary,
+I now see a gdb-index file size of 30M, with a hash usage of 41.9%.
+
+This is a 67% reduction in gdb-index file size.
+
+Obviously, not every gdb-index file is going to see such big savings,
+however, the larger a program, and the more symbols that are
+duplicated between compilation units, the more GDB would over count,
+and so, over-grow the index.
+
+The gdb-index hash table we create has a minimum size of 1024, and
+then we grow the hash when it is 75% full, doubling the hash table at
+that time.  Given this, then we expect that either:
+
+  a. The hash table is size 1024, and less than 75% full, or
+  b. The hash table is between 37.5% and 75% full.
+
+I've include a test that checks some of these constraints -- I've not
+bothered to check the upper limit, and over full hash table isn't
+really a problem here, but if the fill percentage is less than 37.5%
+then this indicates that we've done something wrong (obviously, I also
+check for the 1024 minimum size).
+
+Approved-By: Tom Tromey <tom@tromey.com>
+
+diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
+--- a/gdb/dwarf2/index-write.c
++++ b/gdb/dwarf2/index-write.c
+@@ -254,20 +254,29 @@ add_index_entry (struct mapped_symtab *symtab, const char *name,
+ 		 int is_static, gdb_index_symbol_kind kind,
+ 		 offset_type cu_index)
+ {
+-  offset_type cu_index_and_attrs;
++  symtab_index_entry *slot = &find_slot (symtab, name);
++  if (slot->name == NULL)
++    {
++      /* This is a new element in the hash table.  */
++      ++symtab->n_elements;
+ 
+-  ++symtab->n_elements;
+-  if (4 * symtab->n_elements / 3 >= symtab->data.size ())
+-    hash_expand (symtab);
++      /* We might need to grow the hash table.  */
++      if (4 * symtab->n_elements / 3 >= symtab->data.size ())
++	{
++	  hash_expand (symtab);
+ 
+-  symtab_index_entry &slot = find_slot (symtab, name);
+-  if (slot.name == NULL)
+-    {
+-      slot.name = name;
++	  /* This element will have a different slot in the new table.  */
++	  slot = &find_slot (symtab, name);
++
++	  /* But it should still be a new element in the hash table.  */
++	  gdb_assert (slot->name == nullptr);
++	}
++
++      slot->name = name;
+       /* index_offset is set later.  */
+     }
+ 
+-  cu_index_and_attrs = 0;
++  offset_type cu_index_and_attrs = 0;
+   DW2_GDB_INDEX_CU_SET_VALUE (cu_index_and_attrs, cu_index);
+   DW2_GDB_INDEX_SYMBOL_STATIC_SET_VALUE (cu_index_and_attrs, is_static);
+   DW2_GDB_INDEX_SYMBOL_KIND_SET_VALUE (cu_index_and_attrs, kind);
+@@ -279,7 +288,7 @@ add_index_entry (struct mapped_symtab *symtab, const char *name,
+      the last entry pushed), but a symbol could have multiple kinds in one CU.
+      To keep things simple we don't worry about the duplication here and
+      sort and uniquify the list after we've processed all symbols.  */
+-  slot.cu_indices.push_back (cu_index_and_attrs);
++  slot->cu_indices.push_back (cu_index_and_attrs);
+ }
+ 
+ /* See symtab_index_entry.  */
+diff --git a/gdb/testsuite/gdb.gdb/index-file.exp b/gdb/testsuite/gdb.gdb/index-file.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.gdb/index-file.exp
+@@ -0,0 +1,118 @@
++# Copyright 2023 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 the GDB executable, and then 'save gdb-index', and make some
++# checks of the generated index file.
++
++load_lib selftest-support.exp
++
++# Can't save an index with readnow.
++if {[readnow]} {
++    untested "cannot create an index when readnow is in use"
++    return -1
++}
++
++# A multiplier used to ensure slow tasks are less likely to timeout.
++set timeout_factor 20
++
++set filename [selftest_prepare]
++if { $filename eq "" } {
++    unsupported "${gdb_test_file_name}.exp"
++    return -1
++}
++
++with_timeout_factor $timeout_factor {
++    # Start GDB, load FILENAME.
++    clean_restart $filename
++}
++
++# Generate an index file.
++set dir1 [standard_output_file "index_1"]
++remote_exec host "mkdir -p ${dir1}"
++with_timeout_factor $timeout_factor {
++    gdb_test_no_output "save gdb-index $dir1" \
++	"create gdb-index file"
++}
++
++# Close GDB.
++gdb_exit
++
++# Validate that the index-file FILENAME has made efficient use of its
++# symbol hash table.  Calculate the number of symbols in the hash
++# table and the total hash table size.  The hash table starts with
++# 1024 entries, and then doubles each time it is filled to 75%.  At
++# 75% filled, doubling the size takes it to 37.5% filled.
++#
++# Thus, the hash table is correctly filled if:
++#  1. Its size is 1024 (i.e. it has not yet had its first doubling), or
++#  2. Its filled percentage is over 37%
++#
++# We could check that it is not over filled, but I don't as that's not
++# really an issue.  But we did once have a bug where the table was
++# doubled incorrectly, in which case we'd see a filled percentage of
++# around 2% in some cases, which is a huge waste of disk space.
++proc check_symbol_table_usage { filename } {
++    # Open the file in binary mode and read-only mode.
++    set fp [open $filename rb]
++
++    # Configure the channel to use binary translation.
++    fconfigure $fp -translation binary
++
++    # Read the first 8 bytes of the file, which contain the header of
++    # the index section.
++    set header [read $fp [expr 7 * 4]]
++
++    # Scan the header to get the version, the CU list offset, and the
++    # types CU list offset.
++    binary scan $header iiiiii version \
++	_ _ _ symbol_table_offset shortcut_offset
++
++    # The length of the symbol hash table (in entries).
++    set len [expr ($shortcut_offset - $symbol_table_offset) / 8]
++
++    # Now walk the hash table and count how many entries are in use.
++    set offset $symbol_table_offset
++    set count 0
++    while { $offset < $shortcut_offset } {
++	seek $fp $offset
++	set entry [read $fp 8]
++	binary scan $entry ii name_ptr flags
++	if { $name_ptr != 0 } {
++	    incr count
++	}
++
++	incr offset 8
++    }
++
++    # Close the file.
++    close $fp
++
++    # Calculate how full the cache is.
++    set pct [expr (100 * double($count)) / $len]
++
++    # Write our results out to the gdb.log.
++    verbose -log "Hash table size: $len"
++    verbose -log "Hash table entries: $count"
++    verbose -log "Percentage usage: $pct%"
++
++    # The minimum fill percentage is actually 37.5%, but we give TCL a
++    # little flexibility in case the FP maths give a result a little
++    # off.
++    gdb_assert { $len == 1024 || $pct > 37 } \
++	"symbol hash table usage"
++}
++
++set index_filename_base [file tail $filename]
++check_symbol_table_usage "$dir1/${index_filename_base}.gdb-index"

gdb-rhbz1156192-recursive-dlopen-test.patch

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

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

@@ -1,135 +0,0 @@
-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 .*"

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

@@ -73,7 +73,7 @@ new file mode 100644
 +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" 
++    untested "s390* does not support hw read watchpoint"
 +    return
 +}
 +gdb_test $test "Hardware read watchpoint \[0-9\]+: aligned.var4"

gdb-rhbz1325795-framefilters-test.patch

@@ -1,176 +0,0 @@
-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()

gdb-rhbz1350436-type-printers-error.patch

@@ -1,81 +0,0 @@
-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())

gdb-rhbz1398387-tab-crash-test.patch

@@ -1,454 +0,0 @@
-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"

gdb-rhbz1553104-s390x-arch12-test.patch

@@ -1,81 +0,0 @@
-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

gdb-rhbz2042664-fix-sect_index_data-internal-error

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

gdb-rhbz2232086-refactor-selftest-support.patch

@@ -0,0 +1,77 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Andrew Burgess <aburgess@redhat.com>
+Date: Fri, 24 Nov 2023 11:10:08 +0000
+Subject: gdb-rhbz2232086-refactor-selftest-support.patch
+
+;; Back-port upstream commit 1f0fab7ff86 as part of a fix for
+;; non-deterministic gdb-index generation (RH BZ 2232086).
+
+gdb/testsuite: small refactor in selftest-support.exp
+
+Split out the code that makes a copy of the GDB executable ready for
+self testing into a new proc.  A later commit in this series wants to
+load the GDB executable into GDB (for creating an on-disk debug
+index), but doesn't need to make use of the full do_self_tests proc.
+
+There should be no changes in what is tested after this commit.
+
+Approved-By: Tom Tromey <tom@tromey.com>
+
+diff --git a/gdb/testsuite/lib/selftest-support.exp b/gdb/testsuite/lib/selftest-support.exp
+--- a/gdb/testsuite/lib/selftest-support.exp
++++ b/gdb/testsuite/lib/selftest-support.exp
+@@ -92,11 +92,13 @@ proc selftest_setup { executable function } {
+     return 0
+ }
+ 
+-# A simple way to run some self-tests.
+-
+-proc do_self_tests {function body} {
+-    global GDB tool
+-
++# Prepare for running a self-test by moving the GDB executable to a
++# location where we can use it as the inferior.  Return the filename
++# of the new location.
++#
++# If the current testing setup is not suitable for running a
++# self-test, then return an empty string.
++proc selftest_prepare {} {
+     # Are we testing with a remote board?  In that case, the target
+     # won't have access to the GDB's auxilliary data files
+     # (data-directory, etc.).  It's simpler to just skip.
+@@ -120,19 +122,31 @@ proc do_self_tests {function body} {
+     # Run the test with self.  Copy the file executable file in case
+     # this OS doesn't like to edit its own text space.
+ 
+-    set GDB_FULLPATH [find_gdb $GDB]
++    set gdb_fullpath [find_gdb $::GDB]
+ 
+     if {[is_remote host]} {
+-	set xgdb x$tool
++	set xgdb x$::tool
+     } else {
+-	set xgdb [standard_output_file x$tool]
++	set xgdb [standard_output_file x$::tool]
+     }
+ 
+     # Remove any old copy lying around.
+     remote_file host delete $xgdb
+ 
++    set filename [remote_download host $gdb_fullpath $xgdb]
++
++    return $filename
++}
++
++# A simple way to run some self-tests.
++
++proc do_self_tests {function body} {
++    set file [selftest_prepare]
++    if { $file eq "" } {
++	return
++    }
++
+     gdb_start
+-    set file [remote_download host $GDB_FULLPATH $xgdb]
+ 
+     # When debugging GDB with GDB, some operations can take a relatively long
+     # time, especially if the build is non-optimized.  Bump the timeout for the

gdb-rhbz2250652-avoid-PyOS_ReadlineTState.patch

@@ -0,0 +1,48 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= <ahajkova@redhat.com>
+Date: Mon, 8 Jan 2024 13:24:05 +0100
+Subject: gdb-rhbz2250652-avoid-PyOS_ReadlineTState.patch
+
+gdb/python: avoid use of _PyOS_ReadlineTState
+
+In python/py-gdb-readline.c we make use of _PyOS_ReadlineTState,
+however, this variable is no longer public in Python 3.13, and so GDB
+no longer builds.
+
+We are making use of _PyOS_ReadlineTState in order to re-acquire the
+Python Global Interpreter Lock (GIL).  The _PyOS_ReadlineTState
+variable is set in Python's outer readline code prior to calling the
+user (GDB) supplied readline callback function, which for us is
+gdbpy_readline_wrapper.  The gdbpy_readline_wrapper function is called
+without the GIL held.
+
+Instead of using _PyOS_ReadlineTState, I propose that we switch to
+calling PyGILState_Ensure() and PyGILState_Release().  These functions
+will acquire the GIL based on the current thread.  I think this should
+be sufficient; I can't imagine why we'd be running
+gdbpy_readline_wrapper on one thread on behalf of a different Python
+thread.... that would be unexpected I think.
+
+Approved-By: Tom Tromey <tom@tromey.com>
+
+diff --git a/gdb/python/py-gdb-readline.c b/gdb/python/py-gdb-readline.c
+--- a/gdb/python/py-gdb-readline.c
++++ b/gdb/python/py-gdb-readline.c
+@@ -56,13 +56,11 @@ gdbpy_readline_wrapper (FILE *sys_stdin, FILE *sys_stdout,
+       if (except.reason == RETURN_QUIT)
+ 	return NULL;
+ 
+-      /* The thread state is nulled during gdbpy_readline_wrapper,
+-	 with the original value saved in the following undocumented
+-	 variable (see Python's Parser/myreadline.c and
+-	 Modules/readline.c).  */
+-      PyEval_RestoreThread (_PyOS_ReadlineTState);
++
++      /* This readline callback is called without the GIL held.  */
++      gdbpy_gil gil;
++
+       gdbpy_convert_exception (except);
+-      PyEval_SaveThread ();
+       return NULL;
+     }
+ 

gdb-rhbz2250652-gdbpy_gil.patch

@@ -0,0 +1,81 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= <ahajkova@redhat.com>
+Date: Mon, 8 Jan 2024 13:12:15 +0100
+Subject: gdb-rhbz2250652-gdbpy_gil.patch
+
+gdb: move gdbpy_gil into python-internal.h
+
+Move gdbpy_gil class into python-internal.h, the next
+commit wants to make use of this class from a file other
+than python.c.
+
+Approved-By: Tom Tromey <tom@tromey.com>
+
+diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
+--- a/gdb/python/python-internal.h
++++ b/gdb/python/python-internal.h
+@@ -754,6 +754,30 @@ class gdbpy_allow_threads
+   PyThreadState *m_save;
+ };
+ 
++/* A helper class to save and restore the GIL, but without touching
++   the other globals that are handled by gdbpy_enter.  */
++
++class gdbpy_gil
++{
++public:
++
++  gdbpy_gil ()
++    : m_state (PyGILState_Ensure ())
++  {
++  }
++
++  ~gdbpy_gil ()
++  {
++    PyGILState_Release (m_state);
++  }
++
++  DISABLE_COPY_AND_ASSIGN (gdbpy_gil);
++
++private:
++
++  PyGILState_STATE m_state;
++};
++
+ /* Use this after a TRY_EXCEPT to throw the appropriate Python
+    exception.  */
+ #define GDB_PY_HANDLE_EXCEPTION(Exception)	\
+diff --git a/gdb/python/python.c b/gdb/python/python.c
+--- a/gdb/python/python.c
++++ b/gdb/python/python.c
+@@ -257,30 +257,6 @@ gdbpy_enter::finalize ()
+   python_gdbarch = target_gdbarch ();
+ }
+ 
+-/* A helper class to save and restore the GIL, but without touching
+-   the other globals that are handled by gdbpy_enter.  */
+-
+-class gdbpy_gil
+-{
+-public:
+-
+-  gdbpy_gil ()
+-    : m_state (PyGILState_Ensure ())
+-  {
+-  }
+-
+-  ~gdbpy_gil ()
+-  {
+-    PyGILState_Release (m_state);
+-  }
+-
+-  DISABLE_COPY_AND_ASSIGN (gdbpy_gil);
+-
+-private:
+-
+-  PyGILState_STATE m_state;
+-};
+-
+ /* Set the quit flag.  */
+ 
+ static void

gdb-rhbz2257562-cp-namespace-null-ptr-check.patch

@@ -0,0 +1,113 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Tue, 16 Jan 2024 20:07:53 -0700
+Subject: gdb-rhbz2257562-cp-namespace-null-ptr-check.patch
+
+;; Backport potential fix for RH BZ 2257562.
+
+Fix printing of global variable stubs if no inferior is running
+
+Since 3c45e9f915ae4aeab7312d6fc55a947859057572 gdb crashes when trying
+to print a global variable stub without a running inferior, because of
+a missing nullptr-check (the block_scope function took care of that
+check before it was converted to a method).
+
+With this check it works again:
+```
+(gdb) print s
+$1 = <incomplete type>
+```
+
+Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31128
+Approved-By: Tom Tromey <tom@tromey.com>
+(cherry picked from commit 576745e26c0ec76a53ba45b20af464628a50b3e4)
+
+diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
+--- a/gdb/cp-namespace.c
++++ b/gdb/cp-namespace.c
+@@ -1026,7 +1026,11 @@ cp_lookup_transparent_type (const char *name)
+ 
+   /* If that doesn't work and we're within a namespace, look there
+      instead.  */
+-  scope = get_selected_block (0)->scope ();
++  const block *block = get_selected_block (0);
++  if (block == nullptr)
++    return nullptr;
++
++  scope = block->scope ();
+ 
+   if (scope[0] == '\0')
+     return NULL;
+diff --git a/gdb/testsuite/gdb.cp/print-global-stub.cc b/gdb/testsuite/gdb.cp/print-global-stub.cc
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/print-global-stub.cc
+@@ -0,0 +1,31 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2023 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/>.  */
++
++struct S
++{
++  S (int);
++  virtual ~S ();
++
++  int m_i;
++};
++
++S s (5);
++
++int main ()
++{
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.cp/print-global-stub.exp b/gdb/testsuite/gdb.cp/print-global-stub.exp
+new file mode 100644
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/print-global-stub.exp
+@@ -0,0 +1,32 @@
++# Copyright (C) 2023 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 printing of a global stub without inferior.
++
++require allow_cplus_tests
++
++standard_testfile .cc
++set objfile [standard_output_file ${testfile}.o]
++
++if { [gdb_compile $srcdir/$subdir/$srcfile $objfile object \
++	  {c++ debug}] != "" } {
++    untested "failed to compile"
++    return -1
++}
++
++clean_restart $objfile
++
++gdb_test "print s" " = <incomplete type>"