Fix internal error on finish with inlined frame (BZ 894678).

- Permit passing pointers as address number even for C++ methods (Keith Seitz).

.gitignore

@@ -1,4 +1,2 @@
-/binutils-gdb
-/gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz
-/v2.0.2.tar.gz
-/gdb-10.1.tar.xz
+/libstdc++-v3-python-r155978.tar.bz2
+/gdb-7.4.50.20120120.tar.bz2

README.local-patches.md

@@ -1,104 +0,0 @@
-# Fedora GDB local patches policy
-
-In order to make things easier for the Fedora GDB maintainer, we
-choose to auto-generate the local patches by making use of an upstream
-git repository.  Below you can find a few instructions on how to work
-using this method.
-
-You need to run the following commands from the directory that
-contains the "gdb.spec" file.
-
-## Importing the GDB patches into a git repository
-
-1) The local patches (`*.patch`) need to be imported into an upstream
-git repository.  For example, let's assume you cloned the repository
-by doing:
-
-`$ git clone git://sourceware.org/git/binutils-gdb.git`
-
-> TIP: if you already have the repository cloned somewhere in your
-> system, you can pass a "--reference <dir>" to the "git clone"
-> command and it will use your local repository as much as possible
-> to make the clone, speeding up things.
-
-2) After cloning the upstream repository, you can import your patches
-by using the script "generate-git-repo-from-patches.sh":
-
-`$ sh generate-git-repo-from-patches.sh <REPOSITORY_DIR>`
-
-The script will basically cd into the repository, checkout the
-revision specified in the file `_git_upstream_commit`, iterate through
-the file `_patch_order` and "git-am" every patch *in that order*.
-This operation should complete without errors; if you find a problem
-with `git-am`, it probably means that the revision specified in the
-file `_git_upstream_commit` is wrong.
-
-## Rebasing the patches against a newer version/release
-
-1) First, cd into the upstream repository.  All you have to do is
-choose the revision against which you plan to rebase the patches, and
-`git rebase <REVISION>`.  git will do the rest, and you will be able
-to perform conflict resolution by git's algorithm, which is smarter.
-
-## Creating new patches
-
-1) Create the new patch on top of the the others, as usual.  Note that
-you can use `git rebase` whenever you want to reorder patch order, or
-even to delete a patch.
-
-2) When writing the commit log, you must obey a few rules.  The
-subject line *must* be the filename of the patch.  This line will be
-used when exporting the patches from the git repository, and
-(obviously) it gives the filename that should be used for this
-specific patch.
-
-3) You can also add comments that will go into the auto-generated
-`Patch:` file (see below).  To do that, use the special marker `;;` at
-the beginning of the line.  This way, a commit log that says:
-
-~~~~~~~~~~~
-  test-patch.patch
-
-  ;; This is a test patch
-  ;; Second line
-~~~~~~~~~~~
-
-Will generate the following entry in the auto-generated `Patch:` file:
-
-~~~~~~~~~~~
-  # This is a test patch
-  # Second line
-  PatchXYZ: test-patch.patch
-~~~~~~~~~~~
-
-## Exporting the GDB patches from the git repository
-
-1) When you're done working with the patches, go back to the directory
-that contains the `gdb.spec` file, and from there you run:
-
-`$ sh generate-patches-from-git-repo.sh <REPOSITORY_DIR>`
-
-This will regenerate all of the `*.patch` files (excluding the ones that
-were also excluded from the git repository), and also regenerate a few
-control files.  These control files are:
-
-  - `_gdb.spec.Patch.include`: This file contains the `Patch:` directives.
-
-  - `_gdb.spec.patch.include`: This file contains the `%patch` directives.
-
-  - `_patch_order`: This file contains the patches, in the exact order
-    that they must be applied.  It is used when importing the patches
-    into the git repository.
-
-  - `_git_upstream_commit`: This file contains the last upstream commit
-    against which the patches were rebased.  It is used when importing
-    the patches into the git repository.
-
-NOTE: If you did a rebase against a newer upstream version, you need
-to specify the commit/tag/branch against which you rebased:
-
-`$ sh generate-patches-from-git-repo.sh <REPOSITORY_DIR> <COMMIT_OR_TAG_OR_BRANCH>`
-
-For example, if you rebased against `gdb-8.1-release`:
-
-`$ sh generate-patches-from-git-repo.sh <REPOSITORY_DIR> gdb-8.1-release`

_gdb.spec.Patch.include

@@ -1,384 +0,0 @@
-# Match the Fedora's version info.
-#=fedora
-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
-
-# 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
-
-# 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
-
-# Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
-#=fedoratest
-Patch024: 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
-
-# Support for stepping over PPC atomic instruction sequences (BZ 237572).
-#=fedoratest
-Patch026: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
-
-# Test leftover zombie process (BZ 243845).
-#=fedoratest
-Patch028: 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
-
-# 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
-
-#=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
-
-# Test PPC hiding of call-volatile parameter register.
-#=fedoratest
-Patch033: gdb-6.7-ppc-clobbered-registers-O2-test.patch
-
-# Testsuite fixes for more stable/comparable results.
-#=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
-
-# 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
-
-# Test a crash on libraries missing the .text section.
-#=fedoratest
-Patch041: 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
-
-# New test for step-resume breakpoint placed in multiple threads at once.
-#=fedoratest
-Patch043: 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
-
-# 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
-
-# Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
-#=push+jan
-Patch055: 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
-
-# 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
-
-# [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
-
-# 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
-
-# Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
-#=fedoratest
-Patch068: 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
-
-# Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
-#=fedoratest
-Patch071: 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
-
-# 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
-
-# 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
-
-# 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
-
-# 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
-
-# [aarch64] Fix hardware watchpoints (RH BZ 1261564).
-#=fedoratest
-Patch089: 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
-
-# [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
-#=fedora
-Patch092: gdb-linux_perf-bundle.patch
-
-# Fix gdb-headless /usr/bin/ executables (BZ 1390251).
-#
-# Also, make /usr/bin/gdb.minimal be the default GDB used, if it's
-# present.  For rationale, see:
-#
-#   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
-#=fedora
-Patch093: gdb-libexec-add-index.patch
-
-# New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
-#=fedoratest
-Patch094: gdb-rhbz1398387-tab-crash-test.patch
-
-# Python patches of: http://sourceware.org/gdb/wiki/ProjectArcher
-#=push
-Patch095: gdb-archer.patch
-
-# Revert upstream commit 469412dd9ccc4de5874fd3299b105833f36b34cd
-Patch096: gdb-vla-intel-fix-print-char-array.patch
-
-# [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
-# =fedoratest
-Patch097: gdb-rhbz1553104-s390x-arch12-test.patch
-

_gdb.spec.patch.include

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

_git_upstream_commit

@@ -1 +0,0 @@
-606e3fd147ed9a00df165e46f30fe5c46dcda345

_patch_order

@@ -1,97 +0,0 @@
-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
-gdb-6.3-attach-see-vdso-test.patch
-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-6.3-attach-see-vdso-test.patch

@@ -1,15 +1,5 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.3-attach-see-vdso-test.patch
-
-;; Test kernel VDSO decoding while attaching to an i386 process.
-;;=fedoratest
-
-diff --git a/gdb/testsuite/gdb.base/attach-see-vdso.c b/gdb/testsuite/gdb.base/attach-see-vdso.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/attach-see-vdso.c
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.base/attach-see-vdso.c	6 Jul 2007 14:14:44 -0000
 @@ -0,0 +1,25 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -36,10 +26,8 @@ new file mode 100644
 +  pause ();
 +  return 1;
 +}
-diff --git a/gdb/testsuite/gdb.base/attach-see-vdso.exp b/gdb/testsuite/gdb.base/attach-see-vdso.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/attach-see-vdso.exp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.base/attach-see-vdso.exp	6 Jul 2007 14:14:44 -0000
 @@ -0,0 +1,72 @@
 +# Copyright 2007
 +
@@ -66,8 +54,8 @@ new file mode 100644
 +
 +set testfile "attach-see-vdso"
 +set srcfile  ${testfile}.c
-+set binfile  [standard_output_file ${testfile}]
-+set escapedbinfile  [string_to_regexp [standard_output_file ${testfile}]]
++set binfile  ${objdir}/${subdir}/${testfile}
++set escapedbinfile  [string_to_regexp ${objdir}/${subdir}/${testfile}]
 +
 +# The kernel VDSO is used for the syscalls returns only on i386 (not x86_64).
 +#

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

@@ -1,15 +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
-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
+diff -u -ruNp gdb-6.3-unpatched/gdb/testsuite/gdb.arch/powerpc-bcl-prologue-asm32.S gdb-6.3/gdb/testsuite/gdb.arch/powerpc-bcl-prologue-asm32.S
+--- gdb-6.3-unpatched/gdb/testsuite/gdb.arch/powerpc-bcl-prologue-asm32.S	1969-12-31 19:00:00.000000000 -0500
++++ gdb-6.3/gdb/testsuite/gdb.arch/powerpc-bcl-prologue-asm32.S	2007-08-02 13:23:10.000000000 -0400
 @@ -0,0 +1,78 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -89,10 +80,9 @@ new file mode 100644
 +}
 +
 +*/
-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
+diff -u -ruNp gdb-6.3-unpatched/gdb/testsuite/gdb.arch/powerpc-bcl-prologue-asm64.S gdb-6.3/gdb/testsuite/gdb.arch/powerpc-bcl-prologue-asm64.S
+--- gdb-6.3-unpatched/gdb/testsuite/gdb.arch/powerpc-bcl-prologue-asm64.S	1969-12-31 19:00:00.000000000 -0500
++++ gdb-6.3/gdb/testsuite/gdb.arch/powerpc-bcl-prologue-asm64.S	2007-08-02 14:28:56.000000000 -0400
 @@ -0,0 +1,98 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -192,10 +182,9 @@ new file mode 100644
 +}
 +
 +*/
-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
+diff -u -ruNp gdb-6.3-unpatched/gdb/testsuite/gdb.arch/powerpc-bcl-prologue.c gdb-6.3/gdb/testsuite/gdb.arch/powerpc-bcl-prologue.c
+--- gdb-6.3-unpatched/gdb/testsuite/gdb.arch/powerpc-bcl-prologue.c	1969-12-31 19:00:00.000000000 -0500
++++ gdb-6.3/gdb/testsuite/gdb.arch/powerpc-bcl-prologue.c	2007-08-02 13:25:10.000000000 -0400
 @@ -0,0 +1,29 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -226,10 +215,9 @@ new file mode 100644
 +  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
+diff -u -ruNp gdb-6.3-unpatched/gdb/testsuite/gdb.arch/powerpc-bcl-prologue.exp gdb-6.3/gdb/testsuite/gdb.arch/powerpc-bcl-prologue.exp
+--- gdb-6.3-unpatched/gdb/testsuite/gdb.arch/powerpc-bcl-prologue.exp	1969-12-31 19:00:00.000000000 -0500
++++ gdb-6.3/gdb/testsuite/gdb.arch/powerpc-bcl-prologue.exp	2007-08-02 14:21:29.000000000 -0400
 @@ -0,0 +1,72 @@
 +#   Copyright 2006, 2007 Free Software Foundation, Inc.
 +
@@ -268,8 +256,8 @@ new file mode 100644
 +   fail "powerpc arch test"
 +   return
 +}
-+set objfile2 [standard_output_file ${testfile}-asm.o]
-+set binfile [standard_output_file ${testfile}]
++set objfile2 ${objdir}/${subdir}/${testfile}-asm.o
++set binfile ${objdir}/${subdir}/${testfile}
 +
 +if { [gdb_compile "${srcdir}/${subdir}/${srcfile1} ${srcdir}/${subdir}/${srcfile2}" ${binfile} executable $flags] != ""} {
 +    return -1
@@ -303,10 +291,12 @@ new file mode 100644
 +	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 @@
+
+Fixup the testcase for ppc64 biarch GDB.
+
+--- ./gdb/testsuite/gdb.arch/powerpc-prologue.exp	2008-01-13 13:32:19.000000000 +0100
++++ ./gdb/testsuite/gdb.arch/powerpc-prologue.exp	2008-01-02 00:04:10.000000000 +0100
+@@ -17,8 +17,9 @@
  # Test PowerPC prologue analyzer.
  
  # Do not run on AIX (where we won't be able to build the tests without

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

@@ -1,19 +1,10 @@
-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
+
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/threaded-exec.c	17 Jan 2007 23:10:22 -0000
 @@ -0,0 +1,46 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -61,10 +52,8 @@ new file mode 100644
 +	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
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/threaded-exec.exp	17 Jan 2007 23:10:22 -0000
 @@ -0,0 +1,41 @@
 +# threaded-exec.exp -- Check reset of the tracked threads on exec*(2)
 +# Copyright (C) 2007 Free Software Foundation, Inc.
@@ -88,7 +77,7 @@ new file mode 100644
 +
 +set testfile threaded-exec
 +set srcfile ${testfile}.c
-+set binfile [standard_output_file ${testfile}]
++set binfile ${objdir}/${subdir}/${testfile}
 +
 +if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable []] != "" } {
 +    return -1

gdb-6.3-bz231832-obstack-2gb.patch

@@ -0,0 +1,192 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=231832
+
+
+Index: gdb-7.4.50.20111218/gdb/symmisc.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/symmisc.c	2011-04-04 17:19:59.000000000 +0200
++++ gdb-7.4.50.20111218/gdb/symmisc.c	2011-12-19 00:28:18.189232014 +0100
+@@ -147,8 +147,8 @@ print_objfile_statistics (void)
+     if (OBJSTAT (objfile, sz_strtab) > 0)
+       printf_filtered (_("  Space used by a.out string tables: %d\n"),
+ 		       OBJSTAT (objfile, sz_strtab));
+-    printf_filtered (_("  Total memory used for objfile obstack: %d\n"),
+-		     obstack_memory_used (&objfile->objfile_obstack));
++    printf_filtered (_("  Total memory used for objfile obstack: %ld\n"),
++		     (long) obstack_memory_used (&objfile->objfile_obstack));
+     printf_filtered (_("  Total memory used for psymbol cache: %d\n"),
+ 		     bcache_memory_used (psymbol_bcache_get_bcache
+ 		                          (objfile->psymbol_cache)));
+Index: gdb-7.4.50.20111218/include/obstack.h
+===================================================================
+--- gdb-7.4.50.20111218.orig/include/obstack.h	2011-10-22 03:35:29.000000000 +0200
++++ gdb-7.4.50.20111218/include/obstack.h	2011-12-19 00:28:18.189232014 +0100
+@@ -188,31 +188,31 @@ struct obstack		/* control current objec
+ 
+ /* Declare the external functions we use; they are in obstack.c.  */
+ 
+-extern void _obstack_newchunk (struct obstack *, int);
++extern void _obstack_newchunk (struct obstack *, PTR_INT_TYPE);
+ extern void _obstack_free (struct obstack *, void *);
+-extern int _obstack_begin (struct obstack *, int, int,
++extern int _obstack_begin (struct obstack *, PTR_INT_TYPE, int,
+ 			    void *(*) (long), void (*) (void *));
+-extern int _obstack_begin_1 (struct obstack *, int, int,
++extern int _obstack_begin_1 (struct obstack *, PTR_INT_TYPE, int,
+ 			     void *(*) (void *, long),
+ 			     void (*) (void *, void *), void *);
+-extern int _obstack_memory_used (struct obstack *);
++extern PTR_INT_TYPE _obstack_memory_used (struct obstack *);
+ 
+ /* Do the function-declarations after the structs
+    but before defining the macros.  */
+ 
+ void obstack_init (struct obstack *obstack);
+ 
+-void * obstack_alloc (struct obstack *obstack, int size);
++void * obstack_alloc (struct obstack *obstack, PTR_INT_TYPE size);
+ 
+-void * obstack_copy (struct obstack *obstack, void *address, int size);
+-void * obstack_copy0 (struct obstack *obstack, void *address, int size);
++void * obstack_copy (struct obstack *obstack, void *address, PTR_INT_TYPE size);
++void * obstack_copy0 (struct obstack *obstack, void *address, PTR_INT_TYPE size);
+ 
+ void obstack_free (struct obstack *obstack, void *block);
+ 
+-void obstack_blank (struct obstack *obstack, int size);
++void obstack_blank (struct obstack *obstack, PTR_INT_TYPE size);
+ 
+-void obstack_grow (struct obstack *obstack, void *data, int size);
+-void obstack_grow0 (struct obstack *obstack, void *data, int size);
++void obstack_grow (struct obstack *obstack, void *data, PTR_INT_TYPE size);
++void obstack_grow0 (struct obstack *obstack, void *data, PTR_INT_TYPE size);
+ 
+ void obstack_1grow (struct obstack *obstack, int data_char);
+ void obstack_ptr_grow (struct obstack *obstack, void *data);
+@@ -220,20 +220,20 @@ void obstack_int_grow (struct obstack *o
+ 
+ void * obstack_finish (struct obstack *obstack);
+ 
+-int obstack_object_size (struct obstack *obstack);
++PTR_INT_TYPE obstack_object_size (struct obstack *obstack);
+ 
+-int obstack_room (struct obstack *obstack);
+-void obstack_make_room (struct obstack *obstack, int size);
++PTR_INT_TYPE obstack_room (struct obstack *obstack);
++void obstack_make_room (struct obstack *obstack, PTR_INT_TYPE size);
+ void obstack_1grow_fast (struct obstack *obstack, int data_char);
+ void obstack_ptr_grow_fast (struct obstack *obstack, void *data);
+ void obstack_int_grow_fast (struct obstack *obstack, int data);
+-void obstack_blank_fast (struct obstack *obstack, int size);
++void obstack_blank_fast (struct obstack *obstack, PTR_INT_TYPE size);
+ 
+ void * obstack_base (struct obstack *obstack);
+ void * obstack_next_free (struct obstack *obstack);
+ int obstack_alignment_mask (struct obstack *obstack);
+-int obstack_chunk_size (struct obstack *obstack);
+-int obstack_memory_used (struct obstack *obstack);
++size_t obstack_chunk_size (struct obstack *obstack);
++size_t obstack_memory_used (struct obstack *obstack);
+ 
+ /* Error handler called when `obstack_chunk_alloc' failed to allocate
+    more memory.  This can be set to a user defined function.  The
+@@ -318,7 +318,7 @@ extern int obstack_exit_failure;
+ # define obstack_make_room(OBSTACK,length)				\
+ __extension__								\
+ ({ struct obstack *__o = (OBSTACK);					\
+-   int __len = (length);						\
++   PTR_INT_TYPE __len = (length);					\
+    if (__o->chunk_limit - __o->next_free < __len)			\
+      _obstack_newchunk (__o, __len);					\
+    (void) 0; })
+@@ -331,7 +331,7 @@ __extension__								\
+ # define obstack_grow(OBSTACK,where,length)				\
+ __extension__								\
+ ({ struct obstack *__o = (OBSTACK);					\
+-   int __len = (length);						\
++   PTR_INT_TYPE __len = (length);					\
+    if (__o->next_free + __len > __o->chunk_limit)			\
+      _obstack_newchunk (__o, __len);					\
+    _obstack_memcpy (__o->next_free, (where), __len);			\
+@@ -341,7 +341,7 @@ __extension__								\
+ # define obstack_grow0(OBSTACK,where,length)				\
+ __extension__								\
+ ({ struct obstack *__o = (OBSTACK);					\
+-   int __len = (length);						\
++   PTR_INT_TYPE __len = (length);					\
+    if (__o->next_free + __len + 1 > __o->chunk_limit)			\
+      _obstack_newchunk (__o, __len + 1);				\
+    _obstack_memcpy (__o->next_free, (where), __len);			\
+@@ -392,7 +392,7 @@ __extension__								\
+ # define obstack_blank(OBSTACK,length)					\
+ __extension__								\
+ ({ struct obstack *__o = (OBSTACK);					\
+-   int __len = (length);						\
++   PTR_INT_TYPE __len = (length);					\
+    if (__o->chunk_limit - __o->next_free < __len)			\
+      _obstack_newchunk (__o, __len);					\
+    obstack_blank_fast (__o, __len);					\
+Index: gdb-7.4.50.20111218/libiberty/obstack.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/libiberty/obstack.c	2005-05-10 17:33:33.000000000 +0200
++++ gdb-7.4.50.20111218/libiberty/obstack.c	2011-12-19 00:28:18.191232006 +0100
+@@ -44,9 +44,11 @@
+ #if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
+ #include <gnu-versions.h>
+ #if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
++#if 0 /* 64-bit obstack is not compatible with any glibc implementation.  */
+ #define ELIDE_CODE
+ #endif
+ #endif
++#endif
+ 
+ 
+ #ifndef ELIDE_CODE
+@@ -139,7 +141,7 @@ struct obstack *_obstack;
+    free up some memory, then call this again.  */
+ 
+ int
+-_obstack_begin (struct obstack *h, int size, int alignment,
++_obstack_begin (struct obstack *h, PTR_INT_TYPE size, int alignment,
+                 POINTER (*chunkfun) (long), void (*freefun) (void *))
+ {
+   register struct _obstack_chunk *chunk; /* points to new chunk */
+@@ -183,7 +185,7 @@ _obstack_begin (struct obstack *h, int s
+ }
+ 
+ int
+-_obstack_begin_1 (struct obstack *h, int size, int alignment,
++_obstack_begin_1 (struct obstack *h, PTR_INT_TYPE size, int alignment,
+                   POINTER (*chunkfun) (POINTER, long),
+                   void (*freefun) (POINTER, POINTER), POINTER arg)
+ {
+@@ -235,7 +237,7 @@ _obstack_begin_1 (struct obstack *h, int
+    to the beginning of the new one.  */
+ 
+ void
+-_obstack_newchunk (struct obstack *h, int length)
++_obstack_newchunk (struct obstack *h, PTR_INT_TYPE length)
+ {
+   register struct _obstack_chunk *old_chunk = h->chunk;
+   register struct _obstack_chunk *new_chunk;
+@@ -388,11 +390,11 @@ obstack_free (struct obstack *h, POINTER
+     abort ();
+ }
+ 
+-int
++PTR_INT_TYPE
+ _obstack_memory_used (struct obstack *h)
+ {
+   register struct _obstack_chunk* lp;
+-  register int nbytes = 0;
++  register PTR_INT_TYPE nbytes = 0;
+ 
+   for (lp = h->chunk; lp != 0; lp = lp->prev)
+     {
+@@ -421,6 +423,7 @@ print_and_abort (void)
+ }
+ 
+ #if 0
++/* These functions are now broken for 64-bit obstack!  */
+ /* These are now turned off because the applications do not use it
+    and it uses bcopy via obstack_grow, which causes trouble on sysV.  */
+ 

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

@@ -1,16 +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
-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 @@
+--- /dev/null	2008-03-23 13:41:46.072650180 +0100
++++ gdb-6.3/gdb/testsuite/gdb.base/focus-cmd-prev.exp	2008-03-23 23:46:45.000000000 +0100
+@@ -0,0 +1,25 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -34,20 +24,5 @@ new file mode 100644
 +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_test "focus cmd"
++gdb_test "focus prev"

gdb-6.3-gcore-thread-20050204.patch

@@ -0,0 +1,25 @@
+2005-02-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+        * linux-nat.c (linux_nat_xfer_memory): Don't use
+        linux_proc_xfer_memory for ia64.
+
+Index: gdb-6.8.50.20090803/gdb/linux-nat.c
+===================================================================
+--- gdb-6.8.50.20090803.orig/gdb/linux-nat.c	2009-08-04 06:29:47.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/linux-nat.c	2009-08-04 06:29:55.000000000 +0200
+@@ -4495,10 +4495,15 @@ linux_xfer_partial (struct target_ops *o
+ 	offset &= ((ULONGEST) 1 << addr_bit) - 1;
+     }
+ 
++#ifndef NATIVE_XFER_UNWIND_TABLE
++  /* FIXME: For ia64, we cannot currently use linux_proc_xfer_memory
++	    for accessing thread storage.  Revert when Bugzilla 147436
++	    is fixed.  */
+   xfer = linux_proc_xfer_partial (ops, object, annex, readbuf, writebuf,
+ 				  offset, len);
+   if (xfer != 0)
+     return xfer;
++#endif
+ 
+   return super_xfer_partial (ops, object, annex, readbuf, writebuf,
+ 			     offset, len);

gdb-6.3-gstack-20050411.patch

@@ -1,22 +1,14 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Andrew Cagney <cagney@gnu.org>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.3-gstack-20050411.patch
-
-;; Add a wrapper script to GDB that implements pstack using the
-;; --readnever option.
-;;=push
-
 2004-11-23  Andrew Cagney  <cagney@redhat.com>
 
 	* Makefile.in (uninstall-gstack, install-gstack): New rules, add
 	to install and uninstall.
 	* gstack.sh, gstack.1: New files.
 
-diff --git a/gdb/Makefile.in b/gdb/Makefile.in
---- a/gdb/Makefile.in
-+++ b/gdb/Makefile.in
-@@ -1726,7 +1726,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
+Index: gdb-7.4.50.20120103/gdb/Makefile.in
+===================================================================
+--- gdb-7.4.50.20120103.orig/gdb/Makefile.in	2012-01-03 05:52:15.000000000 +0100
++++ gdb-7.4.50.20120103/gdb/Makefile.in	2012-01-03 05:53:25.974210230 +0100
+@@ -1017,7 +1017,7 @@ gdb.z:gdb.1
  install: all
  	@$(MAKE) $(FLAGS_TO_PASS) install-only
  
@@ -25,7 +17,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:
+@@ -1039,7 +1039,25 @@ install-only: $(CONFIG_INSTALL)
  install-python:
  	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_DATADIR)/python/gdb
  
@@ -52,8 +44,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
+@@ -1051,6 +1069,18 @@ uninstall: force $(CONFIG_UNINSTALL)
+ 		      $(DESTDIR)$(man1dir)/$$transformed_name.1
  	@$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
  
 +.PHONY: uninstall-gstack
@@ -71,10 +63,10 @@ diff --git a/gdb/Makefile.in b/gdb/Makefile.in
  # The C++ name parser can be built standalone for testing.
  test-cp-name-parser.o: cp-name-parser.c
  	$(COMPILE) -DTEST_CPNAMES cp-name-parser.c
-diff --git a/gdb/gstack.sh b/gdb/gstack.sh
-new file mode 100644
---- /dev/null
-+++ b/gdb/gstack.sh
+Index: gdb-7.4.50.20120103/gdb/gstack.sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.4.50.20120103/gdb/gstack.sh	2012-01-03 05:52:37.278385632 +0100
 @@ -0,0 +1,43 @@
 +#!/bin/sh
 +
@@ -105,11 +97,11 @@ new file mode 100644
 +    fi
 +fi
 +
-+GDB=${GDB:-gdb}
++GDB=${GDB:-/usr/bin/gdb}
 +
 +# Run GDB, strip out unwanted noise.
 +# --readnever is no longer used since .gdb_index is now in use.
-+$GDB --quiet -nx $GDBARGS /proc/$1/exe $1 <<EOF 2>&1 | 
++$GDB --quiet -nx /proc/$1/exe $1 <<EOF 2>&1 | 
 +set width 0
 +set height 0
 +set pagination no
@@ -119,10 +111,81 @@ new file mode 100644
 +    -e 's/^\((gdb) \)*//' \
 +    -e '/^#/p' \
 +    -e '/^Thread/p'
-diff --git a/gdb/testsuite/gdb.base/gstack.c b/gdb/testsuite/gdb.base/gstack.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gstack.c
+Index: gdb-7.4.50.20120103/gdb/testsuite/gdb.base/gstack.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.4.50.20120103/gdb/testsuite/gdb.base/gstack.exp	2012-01-03 05:52:37.279385629 +0100
+@@ -0,0 +1,66 @@
++# Copyright (C) 2012 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++set testfile gstack
++set executable ${testfile}
++set binfile ${objdir}/${subdir}/$executable
++if {[build_executable ${testfile} ${executable} "" {debug}] == -1} {
++    return -1
++}
++
++set test "spawn inferior"
++set command "${binfile}"
++set res [remote_spawn host $command];
++if { $res < 0 || $res == "" } {
++    perror "Spawning $command failed."
++    fail $test
++    return
++}
++set use_gdb_stub 1
++set pid [exp_pid -i $res]
++gdb_expect {
++    -re "looping\r\n" {
++	pass $test
++    }
++    eof {
++	fail "$test (eof)"
++	return
++    }
++    timeout {
++	fail "$test (timeout)"
++	return
++    }
++}
++gdb_exit
++
++# Testcase uses the most simple notification not to get caught by attach on
++# exiting the function.  Still we could retry the gstack command if we fail.
++
++set test "spawn gstack"
++set command "sh -c GDB=$GDB\\ sh\\ ${srcdir}/../gstack.sh\\ $pid\\;echo\\ GSTACK-END"
++set res [remote_spawn host $command];
++if { $res < 0 || $res == "" } {
++    perror "Spawning $command failed."
++    fail $test
++}
++set pid [exp_pid -i $res]
++gdb_test_multiple "" $test {
++    -re "^#0 +(0x\[0-9a-f\]+ in )?\\.?func \\(\\) at \[^\r\n\]*\r\n#1 +0x\[0-9a-f\]+ in \\.?main \\(\\) at \[^\r\n\]*\r\nGSTACK-END\r\n\$" {
++	pass $test
++    }
++}
++gdb_exit
++
++remote_exec host "kill -9 $pid"
+Index: gdb-7.4.50.20120103/gdb/testsuite/gdb.base/gstack.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.4.50.20120103/gdb/testsuite/gdb.base/gstack.c	2012-01-03 05:52:37.279385629 +0100
 @@ -0,0 +1,43 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -167,92 +230,3 @@ new file mode 100644
 +
 +  return 0;
 +}
-diff --git a/gdb/testsuite/gdb.base/gstack.exp b/gdb/testsuite/gdb.base/gstack.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gstack.exp
-@@ -0,0 +1,84 @@
-+# Copyright (C) 2012 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+set testfile gstack
-+set executable ${testfile}
-+set binfile [standard_output_file $executable]
-+if {[build_executable ${testfile} ${executable} "" {debug}] == -1} {
-+    return -1
-+}
-+
-+set test "spawn inferior"
-+set command "${binfile}"
-+set res [remote_spawn host $command];
-+if { $res < 0 || $res == "" } {
-+    perror "Spawning $command failed."
-+    fail $test
-+    return
-+}
-+
-+# The spawn id of the test inferior.
-+set test_spawn_id $res
-+
-+set use_gdb_stub 1
-+set pid [exp_pid -i $res]
-+gdb_expect {
-+    -re "looping\r\n" {
-+	pass $test
-+    }
-+    eof {
-+	fail "$test (eof)"
-+	return
-+    }
-+    timeout {
-+	fail "$test (timeout)"
-+	return
-+    }
-+}
-+
-+# Testcase uses the most simple notification not to get caught by attach on
-+# exiting the function.  Still we could retry the gstack command if we fail.
-+
-+set test "spawn gstack"
-+set command "sh -c GDB=$GDB\\ GDBARGS=-data-directory\\\\\\ $BUILD_DATA_DIRECTORY\\ sh\\ ${srcdir}/../gstack.sh\\ $pid\\;echo\\ GSTACK-END"
-+set res [remote_spawn host $command];
-+if { $res < 0 || $res == "" } {
-+    perror "Spawning $command failed."
-+    fail $test
-+}
-+
-+set gdb_spawn_id $res
-+
-+gdb_test_multiple "" $test {
-+    -re "^#0 +(0x\[0-9a-f\]+ in )?\\.?func \\(\\) at \[^\r\n\]*\r\n#1 +0x\[0-9a-f\]+ in \\.?main \\(\\) at \[^\r\n\]*\r\nGSTACK-END\r\n\$" {
-+	pass $test
-+    }
-+}
-+
-+gdb_test_multiple "" "gstack exits" {
-+    eof {
-+	set result [wait -i $gdb_spawn_id]
-+	verbose $result
-+
-+	gdb_assert { [lindex $result 2] == 0 } "gstack exits with no error"
-+	gdb_assert { [lindex $result 3] == 0 } "gstack's exit status is 0"
-+
-+	remote_close host
-+	clear_gdb_spawn_id
-+    }
-+}
-+
-+# Kill the test inferior.
-+kill_wait_spawned_process $test_spawn_id

gdb-6.3-ia64-gcore-page0-20050421.patch

@@ -0,0 +1,20 @@
+Index: gdb-7.2.50.20110107/gdb/gcore.c
+===================================================================
+--- gdb-7.2.50.20110107.orig/gdb/gcore.c	2011-01-05 23:22:49.000000000 +0100
++++ gdb-7.2.50.20110107/gdb/gcore.c	2011-01-07 09:04:28.000000000 +0100
+@@ -534,8 +534,14 @@ gcore_copy_callback (bfd *obfd, asection
+       if (size > total_size)
+ 	size = total_size;
+ 
++      /* Warn if read error occurs except if we were trying to read the
++	 first page for ia64.  The first page is marked readable, but it cannot
++	 be read.  */
+       if (target_read_memory (bfd_section_vma (obfd, osec) + offset,
+-			      memhunk, size) != 0)
++			      memhunk, size) != 0
++	  && (strcmp (gdbarch_bfd_arch_info (target_gdbarch)->arch_name,
++		      "ia64")
++	      || bfd_section_vma (obfd, osec) != 0))
+ 	{
+ 	  warning (_("Memory read failed for corefile "
+ 		     "section, %s bytes at %s."),

gdb-6.3-ia64-gcore-speedup-20050714.patch

@@ -0,0 +1,126 @@
+2005-07-14  Jeff Johnsotn  <jjohnstn@redhat.com>
+
+	* linux-nat.c (linux_nat_xfer_memory): Incorporate Fujitsu
+	work-around to use /proc/mem for storage, but to fall-back
+	to PTRACE for ia64 rse register areas.
+	* ia64-linux-nat.c (ia64_rse_slot_num): New static function.
+	(ia64_rse_skip_regs): Ditto.
+	(ia64_linux_check_stack_region): New function.
+	
+Index: gdb-6.8.50.20090803/gdb/linux-nat.c
+===================================================================
+--- gdb-6.8.50.20090803.orig/gdb/linux-nat.c	2009-08-04 06:29:55.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/linux-nat.c	2009-08-04 06:30:53.000000000 +0200
+@@ -4495,15 +4495,38 @@ linux_xfer_partial (struct target_ops *o
+ 	offset &= ((ULONGEST) 1 << addr_bit) - 1;
+     }
+ 
+-#ifndef NATIVE_XFER_UNWIND_TABLE
+-  /* FIXME: For ia64, we cannot currently use linux_proc_xfer_memory
+-	    for accessing thread storage.  Revert when Bugzilla 147436
+-	    is fixed.  */
+   xfer = linux_proc_xfer_partial (ops, object, annex, readbuf, writebuf,
+ 				  offset, len);
+   if (xfer != 0)
+-    return xfer;
++    {
++#ifdef NATIVE_XFER_UNWIND_TABLE
++      struct mem_region range;
++      range.lo = memaddr;
++      range.hi = memaddr + len;
++
++      /* FIXME: For ia64, we cannot currently use
++	 linux_proc_xfer_partial for accessing rse register storage.
++	 Revert when Bugzilla 147436 is fixed.  */
++#ifdef NATIVE_XFER_UNWIND_TABLE
++      extern int ia64_linux_check_stack_region (struct lwp_info *lwp,
++						void *range);
++#endif
++      if (iterate_over_lwps (ia64_linux_check_stack_region, &range) != NULL)
++	{ /* This region contains ia64 rse registers, we have to re-read.  */
++	  int xxfer;
++
++	  /* Re-read register stack area.  */
++	  xxfer = super_xfer_partial (ops, object, annex,
++				      readbuf + (range.lo - memaddr),
++				      writebuf + (range.lo - memaddr),
++				      offset + (range.lo - memaddr),
++				      range.hi - range.lo);
++	  if (xxfer == 0)
++	    xfer = 0;
++	}
+ #endif
++      return xfer;
++    }
+ 
+   return super_xfer_partial (ops, object, annex, readbuf, writebuf,
+ 			     offset, len);
+Index: gdb-6.8.50.20090803/gdb/ia64-linux-nat.c
+===================================================================
+--- gdb-6.8.50.20090803.orig/gdb/ia64-linux-nat.c	2009-02-23 01:03:49.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/ia64-linux-nat.c	2009-08-04 06:30:53.000000000 +0200
+@@ -809,6 +809,64 @@ ia64_linux_xfer_partial (struct target_o
+ 
+ void _initialize_ia64_linux_nat (void);
+ 
++/*
++ * Note: taken from ia64_tdep.c
++ *
++ */
++
++static __inline__ unsigned long
++ia64_rse_slot_num (unsigned long addr)
++{
++  return (addr >> 3) & 0x3f;
++}
++
++/* Skip over a designated number of registers in the backing
++   store, remembering every 64th position is for NAT.  */
++static __inline__ unsigned long
++ia64_rse_skip_regs (unsigned long  addr, long num_regs)
++{
++  long delta = ia64_rse_slot_num(addr) + num_regs;
++
++  if (num_regs < 0)
++    delta -= 0x3e;
++  return addr + ((num_regs + delta/0x3f) << 3);
++}
++
++/*
++ * Check mem_region is stack or not. If stack, /proc/<pid>/mem cannot return 
++ * expected value.
++ */
++int ia64_linux_check_stack_region(struct lwp_info *ti, struct mem_region *range)
++{
++	CORE_ADDR addr;
++	int error;
++	unsigned long bsp, cfm, bspstore;
++	long sof;
++	pid_t pid = ptid_get_lwp(ti->ptid);
++	bsp = ptrace(PTRACE_PEEKUSER, pid, PT_AR_BSP ,NULL);
++	if (bsp == (unsigned long)-1) {
++		return 1;
++	}
++	/* stack is allocated by one-segment, not separated into several segments.
++	   So, we only have to check whether bsp is in *range* or not. */ 		
++	if((range->lo <= bsp) && (bsp <= range->hi)) {
++		bspstore = ptrace(PTRACE_PEEKUSER, pid, PT_AR_BSPSTORE, NULL);
++		cfm = ptrace(PTRACE_PEEKUSER, pid, PT_CFM, NULL);
++		sof = cfm & 0x3f;
++		bsp = ia64_rse_skip_regs(bsp, -sof);
++		range->lo = bspstore;
++		range->hi = bsp;
++		/* we have to check the size of dirty register stack area */
++		/*
++		fprintf_unfiltered(gdb_stdlog, "<%d> <%p>  <%lx> <%p> <%p>\n",
++				   pid, bsp, sof, range->lo, range->hi);
++		*/
++		return 1;
++	}
++	
++	return 0;
++}
++
+ void
+ _initialize_ia64_linux_nat (void)
+ {

gdb-6.3-ia64-info-frame-fix-20050725.patch

@@ -0,0 +1,107 @@
+2005-07-25  Jeff Johnstno  <jjohnstn@redhat.com>
+
+	* libunwind-frame.c (libunwind_frame_prev_register): Check valuep
+	is not NULL before copying cursor address into it.
+	
+testsuite:
+2005-07-25  Jeff Johnstno  <jjohnstn@redhat.com>
+
+	* gdb.arch/ia64-sigtramp.exp: New test.
+	* gdb.arch/ia64-sigtramp.c: Ditto.
+
+2008-02-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.8pre.  (Only the testcase has remained.)
+
+--- gdb-6.3/gdb/testsuite/gdb.arch/ia64-sigtramp.c.fix	2005-07-25 16:42:46.000000000 -0400
++++ gdb-6.3/gdb/testsuite/gdb.arch/ia64-sigtramp.c	2005-07-25 16:42:08.000000000 -0400
+@@ -0,0 +1,23 @@
++#include <stdio.h>
++#include <signal.h>
++
++int *l;
++
++void x (int sig)
++{
++  printf ("in signal handler for signal %d\n", sig);
++}
++
++int main()
++{
++  int k;
++
++  signal (SIGSEGV, &x);
++
++  k = *l;
++
++  printf ("k is %d\n", k);
++ 
++  return 0;
++}
++
+--- gdb-6.3/gdb/testsuite/gdb.arch/ia64-sigtramp.exp.fix	2005-07-25 16:42:50.000000000 -0400
++++ gdb-6.3/gdb/testsuite/gdb.arch/ia64-sigtramp.exp	2005-07-25 16:42:01.000000000 -0400
+@@ -0,0 +1,63 @@
++#   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.  
++
++# Please email any bugs, comments, and/or additions to this file to:
++# bug-gdb@prep.ai.mit.edu
++
++# This file was written by Jeff Johnston (jjohnstn@redhat.com)
++
++if ![istarget "ia64-*-*"] then {
++    return
++}
++
++set testfile "ia64-sigtramp"
++set srcfile ${testfile}.c
++set binfile ${objdir}/${subdir}/${testfile}
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
++    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
++}
++
++if [get_compiler_info ${binfile}] {
++    return -1
++}
++
++gdb_exit
++set match_max_old [match_max]
++match_max -d 1000000
++gdb_start
++match_max -d $match_max_old
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++if ![runto_main] then {
++    fail "Can't run to main"
++    return 0
++}
++
++gdb_test "handle SIGSEGV" "SIGSEGV.*Yes.*Yes.*Yes.*Segmentation fault"
++gdb_test "next" "" "first next"
++gdb_test "next" "Program received signal SIGSEGV.*" "getting SIGSEGV"
++gdb_breakpoint "x"
++gdb_test "continue" "Breakpoint.*x.*" "continue to x"
++
++gdb_test "f 1" ".*signal handler called.*" "frame 1"
++
++# gdb-7.0+ no longer prints the pseudo registers as they are computed.
++# frame_info says: /* For moment, only display registers that were saved on the
++#                     stack.  */
++gdb_test "set debug frame 1"
++gdb_test "info frame" "Stack level 1, .*frame_unwind_register_value \\(frame=1,regnum=750\\(p63\\),\[^\r\n\]*\r\n\[^\r\n\]*-> computed bytes=.*" "info sigtramp frame"

gdb-6.3-ia64-sigill-20051115.patch

@@ -0,0 +1,95 @@
+2005-11-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* linux-thread-db.c (thread_db_wait): Don't bother continuing if
+	the wait result indicates the program terminated with a signal.
+	* linux-nat.c (linux_nat_wait): For SIGILL and SIGTRAP, don't
+	throw away the event if the user has specified nostop noprint.
+
+gdb/testsuite:
+
+2005-11-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* gdb.arch/ia64-sigill.c: New test.
+	* gdb.arch/ia64-sigill.exp: Ditto.
+
+Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/ia64-sigill.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/ia64-sigill.exp	2011-07-22 19:16:13.000000000 +0200
+@@ -0,0 +1,49 @@
++#   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.  
++
++# Please email any bugs, comments, and/or additions to this file to:
++# bug-gdb@prep.ai.mit.edu
++
++# This file was written by Jeff Johnston (jjohnstn@redhat.com)
++
++if ![istarget "ia64-*-*"] then {
++    return
++}
++
++set testfile "ia64-sigill"
++set srcfile ${testfile}.c
++set binfile ${objdir}/${subdir}/${testfile}
++
++# Deliberately compile with pthreads, even though test is single-threaded.
++# We want to force gdb thread code to be exercised.
++if  { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
++    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
++}
++
++if [get_compiler_info ${binfile}] {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++# We set up SIGILL nostop, noprint, pass and then run the program.
++# We expect to just see a normal run.
++gdb_test "handle SIGILL nostop noprint" "SIGILL.*No.*No.*Yes.*" "handle sigill"
++gdb_test "run" "Starting program.*ia64-sigill.*\[New thread.*\].*hello world.*Program exited normally." "run to exit"
++ 
+Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/ia64-sigill.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/ia64-sigill.c	2011-07-22 19:16:13.000000000 +0200
+@@ -0,0 +1,8 @@
++#include <stdio.h>
++
++int main()
++{
++  printf ("hello world\n");
++  return 0;
++}
++
+Index: gdb-7.3.50.20110722/gdb/linux-nat.c
+===================================================================
+--- gdb-7.3.50.20110722.orig/gdb/linux-nat.c	2011-07-22 19:15:05.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/linux-nat.c	2011-07-22 19:16:13.000000000 +0200
+@@ -3733,7 +3733,8 @@ retry:
+      threads can be a bit time-consuming so if we want decent
+      performance with heavily multi-threaded programs, especially when
+      they're using a high frequency timer, we'd better avoid it if we
+-     can.  */
++     can.  For possible trap signals like SIGTRAP and SIGILL, don't
++     avoid reporting.  */
+ 
+   if (WIFSTOPPED (status))
+     {

gdb-6.3-ia64-sigtramp-frame-20050708.patch

@@ -0,0 +1,158 @@
+2005-07-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* ia64-tdep.c (ia64_sigtramp_frame_prev_register): Build
+	pseudo-registers the same as ia64_pseudo_register_read.
+
+2008-04-16  Yi Zhan  <yi.zhan@intel.com>
+
+	* ia64-tdep.c (ia64_sigtramp_frame_prev_register): Fix an
+	ISO C compliance compilation error.
+
+2008-02-12  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to gdb-6.8.50.20081128, follow the upstream change:
+	http://sourceware.org/cgi-bin/cvsweb.cgi/src/gdb/ia64-tdep.c.diff?cvsroot=src&r1=1.176&r2=1.177
+
+Index: gdb-6.8.50.20081128/gdb/ia64-tdep.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/ia64-tdep.c	2008-11-26 06:27:48.000000000 +0100
++++ gdb-6.8.50.20081128/gdb/ia64-tdep.c	2008-12-02 19:04:32.000000000 +0100
+@@ -2107,6 +2107,94 @@ ia64_sigtramp_frame_prev_register (struc
+       return frame_unwind_got_constant (this_frame, regnum, pc);
+     }
+ 
++  /* Red Hat patch begin.  */
++  else if (IA64_NAT0_REGNUM <= regnum && regnum <= IA64_NAT31_REGNUM)
++    {
++      /* NAT pseudo registers 0-31: get them from UNAT.
++       * "copied" from ia64_pseudo_register_read() */
++      ULONGEST unatN_val;
++      ULONGEST unat;
++      read_memory (cache->saved_regs[IA64_UNAT_REGNUM], (char *) &unat,
++		   register_size (target_gdbarch, IA64_UNAT_REGNUM));
++      unatN_val = (unat & (1LL << (regnum - IA64_NAT0_REGNUM))) != 0;
++      return frame_unwind_got_constant (this_frame, regnum, unatN_val);
++    }
++  else if (IA64_NAT32_REGNUM <= regnum && regnum <= IA64_NAT127_REGNUM)
++    {
++      /* NAT pseudo registers 32-127.
++       * "copied" from ia64_pseudo_register_read()
++       * FIXME: Not currently tested -- cannot get the frame to include
++       *        NAT32-NAT127.  */
++      ULONGEST bsp;
++      ULONGEST cfm;
++      ULONGEST natN_val = 0;
++      CORE_ADDR gr_addr = 0, nat_addr = 0;
++
++      read_memory (cache->saved_regs[IA64_BSP_REGNUM], (char *) &bsp,
++		   register_size (target_gdbarch, IA64_BSP_REGNUM));
++      read_memory (cache->saved_regs[IA64_CFM_REGNUM], (char *) &cfm,
++		   register_size (target_gdbarch, IA64_CFM_REGNUM));
++
++      /* The bsp points at the end of the register frame so we
++	 subtract the size of frame from it to get start of register frame.  */
++      bsp = rse_address_add (bsp, -(cfm & 0x7f));
++
++      if ((cfm & 0x7f) > regnum - V32_REGNUM)
++	gr_addr = rse_address_add (bsp, (regnum - V32_REGNUM));
++
++      if (gr_addr != 0)
++	{
++	  /* Compute address of nat collection bits */
++	  CORE_ADDR nat_collection;
++	  int nat_bit;
++	  nat_addr = gr_addr | 0x1f8;
++	  /* If our nat collection address is bigger than bsp, we have to get
++	     the nat collection from rnat.  Otherwise, we fetch the nat
++	     collection from the computed address. FIXME: Do not know if
++	     RNAT can be not stored in the frame--being extra cautious. */
++	  if (nat_addr >= bsp)
++	    {
++	      nat_addr = cache->saved_regs[IA64_RNAT_REGNUM];
++	      if (nat_addr != 0)
++		read_memory (nat_addr, (char *) &nat_collection,
++			     register_size (target_gdbarch, IA64_RNAT_REGNUM));
++	    }
++	  else
++	    nat_collection = read_memory_integer (nat_addr, 8, BFD_ENDIAN_LITTLE);
++	  if (nat_addr != 0)
++	    {
++	      nat_bit = (gr_addr >> 3) & 0x3f;
++	      natN_val = (nat_collection >> nat_bit) & 1;
++	      return frame_unwind_got_constant (this_frame, regnum, natN_val);
++	    }
++	}
++      warning (_("ia64_sigtramp_frame_prev_register: unhandled register %d"),
++	       regnum);
++    }
++  else if (regnum == VBOF_REGNUM)
++    {
++      /* BOF pseudo register.
++       * "copied" from ia64_pseudo_register_read()
++       *
++       * A virtual register frame start is provided for user convenience.
++       * It can be calculated as the bsp - sof (sizeof frame). */
++      ULONGEST bsp;
++      ULONGEST cfm;
++      ULONGEST bof;
++
++      read_memory (cache->saved_regs[IA64_BSP_REGNUM], (char *) &bsp,
++		   register_size (target_gdbarch, IA64_BSP_REGNUM));
++      read_memory (cache->saved_regs[IA64_CFM_REGNUM], (char *) &cfm,
++		   register_size (target_gdbarch, IA64_CFM_REGNUM));
++
++      /* The bsp points at the end of the register frame so we
++	 subtract the size of frame from it to get beginning of frame.  */
++      bof = rse_address_add (bsp, -(cfm & 0x7f));
++
++      return frame_unwind_got_constant (this_frame, regnum, bof);
++    }
++  /* Red Hat patch end.  */
++
+   else if ((regnum >= IA64_GR32_REGNUM && regnum <= IA64_GR127_REGNUM)
+            || (regnum >= V32_REGNUM && regnum <= V127_REGNUM))
+     {
+@@ -2121,7 +2209,42 @@ ia64_sigtramp_frame_prev_register (struc
+       return frame_unwind_got_constant (this_frame, regnum, 0);
+     }
+ 
+-  else  /* All other registers not listed above.  */
++  /* Red Hat patch begin.  */
++  else if (VP0_REGNUM <= regnum && regnum <= VP63_REGNUM)
++    {
++      /* VP 0-63.
++       * "copied" from ia64_pseudo_register_read()
++       *
++       * FIXME: Not currently tested--cannot get the frame to include PR. */
++      CORE_ADDR pr_addr = 0;
++
++      pr_addr = cache->saved_regs[IA64_PR_REGNUM];
++      if (pr_addr != 0)
++	{
++	  ULONGEST pr;
++	  ULONGEST cfm;
++	  ULONGEST prN_val;
++	  read_memory (pr_addr, (char *) &pr,
++		       register_size (target_gdbarch, IA64_PR_REGNUM));
++	  read_memory (cache->saved_regs[IA64_CFM_REGNUM], (char *) &cfm,
++		       register_size (target_gdbarch, IA64_CFM_REGNUM));
++
++	  /* Get the register rename base for this frame and adjust the
++	   * register name to take rotation into account. */
++	  if (VP16_REGNUM <= regnum && regnum <= VP63_REGNUM)
++	    {
++	      int rrb_pr = (cfm >> 32) & 0x3f;
++	      regnum = VP16_REGNUM + ((regnum - VP16_REGNUM) + rrb_pr) % 48;
++	    }
++	  prN_val = (pr & (1LL << (regnum - VP0_REGNUM))) != 0;
++	  return frame_unwind_got_constant (this_frame, regnum, prN_val);
++	}
++      warning (_("ia64_sigtramp_frame_prev_register: unhandled register %d"),
++	       regnum);
++    }
++  /* Red Hat patch end.  */
++
++  /* All other registers not listed above.  */
+     {
+       CORE_ADDR addr = cache->saved_regs[regnum];
+ 

gdb-6.3-inferior-notification-20050721.patch

@@ -1,11 +1,3 @@
-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
@@ -17,10 +9,10 @@ Subject: gdb-6.3-inferior-notification-20050721.patch
 
 	* 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
+Index: gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32.c	2011-03-20 20:15:57.000000000 +0100
 @@ -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
@@ -42,10 +34,10 @@ new file mode 100644
 +    }
 +  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
+Index: gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32.exp	2011-03-20 20:20:03.000000000 +0100
 @@ -0,0 +1,245 @@
 +# Copyright 2005 Free Software Foundation, Inc.
 +
@@ -85,9 +77,9 @@ new file mode 100644
 +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}]]
++set binfile  ${objdir}/${subdir}/${testfile}
++set binfile2 ${objdir}/${subdir}/${testfile}b
++set escapedbinfile  [string_to_regexp ${objdir}/${subdir}/${testfile}]
 +
 +#execute_anywhere "rm -f ${binfile} ${binfile2}"
 +remote_exec build "rm -f ${binfile} ${binfile2}"
@@ -262,7 +254,7 @@ new file mode 100644
 +}
 +
 +set GDBFLAGS_orig $GDBFLAGS
-+set GDBFLAGS "-iex \"set height 0\" --pid=$testpid"
++set GDBFLAGS "--pid=$testpid"
 +gdb_start
 +set GDBFLAGS $GDBFLAGS_orig
 +
@@ -284,7 +276,7 @@ new file mode 100644
 +}
 +
 +set GDBFLAGS_orig $GDBFLAGS
-+set GDBFLAGS "-iex \"set height 0\" --pid=$testpid"
++set GDBFLAGS "--pid=$testpid"
 +gdb_start
 +set GDBFLAGS $GDBFLAGS_orig
 +
@@ -292,10 +284,10 @@ new file mode 100644
 +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
+Index: gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32b.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32b.c	2011-03-20 20:15:57.000000000 +0100
 @@ -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

gdb-6.3-inheritancetest-20050726.patch

@@ -1,11 +1,3 @@
-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.
@@ -13,10 +5,26 @@ Subject: gdb-6.3-inheritancetest-20050726.patch
 	* 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
+Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835b.cc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835b.cc	2009-08-12 06:07:50.000000000 +0200
+@@ -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) {}
+Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.cc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.cc	2009-08-12 06:07:50.000000000 +0200
 @@ -0,0 +1,32 @@
 +#include "b146835.h"
 +#include <iostream>
@@ -50,10 +58,10 @@ new file mode 100644
 +   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
+Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.exp	2009-08-12 06:58:28.000000000 +0200
 @@ -0,0 +1,47 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
@@ -79,7 +87,7 @@ new file mode 100644
 +set testfile "b146835"
 +set srcfile ${testfile}.cc
 +set srcfile2 ${testfile}b.cc
-+set binfile [standard_output_file ${testfile}]
++set binfile ${objdir}/${subdir}/${testfile}
 +if {[gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcdir}/${subdir}/${srcfile2}" "${binfile}" executable {debug c++}] != "" } {
 +    return -1
 +}
@@ -102,10 +110,10 @@ new file mode 100644
 +
 +# 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
+Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.h	2009-08-12 06:07:50.000000000 +0200
 @@ -0,0 +1,36 @@
 +
 +class A {
@@ -143,19 +151,3 @@ new file mode 100644
 +   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

@@ -1,149 +1,8 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.3-mapping-zero-inode-test.patch
-
-;; Test GCORE for shmid 0 shared memory mappings.
-;;=fedoratest: But it is broken anyway, sometimes the case being tested is not reproducible.
-
-diff --git a/gdb/testsuite/gdb.base/gcore-shmid0.c b/gdb/testsuite/gdb.base/gcore-shmid0.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gcore-shmid0.c
-@@ -0,0 +1,128 @@
-+/* Copyright 2007, 2009 Free Software Foundation, Inc.
-+
-+   This file is part of GDB.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or (at
-+   your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.  */
-+
-+/*
-+ * Test GDB's handling of gcore for mapping with a name but zero inode.
-+ */
-+
-+#include <sys/ipc.h>
-+#include <sys/shm.h>
-+#include <stdio.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <assert.h>
-+#include <time.h>
-+
-+/* The same test running in a parallel testsuite may steal us the zero SID,
-+   even if we never get any EEXIST.  Just try a while.  */
-+
-+#define TIMEOUT_SEC 10
-+
-+static volatile int v;
-+
-+static void
-+initialized (void)
-+{
-+  v++;
-+}
-+
-+static void
-+unresolved (void)
-+{
-+  v++;
-+}
-+
-+int
-+main (void)
-+{
-+  int sid;
-+  unsigned int *addr = (void *) -1L;
-+  int attempt, round = 0;
-+  time_t ts_start, ts;
-+
-+  if (time (&ts_start) == (time_t) -1)
-+    {
-+      printf ("time (): %m\n");
-+      exit (1);
-+    }
-+
-+  /* The generated SID will cycle with an increment of 32768, attempt until it
-+   * wraps to 0.  */
-+
-+  for (attempt = 0; addr == (void *) -1L; attempt++)
-+    {
-+      /* kernel-2.6.25-8.fc9.x86_64 just never returns the value 0 by
-+	 shmget(2).  shmget returns SID range 0..1<<31 in steps of 32768,
-+	 0x1000 should be enough but wrap the range it to be sure.  */
-+
-+      if (attempt > 0x21000)
-+        {
-+	  if (time (&ts) == (time_t) -1)
-+	    {
-+	      printf ("time (): %m\n");
-+	      exit (1);
-+	    }
-+
-+	  if (ts >= ts_start && ts < ts_start + TIMEOUT_SEC)
-+	    {
-+	      attempt = 0;
-+	      round++;
-+	      continue;
-+	    }
-+
-+	  printf ("Problem is not reproducible on this kernel (attempt %d, "
-+		  "round %d)\n", attempt, round);
-+	  unresolved ();
-+	  exit (1);
-+	}
-+
-+      sid = shmget ((key_t) rand (), 0x1000, IPC_CREAT | IPC_EXCL | 0777);
-+      if (sid == -1)
-+	{
-+	  if (errno == EEXIST)
-+	    continue;
-+
-+	  printf ("shmget (%d, 0x1000, IPC_CREAT): errno %d\n", 0, errno);
-+	  exit (1);
-+	}
-+
-+      /* Use SID only if it is 0, retry it otherwise.  */
-+
-+      if (sid == 0)
-+	{
-+	  addr = shmat (sid, NULL, SHM_RND);
-+	  if (addr == (void *) -1L)
-+	    {
-+	      printf ("shmat (%d, NULL, SHM_RND): errno %d\n", sid,
-+		      errno);
-+	      exit (1);
-+	    }
-+	}
-+      if (shmctl (sid, IPC_RMID, NULL) != 0)
-+	{
-+	  printf ("shmctl (%d, IPC_RMID, NULL): errno %d\n", sid, errno);
-+	  exit (1);
-+	}
-+    }
-+
-+  initialized ();
-+
-+  return 0;
-+}
-diff --git a/gdb/testsuite/gdb.base/gcore-shmid0.exp b/gdb/testsuite/gdb.base/gcore-shmid0.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gcore-shmid0.exp
-@@ -0,0 +1,101 @@
+Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.base/gcore-shmid0.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.base/gcore-shmid0.exp	2009-06-29 16:24:36.000000000 +0200
+@@ -0,0 +1,96 @@
 +# Copyright 2007, 2009 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -187,26 +46,21 @@ new file mode 100644
 +gdb_breakpoint "initialized"
 +gdb_breakpoint "unresolved"
 +
-+set oldtimeout $timeout
-+set timeout [expr $oldtimeout + 120]
-+
 +set test "Continue to initialized."
 +gdb_test_multiple "continue" $test {
 +    -re "Breakpoint .*, initialized .* at .*\r\n$gdb_prompt $" {
 +	pass $test
 +    }
 +    -re "Breakpoint .*, unresolved .* at .*\r\n$gdb_prompt $" {
-+	set timeout $oldtimeout
 +	unsupported $test
 +	return -1
 +    }
 +}
-+set timeout $oldtimeout
 +
-+set escapedfilename [string_to_regexp [standard_output_file gcore-shmid0.test]]
++set escapedfilename [string_to_regexp ${objdir}/${subdir}/gcore-shmid0.test]
 +
 +set test "save a corefile"
-+gdb_test_multiple "gcore [standard_output_file gcore-shmid0.test]" $test {
++gdb_test_multiple "gcore ${objdir}/${subdir}/gcore-shmid0.test" $test {
 +    -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
 +	pass $test
 +    }
@@ -221,7 +75,7 @@ new file mode 100644
 +gdb_continue_to_end "finish"
 +
 +set test "core-file command"
-+gdb_test_multiple "core-file [standard_output_file gcore-shmid0.test]" $test {
++gdb_test_multiple "core-file $objdir/$subdir/gcore-shmid0.test" $test {
 +    -re ".* program is being debugged already.*y or n. $" {
 +	# gdb_load may connect us to a gdbserver.
 +	send_gdb "y\n"
@@ -245,3 +99,131 @@ new file mode 100644
 +	fail $test
 +    }
 +}
+Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.base/gcore-shmid0.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090302/gdb/testsuite/gdb.base/gcore-shmid0.c	2009-06-29 16:22:49.000000000 +0200
+@@ -0,0 +1,123 @@
++/* Copyright 2007, 2009 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or (at
++   your option) any later version.
++
++   This program is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.  */
++
++/*
++ * Test GDB's handling of gcore for mapping with a name but zero inode.
++ */
++
++#include <sys/ipc.h>
++#include <sys/shm.h>
++#include <stdio.h>
++#include <errno.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <assert.h>
++
++/* The same test running in a parallel testsuite may steal us the zero SID,
++   even if we never get any EEXIST.  Just try a while.  */
++
++#define TIMEOUT_SEC 10
++
++static void
++initialized (void)
++{
++}
++
++static void
++unresolved (void)
++{
++}
++
++int
++main (void)
++{
++  int sid;
++  unsigned int *addr = (void *) -1L;
++  int attempt, round = 0;
++  time_t ts_start, ts;
++
++  if (time (&ts_start) == (time_t) -1)
++    {
++      printf ("time (): %m\n");
++      exit (1);
++    }
++
++  /* The generated SID will cycle with an increment of 32768, attempt until it
++   * wraps to 0.  */
++
++  for (attempt = 0; addr == (void *) -1L; attempt++)
++    {
++      /* kernel-2.6.25-8.fc9.x86_64 just never returns the value 0 by
++	 shmget(2).  shmget returns SID range 0..1<<31 in steps of 32768,
++	 0x1000 should be enough but wrap the range it to be sure.  */
++
++      if (attempt > 0x21000)
++        {
++	  if (time (&ts) == (time_t) -1)
++	    {
++	      printf ("time (): %m\n");
++	      exit (1);
++	    }
++
++	  if (ts >= ts_start && ts < ts_start + TIMEOUT_SEC)
++	    {
++	      attempt = 0;
++	      round++;
++	      continue;
++	    }
++
++	  printf ("Problem is not reproducible on this kernel (attempt %d, "
++		  "round %d))\n", attempt, round);
++	  unresolved ();
++	  exit (1);
++	}
++
++      sid = shmget ((key_t) rand (), 0x1000, IPC_CREAT | IPC_EXCL | 0777);
++      if (sid == -1)
++	{
++	  if (errno == EEXIST)
++	    continue;
++
++	  printf ("shmget (%d, 0x1000, IPC_CREAT): errno %d\n", 0, errno);
++	  exit (1);
++	}
++
++      /* Use SID only if it is 0, retry it otherwise.  */
++
++      if (sid == 0)
++	{
++	  addr = shmat (sid, NULL, SHM_RND);
++	  if (addr == (void *) -1L)
++	    {
++	      printf ("shmat (%d, NULL, SHM_RND): errno %d\n", sid,
++		      errno);
++	      exit (1);
++	    }
++	}
++      if (shmctl (sid, IPC_RMID, NULL) != 0)
++	{
++	  printf ("shmctl (%d, IPC_RMID, NULL): errno %d\n", sid, errno);
++	  exit (1);
++	}
++    }
++
++  initialized ();
++
++  return 0;
++}

gdb-6.3-ppc64displaysymbol-20041124.patch

@@ -0,0 +1,24 @@
+2004-11-24  Andrew Cagney  <cagney@gnu.org>
+
+	* printcmd.c (build_address_symbolic): Find a section for the
+	address.
+
+Index: gdb-6.8.50.20081128/gdb/printcmd.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/printcmd.c	2008-12-04 01:36:05.000000000 +0100
++++ gdb-6.8.50.20081128/gdb/printcmd.c	2008-12-04 01:37:18.000000000 +0100
+@@ -616,6 +616,14 @@ build_address_symbolic (CORE_ADDR addr, 
+ 	  addr = overlay_mapped_address (addr, section);
+ 	}
+     }
++  /* To ensure that the symbol returned belongs to the correct setion
++     (and that the last [random] symbol from the previous section
++     isn't returned) try to find the section containing PC.  First try
++     the overlay code (which by default returns NULL); and second try
++     the normal section code (which almost always succeeds).  */
++  section = find_pc_overlay (addr);
++  if (section == NULL)
++    section = find_pc_section (addr);
+ 
+   /* First try to find the address in the symbol table, then
+      in the minsyms.  Take the closest one.  */

gdb-6.3-ppc64syscall-20040622.patch

@@ -0,0 +1,111 @@
+2004-06-22  Andrew Cagney  <cagney@gnu.org>
+
+	* rs6000-tdep.c (struct rs6000_framedata): Add field "func_start".
+	(skip_prologue): Delete local variable "orig_pc", use
+	"func_start".  Add local variable "num_skip_linux_syscall_insn",
+	use to skip over first half of a GNU/Linux syscall and update
+	"func_start".
+
+Index: gdb-7.2.50.20110117/gdb/rs6000-tdep.c
+===================================================================
+--- gdb-7.2.50.20110117.orig/gdb/rs6000-tdep.c	2011-01-11 20:23:02.000000000 +0100
++++ gdb-7.2.50.20110117/gdb/rs6000-tdep.c	2011-01-17 15:48:19.000000000 +0100
+@@ -126,6 +126,7 @@ static const char *powerpc_vector_abi_st
+ 
+ struct rs6000_framedata
+   {
++    CORE_ADDR func_start;	/* True function start.  */
+     int offset;			/* total size of frame --- the distance
+ 				   by which we decrement sp to allocate
+ 				   the frame */
+@@ -1496,7 +1497,6 @@ static CORE_ADDR
+ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
+ 	       struct rs6000_framedata *fdata)
+ {
+-  CORE_ADDR orig_pc = pc;
+   CORE_ADDR last_prologue_pc = pc;
+   CORE_ADDR li_found_pc = 0;
+   gdb_byte buf[4];
+@@ -1514,12 +1514,14 @@ skip_prologue (struct gdbarch *gdbarch, 
+   int minimal_toc_loaded = 0;
+   int prev_insn_was_prologue_insn = 1;
+   int num_skip_non_prologue_insns = 0;
++  int num_skip_ppc64_gnu_linux_syscall_insn = 0;
+   int r0_contains_arg = 0;
+   const struct bfd_arch_info *arch_info = gdbarch_bfd_arch_info (gdbarch);
+   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+ 
+   memset (fdata, 0, sizeof (struct rs6000_framedata));
++  fdata->func_start = pc;
+   fdata->saved_gpr = -1;
+   fdata->saved_fpr = -1;
+   fdata->saved_vr = -1;
+@@ -1553,6 +1555,55 @@ skip_prologue (struct gdbarch *gdbarch, 
+ 	break;
+       op = extract_unsigned_integer (buf, 4, byte_order);
+ 
++      /* A PPC64 GNU/Linux system call function is split into two
++	 sub-functions: a non-threaded fast-path (__NAME_nocancel)
++	 which does not use a frame; and a threaded slow-path
++	 (Lpseudo_cancel) that does create a frame.  Ref:
++	 nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
++
++	 *INDENT-OFF*
++	 NAME:
++	 	SINGLE_THREAD_P
++	 	bne- .Lpseudo_cancel
++	 __NAME_nocancel:
++	 	li r0,162
++	 	sc
++	 	bnslr+
++	 	b 0x7fe014ef64 <.__syscall_error>
++	 Lpseudo_cancel:
++	 	stdu r1,-128(r1)
++	 	...
++	 *INDENT-ON*
++
++	 Unfortunatly, because the latter case uses a local label (not
++	 in the symbol table) a PC in "Lpseudo_cancel" appears to be
++	 in "__NAME_nocancel".  The following code recognizes this,
++	 adjusting FUNC_START to point to where "Lpseudo_cancel"
++	 should be, and parsing the prologue sequence as if
++	 "Lpseudo_cancel" was the entry point.  */
++
++      if (((op & 0xffff0000) == 0x38000000 /* li r0,N */
++	   && pc == fdata->func_start + 0
++	   && num_skip_ppc64_gnu_linux_syscall_insn == 0)
++	  || (op == 0x44000002 /* sc */
++	      && pc == fdata->func_start + 4
++	      && num_skip_ppc64_gnu_linux_syscall_insn == 1)
++	  || (op == 0x4ca30020 /* bnslr+ */
++	      && pc == fdata->func_start + 8
++	      && num_skip_ppc64_gnu_linux_syscall_insn == 2))
++	{
++	  num_skip_ppc64_gnu_linux_syscall_insn++;
++	  continue;
++	}
++      else if ((op & 0xfc000003) == 0x48000000 /* b __syscall_error */
++	       && pc == fdata->func_start + 12
++	       && num_skip_ppc64_gnu_linux_syscall_insn == 3)
++	{
++	  num_skip_ppc64_gnu_linux_syscall_insn = -1;
++	  fdata->func_start = pc;
++	  continue;
++	}
++
+       if ((op & 0xfc1fffff) == 0x7c0802a6)
+ 	{			/* mflr Rx */
+ 	  /* Since shared library / PIC code, which needs to get its
+@@ -1734,9 +1785,9 @@ skip_prologue (struct gdbarch *gdbarch, 
+ 	     we have no line table information or the line info tells
+ 	     us that the subroutine call is not part of the line
+ 	     associated with the prologue.  */
+-	  if ((pc - orig_pc) > 8)
++	  if ((pc - fdata->func_start) > 8)
+ 	    {
+-	      struct symtab_and_line prologue_sal = find_pc_line (orig_pc, 0);
++	      struct symtab_and_line prologue_sal = find_pc_line (fdata->func_start, 0);
+ 	      struct symtab_and_line this_sal = find_pc_line (pc, 0);
+ 
+ 	      if ((prologue_sal.line == 0)

gdb-6.3-readnever-20050907.patch

@@ -0,0 +1,98 @@
+2004-11-18  Andrew Cagney  <cagney@gnu.org>
+
+        * dwarf2read.c: Include "top.c".
+        (dwarf2_has_info): Check for readnever_symbol_files.
+        * symfile.c (readnever_symbol_files): Define.
+        * top.h (readnever_symbol_files): Declare.
+        * main.c (captured_main): Add --readnever option.
+        (print_gdb_help): Ditto.
+
+2004-11-18  Andrew Cagney  <cagney@gnu.org>
+
+        * gdb.texinfo (File Options): Document --readnever.
+
+Index: gdb-7.4.50.20111218/gdb/doc/gdb.texinfo
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/doc/gdb.texinfo	2011-12-19 02:52:23.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/doc/gdb.texinfo	2011-12-19 02:52:25.765407434 +0100
+@@ -1005,6 +1005,12 @@ Read each symbol file's entire symbol ta
+ the default, which is to read it incrementally as it is needed.
+ This makes startup slower, but makes future operations faster.
+ 
++@item --readnever
++@cindex @code{--readnever}
++Do not read each symbol file's symbolic debug information.  This makes
++startup faster but at the expense of not being able to perform
++symbolic debugging.
++
+ @end table
+ 
+ @node Mode Options
+Index: gdb-7.4.50.20111218/gdb/main.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/main.c	2011-12-19 02:52:23.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/main.c	2011-12-19 02:52:36.925364438 +0100
+@@ -406,6 +406,7 @@ captured_main (void *data)
+       {"xdb", no_argument, &xdb_commands, 1},
+       {"dbx", no_argument, &dbx_commands, 1},
+       {"readnow", no_argument, &readnow_symbol_files, 1},
++      {"readnever", no_argument, &readnever_symbol_files, 1},
+       {"r", no_argument, &readnow_symbol_files, 1},
+       {"quiet", no_argument, &quiet, 1},
+       {"q", no_argument, &quiet, 1},
+@@ -1072,6 +1073,7 @@ Options:\n\n\
+   fputs_unfiltered (_("\
+   --quiet            Do not print version number on startup.\n\
+   --readnow          Fully read symbol files on first access.\n\
++  --readnever        Do not read symbol files.\n\
+ "), stream);
+   fputs_unfiltered (_("\
+   --se=FILE          Use FILE as symbol file and executable file.\n\
+Index: gdb-7.4.50.20111218/gdb/symfile.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/symfile.c	2011-12-15 16:36:55.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/symfile.c	2011-12-19 02:52:25.767407426 +0100
+@@ -82,6 +82,7 @@ static void clear_symtab_users_cleanup (
+ 
+ /* Global variables owned by this file.  */
+ int readnow_symbol_files;	/* Read full symbols immediately.  */
++int readnever_symbol_files;	/* Never read full symbols.  */
+ 
+ /* External variables and functions referenced.  */
+ 
+Index: gdb-7.4.50.20111218/gdb/dwarf2read.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/dwarf2read.c	2011-12-19 02:52:23.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/dwarf2read.c	2011-12-19 02:52:25.769407418 +0100
+@@ -59,6 +59,7 @@
+ #include "c-lang.h"
+ #include "valprint.h"
+ #include <ctype.h>
++#include "top.h"
+ 
+ #include <fcntl.h>
+ #include "gdb_string.h"
+@@ -1405,8 +1406,9 @@ dwarf2_has_info (struct objfile *objfile
+                              (void *) names);
+       dwarf2_per_objfile->objfile = objfile;
+     }
+-  return (dwarf2_per_objfile->info.asection != NULL
+-	  && dwarf2_per_objfile->abbrev.asection != NULL);
++  return (! readnever_symbol_files
++	  && (dwarf2_per_objfile->info.asection != NULL
++	      && dwarf2_per_objfile->abbrev.asection != NULL));
+ }
+ 
+ /* When loading sections, we look either for uncompressed section or for
+Index: gdb-7.4.50.20111218/gdb/top.h
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/top.h	2011-12-16 21:29:28.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/top.h	2011-12-19 02:52:25.769407418 +0100
+@@ -61,6 +61,7 @@ extern void set_prompt (const char *s);
+ 
+ /* From random places.  */
+ extern int readnow_symbol_files;
++extern int readnever_symbol_files;
+ 
+ /* Perform _initialize initialization.  */
+ extern void gdb_init (char *);

gdb-6.3-rh-dummykfail-20041202.patch

@@ -0,0 +1,22 @@
+2003-07-11  Elena Zannoni  <ezannoni@redhat.com>
+
+        * lib/gdb.exp (setup_kfail, kfail): Redefine procedures.
+                                                                               
+--- ./gdb/testsuite/lib/gdb.exp.1	2004-11-24 15:59:46.131394720 -0500
++++ ./gdb/testsuite/lib/gdb.exp	2004-11-24 16:01:06.304206600 -0500
+@@ -63,6 +63,15 @@
+ 
+ ### Only procedures should come after this point.
+ 
++if {![llength [info procs kfail]]} {
++    proc setup_kfail { args } {
++	#setup_xfail args
++    }
++    proc kfail { bugid message } {
++	fail $message
++    }
++}
++
+ #
+ # gdb_version -- extract and print the version number of GDB
+ #

gdb-6.3-rh-testlibunwind-20041202.patch

@@ -0,0 +1,103 @@
+2003-11-17  Elena Zannoni  <ezannoni@redhat.com>
+   
+        From Jeff Johnston <jjohnstn@redhat.com>
+        * gdb.arch/ia64-libunwind.exp: New file.
+        * gdb.arch/ia64-libunwind.c: New file.
+
+2004-08-03  Jeff Johnston  <jjohnstn@redhat.com>
+   
+        * gdb.arch/ia64-libunwind.exp: Fix test string to match
+	current code base.
+
+	[ acquire_unwind_info -> ia64_find_proc_info_x ]
+
+2009-04-30  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Remove a race from send_gdb "COMMAND\n".
+	Cleanup.
+	Merge in: Patch4: gdb-6.3-rh-testlibunwind1fix-20041202.patch
+ 
+--- /dev/null	2009-04-19 08:52:54.499000000 +0200
++++ gdb-6.8/gdb/testsuite/gdb.arch/ia64-libunwind.c	2009-04-30 19:15:16.000000000 +0200
+@@ -0,0 +1,26 @@
++/* Copyright 2003, 2009 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#include <stdio.h>
++
++int
++main ()
++{
++  printf ("hello world\n");
++ 
++  return 0;
++}
+--- /dev/null	2009-04-19 08:52:54.499000000 +0200
++++ gdb-6.8/gdb/testsuite/gdb.arch/ia64-libunwind.exp	2009-04-30 19:19:22.000000000 +0200
+@@ -0,0 +1,52 @@
++# Copyright 2003, 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.  
++
++# Please email any bugs, comments, and/or additions to this file to:
++# bug-gdb@prep.ai.mit.edu
++
++# This file was written by Jeff Johnston (jjohnstn@redhat.com)
++
++if ![istarget "ia64-*-*"] then {
++    return
++}
++
++set testfile "ia64-libunwind"
++set srcfile ${testfile}.c
++set binfile ${objdir}/${subdir}/${testfile}
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
++    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
++}
++
++if [get_compiler_info ${binfile}] {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++gdb_test "set debug arch 1"
++gdb_breakpoint "main"
++gdb_run_cmd
++
++set test "libunwind message"
++gdb_test_multiple "" $test {
++    -re "ia64_find_proc_info_x.*$gdb_prompt $" {
++	pass $test
++    }
++}

gdb-6.3-rh-testversion-20041202.patch

@@ -1,20 +1,13 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Elena Zannoni <ezannoni@redhat.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.3-rh-testversion-20041202.patch
-
-;; Match the Fedora's version info.
-;;=fedora
-
 2003-02-24  Elena Zannoni  <ezannoni@redhat.com>
 
         * gdb.gdb/selftest.exp: Add matching on specific Red Hat only version
         string.
 
-diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
---- a/gdb/testsuite/gdb.gdb/selftest.exp
-+++ b/gdb/testsuite/gdb.gdb/selftest.exp
-@@ -53,6 +53,9 @@ proc test_with_self { } {
+Index: gdb-7.1.90.20100711/gdb/testsuite/gdb.gdb/selftest.exp
+===================================================================
+--- gdb-7.1.90.20100711.orig/gdb/testsuite/gdb.gdb/selftest.exp	2010-06-26 08:44:47.000000000 +0200
++++ gdb-7.1.90.20100711/gdb/testsuite/gdb.gdb/selftest.exp	2010-07-12 09:59:42.000000000 +0200
+@@ -342,6 +342,9 @@ proc test_with_self { executable } {
  	-re ".\[0-9\]+ = +.+ +0x.*\[0-9.\]+.*$gdb_prompt $" {
  	    pass "printed version with cast"
  	}
@@ -23,16 +16,4 @@ diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest
 +	}
      }
  
-     # start the "xgdb" process
-diff --git a/gdb/top.c b/gdb/top.c
---- a/gdb/top.c
-+++ b/gdb/top.c
-@@ -2163,7 +2163,7 @@ init_gdb_version_vars (void)
-   struct internalvar *major_version_var = create_internalvar ("_gdb_major");
-   struct internalvar *minor_version_var = create_internalvar ("_gdb_minor");
-   int vmajor = 0, vminor = 0, vrevision = 0;
--  sscanf (version, "%d.%d.%d", &vmajor, &vminor, &vrevision);
-+  sscanf (version, "Fedora %d.%d.%d", &vmajor, &vminor, &vrevision);
-   set_internalvar_integer (major_version_var, vmajor);
-   set_internalvar_integer (minor_version_var, vminor + (vrevision > 0));
- }
+     do_steps_and_nexts

gdb-6.3-test-dtorfix-20050121.patch

@@ -1,15 +1,7 @@
-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
+Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.cp/constructortest.cc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.4.50.20111219/gdb/testsuite/gdb.cp/constructortest.cc	2011-12-19 22:05:02.825431735 +0100
 @@ -0,0 +1,99 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -110,10 +102,10 @@ new file mode 100644
 +{
 +   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
+Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.cp/constructortest.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.4.50.20111219/gdb/testsuite/gdb.cp/constructortest.exp	2011-12-19 23:07:24.148290893 +0100
 @@ -0,0 +1,130 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
@@ -137,7 +129,7 @@ new file mode 100644
 +
 +set testfile "constructortest"
 +set srcfile ${testfile}.cc
-+set binfile [standard_output_file ${testfile}]
++set binfile ${objdir}/${subdir}/${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"}] != "" } {

gdb-6.3-test-movedir-20050125.patch

@@ -1,21 +1,13 @@
-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
+Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.c	2008-12-07 23:57:41.000000000 +0100
 @@ -0,0 +1,10 @@
 +#include <stdio.h>
 +#include <stdlib.h>
@@ -27,10 +19,10 @@ new file mode 100644
 +   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
+Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.exp	2008-12-07 10:13:01.000000000 +0100
 @@ -0,0 +1,57 @@
 +#   Copyright 2005
 +#   Free Software Foundation, Inc.
@@ -52,17 +44,17 @@ new file mode 100644
 +set testfile "move-dir"
 +set srcfile ${testfile}.c
 +set incfile ${testfile}.h
-+set binfile [standard_output_file ${testfile}]
++set binfile ${objdir}/${subdir}/${testfile}
 +
-+set testdir [standard_output_file incdir]
++set testdir "${objdir}/${subdir}/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}]"
++remote_exec build "cp ${srcdir}/${subdir}/${srcfile} ${objdir}/${subdir}"
++remote_exec build "cp ${srcdir}/${subdir}/${incfile} ${testdir}"
 +
 +set additional_flags "additional_flags=-I${subdir}/incdir"
 +
-+if  { [gdb_compile [standard_output_file ${srcfile}] "${binfile}" executable [list debug $additional_flags]] != "" } {
++if  { [gdb_compile "${objdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {
 +    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 +}
 +
@@ -89,10 +81,10 @@ new file mode 100644
 +
 +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
+Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.h	2008-12-07 10:13:01.000000000 +0100
 @@ -0,0 +1,7 @@
 +#include <stdlib.h>
 +

gdb-6.3-test-self-20050110.patch

@@ -1,11 +1,3 @@
-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
@@ -14,29 +6,96 @@ Subject: gdb-6.3-test-self-20050110.patch
         * 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} {
-     }
+Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/complaints.exp
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.gdb/complaints.exp	2009-01-03 06:58:04.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/complaints.exp	2009-02-26 22:10:48.000000000 +0100
+@@ -302,13 +302,13 @@ proc find_gdb { arg } {
+ set GDB_FULLPATH [find_gdb $GDB]
  
-     # Remove any old copy lying around.
--    remote_file host delete $xgdb
-+    #remote_file host delete $xgdb
+ # Remove any old copy lying around.
+-remote_file host delete x$tool
++#remote_file host delete x$tool
  
-     gdb_start
--    set file [remote_download host $GDB_FULLPATH $xgdb]
-+    #set file [remote_download host $GDB_FULLPATH $xgdb]
+ gdb_start
  
--    set result [selftest_setup $file $function]
-+    set result [selftest_setup $GDB_FULLPATH $function]
-     if {$result == 0} then {
- 	set result [uplevel $body]
-     }
+-set file [remote_download host $GDB_FULLPATH x$tool]
++#set file [remote_download host $GDB_FULLPATH x$tool]
  
-     gdb_exit
--    catch "remote_file host delete $file"
-+    #catch "remote_file host delete $file"
+-set setup_result [setup_test $file ]
++set setup_result [setup_test $GDB_FULLPATH ]
+ if {$setup_result <0} then {
+     return -1
+ }
+@@ -319,4 +319,4 @@ test_short_complaints
+ test_empty_complaints
  
-     if {$result < 0} then {
- 	warning "Couldn't test self"
+ gdb_exit;
+-catch "remote_file host delete $file";
++#catch "remote_file host delete $file";
+Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/observer.exp
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.gdb/observer.exp	2009-02-17 20:52:27.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/observer.exp	2009-02-26 22:11:40.000000000 +0100
+@@ -258,13 +258,13 @@ proc find_gdb { arg } {
+ set GDB_FULLPATH [find_gdb $GDB]
+ 
+ # Remove any old copy lying around.
+-remote_file host delete x$tool
++#remote_file host delete x$tool
+ 
+ gdb_start
+-set file [remote_download host $GDB_FULLPATH x$tool]
+-set result [test_observer $file];
++#set file [remote_download host $GDB_FULLPATH x$tool]
++set result [test_observer $GDB_FULLPATH];
+ gdb_exit;
+-catch "remote_file host delete $file";
++#catch "remote_file host delete $file";
+ 
+ if {$result <0} then {
+     warning "Couldn't test self"
+Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/selftest.exp
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.gdb/selftest.exp	2009-02-26 22:09:59.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/selftest.exp	2009-02-26 22:10:48.000000000 +0100
+@@ -551,13 +551,13 @@ proc find_gdb { arg } {
+ set GDB_FULLPATH [find_gdb $GDB]
+ 
+ # Remove any old copy lying around.
+-remote_file host delete x$tool
++#remote_file host delete x$tool
+ 
+ gdb_start
+-set file [remote_download host $GDB_FULLPATH x$tool]
+-set result [test_with_self $file];
++#set file [remote_download host $GDB_FULLPATH x$tool]
++set result [test_with_self $GDB_FULLPATH];
+ gdb_exit;
+-catch "remote_file host delete $file";
++#catch "remote_file host delete $file";
+ 
+ if {$result <0} then {
+     warning "Couldn't test self"
+Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/xfullpath.exp
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/testsuite/gdb.gdb/xfullpath.exp	2009-01-03 06:58:04.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.gdb/xfullpath.exp	2009-02-26 22:10:48.000000000 +0100
+@@ -179,13 +179,13 @@ proc find_gdb { arg } {
+ set GDB_FULLPATH [find_gdb $GDB]
+ 
+ # Remove any old copy lying around.
+-remote_file host delete x$tool
++#remote_file host delete x$tool
+ 
+ gdb_start
+-set file [remote_download host $GDB_FULLPATH x$tool]
+-set result [test_with_self $file];
++#set file [remote_download host $GDB_FULLPATH x$tool]
++set result [test_with_self $GDB_FULLPATH];
+ 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,11 +1,3 @@
-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
@@ -50,10 +42,10 @@ Subject: gdb-6.3-threaded-watchpoints2-20050225.patch
 
 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
+Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.threads/watchthreads-threaded.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.4.50.20111219/gdb/testsuite/gdb.threads/watchthreads-threaded.c	2011-12-19 22:05:02.867431570 +0100
 @@ -0,0 +1,66 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -121,10 +113,10 @@ new file mode 100644
 +    pthread_exit(NULL);
 +}
 +
-diff --git a/gdb/testsuite/gdb.threads/watchthreads-threaded.exp b/gdb/testsuite/gdb.threads/watchthreads-threaded.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.threads/watchthreads-threaded.exp
+Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.threads/watchthreads-threaded.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.4.50.20111219/gdb/testsuite/gdb.threads/watchthreads-threaded.exp	2011-12-19 22:28:33.294911982 +0100
 @@ -0,0 +1,126 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
@@ -154,7 +146,7 @@ new file mode 100644
 +
 +set testfile "watchthreads-threaded"
 +set srcfile ${testfile}.c
-+set binfile [standard_output_file ${testfile}]
++set binfile ${objdir}/${subdir}/${testfile}
 +if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
 +    return -1
 +}

gdb-6.5-BEA-testsuite.patch

@@ -1,15 +1,9 @@
-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
+Index: ./gdb/testsuite/gdb.threads/threadcrash.c
+===================================================================
+RCS file: gdb/testsuite/gdb.threads/threadcrash.c
+diff -N gdb/testsuite/gdb.threads/threadcrash.c
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/threadcrash.c	31 Oct 2006 17:54:38 -0000
 @@ -0,0 +1,301 @@
 +/*
 + * The point of this program is to crash in a multi-threaded app.
@@ -312,10 +306,12 @@ new file mode 100644
 +   
 +   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
+Index: ./gdb/testsuite/gdb.threads/threadcrash.exp
+===================================================================
+RCS file: gdb/testsuite/gdb.threads/threadcrash.exp
+diff -N gdb/testsuite/gdb.threads/threadcrash.exp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/threadcrash.exp	31 Oct 2006 17:54:38 -0000
 @@ -0,0 +1,37 @@
 +# threadcrash.exp - The point of this program is to crash in a multi-threaded app.
 +
@@ -323,7 +319,7 @@ new file mode 100644
 +set testfile threadcrash
 +set srcfile ${testfile}.c
 +set shellfile ${srcdir}/${subdir}/${testfile}.sh
-+set binfile [standard_output_file ${testfile}]
++set binfile ${objdir}/${subdir}/${testfile}
 +
 +set GDB_abs ${GDB}
 +if [regexp "^\[^/\]" ${GDB_abs}] {
@@ -341,7 +337,7 @@ new file mode 100644
 +}
 +
 +# ${shellfile} argument must not contain any directories.
-+set fd [open "|bash ${shellfile} ${binfile} $GDB $INTERNAL_GDBFLAGS $GDBFLAGS [host_info gdb_opts]" r]
++set fd [open "|bash ${shellfile} ${binfile} $GDB -nw $GDBFLAGS" r]
 +while { [gets $fd line] >= 0 } {
 +    if [regexp " PASS: (.*)$" $line trash message] {
 +	pass $message
@@ -354,10 +350,12 @@ new file mode 100644
 +}
 +
 +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
+Index: ./gdb/testsuite/gdb.threads/threadcrash.sh
+===================================================================
+RCS file: gdb/testsuite/gdb.threads/threadcrash.sh
+diff -N gdb/testsuite/gdb.threads/threadcrash.sh
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/threadcrash.sh	31 Oct 2006 17:54:38 -0000
 @@ -0,0 +1,324 @@
 +#! /bin/bash
 +
@@ -482,7 +480,7 @@ new file mode 100644
 +    local FAILURES=0
 +    
 +    mustNotHave '??' || ((FAILURES++))
-+    mustHaveCorrectAmount 11 threadcrash.c: || ((FAILURES++))
++    mustHaveCorrectAmount 12 threadcrash.c: || ((FAILURES++))
 +    
 +    mustHaveSevenThreads || ((FAILURES++))
 +    mustHaveSequence sleep "makeSyscall (ignored=" || ((FAILURES++))
@@ -683,10 +681,12 @@ new file mode 100644
 +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
+Index: ./gdb/testsuite/gdb.threads/threadcrash.sh-orig
+===================================================================
+RCS file: gdb/testsuite/gdb.threads/threadcrash.sh-orig
+diff -N gdb/testsuite/gdb.threads/threadcrash.sh-orig
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/threadcrash.sh-orig	31 Oct 2006 17:54:38 -0000
 @@ -0,0 +1,248 @@
 +#! /bin/bash
 +

gdb-6.5-bz109921-DW_AT_decl_file-test.patch

@@ -1,11 +1,3 @@
-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:
@@ -24,10 +16,8 @@ http://sourceware.org/ml/gdb-patches/2007-01/msg00434.html
 	* 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
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.dwarf2/dw2-included.c	2 Jan 2007 00:20:27 -0000
 @@ -0,0 +1,26 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -55,10 +45,8 @@ new file mode 100644
 +{
 +  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
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.dwarf2/dw2-included.exp	2 Jan 2007 00:20:27 -0000
 @@ -0,0 +1,47 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
@@ -91,7 +79,7 @@ new file mode 100644
 +
 +set testfile "dw2-included"
 +set srcfile ${testfile}.c
-+set binfile [standard_output_file ${testfile}]
++set binfile ${objdir}/${subdir}/${testfile}
 +
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    return -1
@@ -106,11 +94,9 @@ new file mode 100644
 +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
++gdb_test "info variables integer" "\r\nFile \[^\r\n\]*/gdb.dwarf2/dw2-included.h:\r\nint integer;\r"
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.dwarf2/dw2-included.h	2 Jan 2007 00:20:27 -0000
 @@ -0,0 +1,20 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +

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

@@ -1,11 +1,3 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Jan Kratochvil <jan.kratochvil@redhat.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
-
-;; Support TLS symbols (+`errno' suggestion if no pthread is found) (BZ 185337).
-;;=push+jan: It should be replaced by Infinity project.
-
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=185337
 
 2008-02-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
@@ -30,7 +22,6 @@ for the most common under-ggdb3 compiled programs.
 Original patch hooked into target_translate_tls_address.  But its inferior
 call invalidates `struct frame *' in the callers - RH BZ 690908.
 
-https://bugzilla.redhat.com/show_bug.cgi?id=1166549
 
 2007-11-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
@@ -41,24 +32,21 @@ glibc-debuginfo-2.7-2.x86_64: /usr/lib/debug/lib64/libc.so.6.debug:
   <81a2>     DW_AT_name        : (indirect string, offset: 0x280e): __errno_location
   <81a8>     DW_AT_MIPS_linkage_name: (indirect string, offset: 0x2808): *__GI___errno_location
 
-diff --git a/gdb/printcmd.c b/gdb/printcmd.c
 --- a/gdb/printcmd.c
 +++ b/gdb/printcmd.c
-@@ -1210,6 +1210,10 @@ print_command_1 (const char *args, int voidprint)
+@@ -967,6 +967,8 @@ print_command_1 (char *exp, int inspect, int voidprint)
  
-   if (exp != nullptr && *exp)
+   if (exp && *exp)
      {
-+      /* '*((int *(*) (void)) __errno_location) ()' is incompatible with
-+	 function descriptors.  */
-+      if (target_has_execution && strcmp (exp, "errno") == 0)
-+	exp = "*(*(int *(*)(void)) __errno_location) ()";
-       expression_up expr = parse_expression (exp);
-       val = evaluate_expression (expr.get ());
-     }
-diff --git a/gdb/testsuite/gdb.dwarf2/dw2-errno.c b/gdb/testsuite/gdb.dwarf2/dw2-errno.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/dw2-errno.c
++      if (strcmp (exp, "errno") == 0)
++	exp = "*((int *(*) (void)) __errno_location) ()";
+       expr = parse_expression (exp);
+       old_chain = make_cleanup (free_current_contents, &expr);
+       cleanup = 1;
+Index: gdb-7.2/gdb/testsuite/gdb.dwarf2/dw2-errno.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.2/gdb/testsuite/gdb.dwarf2/dw2-errno.c	2011-03-29 10:55:35.000000000 +0200
 @@ -0,0 +1,28 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -88,10 +76,10 @@ new file mode 100644
 +
 +  return 0;	/* breakpoint */
 +}
-diff --git a/gdb/testsuite/gdb.dwarf2/dw2-errno.exp b/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
+Index: gdb-7.2/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.2/gdb/testsuite/gdb.dwarf2/dw2-errno.exp	2011-03-29 10:55:35.000000000 +0200
 @@ -0,0 +1,60 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -110,7 +98,7 @@ new file mode 100644
 +
 +set testfile dw2-errno
 +set srcfile ${testfile}.c
-+set binfile [standard_output_file ${testfile}]
++set binfile ${objdir}/${subdir}/${testfile}
 +
 +proc prep {} {
 +    global srcdir subdir binfile
@@ -153,112 +141,3 @@ new file mode 100644
 +
 +# TODO: Test the error on resolving ERRNO with only libc loaded.
 +# Just how to find the current libc filename?
-diff --git a/gdb/testsuite/gdb.dwarf2/dw2-errno2.c b/gdb/testsuite/gdb.dwarf2/dw2-errno2.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/dw2-errno2.c
-@@ -0,0 +1,28 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2005, 2007 Free Software Foundation, Inc.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+   Please email any bugs, comments, and/or additions to this file to:
-+   bug-gdb@prep.ai.mit.edu  */
-+
-+#include <errno.h>
-+
-+int main()
-+{
-+  errno = 42;
-+
-+  return 0;	/* breakpoint */
-+}
-diff --git a/gdb/testsuite/gdb.dwarf2/dw2-errno2.exp b/gdb/testsuite/gdb.dwarf2/dw2-errno2.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/dw2-errno2.exp
-@@ -0,0 +1,71 @@
-+# Copyright 2007 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+set testfile dw2-errno2
-+set srcfile ${testfile}.c
-+set binfile [standard_output_file ${testfile}]
-+
-+proc prep { message {do_xfail 0} } { with_test_prefix $message {
-+    global srcdir subdir binfile variant
-+    gdb_exit
-+    gdb_start
-+    gdb_reinitialize_dir $srcdir/$subdir
-+    gdb_load ${binfile}${variant}
-+
-+    runto_main
-+
-+    gdb_breakpoint [gdb_get_line_number "breakpoint"]
-+    gdb_continue_to_breakpoint "breakpoint"
-+
-+    gdb_test "gcore ${binfile}${variant}.core" "\r\nSaved corefile .*" "gcore $variant"
-+
-+    gdb_test "print errno" ".* = 42"
-+
-+    gdb_test "kill" ".*" "kill" {Kill the program being debugged\? \(y or n\) } "y"
-+    gdb_test "core-file ${binfile}${variant}.core" "\r\nCore was generated by .*" "core-file"
-+    if $do_xfail {
-+	setup_xfail "*-*-*"
-+    }
-+    gdb_test "print (int) errno" ".* = 42" "print errno for core"
-+}}
-+
-+set variant g2thrN
-+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}${variant}" executable "additional_flags=-g2"] != "" } {
-+    untested "Couldn't compile test program"
-+    return -1
-+}
-+prep "macros=N threads=N" 1
-+
-+set variant g3thrN
-+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}${variant}" executable "additional_flags=-g3"] != "" } {
-+    untested "Couldn't compile test program"
-+    return -1
-+}
-+prep "macros=Y threads=N" 1
-+
-+set variant g2thrY
-+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}${variant}" executable "additional_flags=-g2"] != "" } {
-+    return -1
-+}
-+prep "macros=N threads=Y"
-+
-+set variant g3thrY
-+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}${variant}" executable "additional_flags=-g3"] != "" } {
-+    return -1
-+}
-+prep "macros=Y threads=Y" 1
-+
-+# TODO: Test the error on resolving ERRNO with only libc loaded.
-+# Just how to find the current libc filename?

gdb-6.5-bz190810-gdbserver-arch-advice.patch

@@ -0,0 +1,28 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=190810
+
+
+2006-09-26  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* remote.c (remote_wait): Suggestion on crash due to nonmatching target.
+	(remote_async_wait): Likewise.
+
+
+Index: gdb-6.8.50.20090818/gdb/remote.c
+===================================================================
+--- gdb-6.8.50.20090818.orig/gdb/remote.c	2009-08-18 21:00:35.000000000 +0200
++++ gdb-6.8.50.20090818/gdb/remote.c	2009-08-18 21:04:46.000000000 +0200
+@@ -4408,8 +4408,13 @@ Packet: '%s'\n"),
+ 	      VEC_safe_push (cached_reg_t, event->regcache, &cached_reg);
+ 	    }
+ 
++	  /* It may also occur on amd64 which defaults to 32-bit i386
++	     target.  gdbserver(1) is not aware of the `set architecture'
++	     name itself as it is not using libbfd.  */
+ 	  if (*p != ';')
+-	    error (_("Remote register badly formatted: %s\nhere: %s"),
++	    error (_("Remote register badly formatted: %s\nhere: %s"
++		     "\nTry to load the executable by `file' first,"
++		     "\nyou may also check `set/show architecture'."),
+ 		   buf, p);
+ 	  ++p;
+ 	}

gdb-6.5-bz203661-emit-relocs.patch

@@ -0,0 +1,17 @@
+Index: gdb-7.0.90.20100306/gdb/symfile.c
+===================================================================
+--- gdb-7.0.90.20100306.orig/gdb/symfile.c	2010-03-06 23:20:35.000000000 +0100
++++ gdb-7.0.90.20100306/gdb/symfile.c	2010-03-06 23:26:25.000000000 +0100
+@@ -3642,6 +3642,12 @@ default_symfile_relocate (struct objfile
+ {
+   bfd *abfd = objfile->obfd;
+ 
++  /* Executable files have all the relocations already resolved.
++   * Handle files linked with --emit-relocs.
++   * http://sources.redhat.com/ml/gdb/2006-08/msg00137.html  */
++  if ((abfd->flags & EXEC_P) != 0)
++    return NULL;
++
+   /* We're only interested in sections with relocation
+      information.  */
+   if ((sectp->flags & SEC_RELOC) == 0)

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

@@ -0,0 +1,450 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=216711
+
+FIXME: This workaround should be dropped and
+glibc/sysdeps/unix/sysv/linux/x86_64/clone.S should get CFI for the child
+instead.
+
+2006-12-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb/amd64-linux-tdep.c (linux_clone_code): New variable.
+	(LINUX_CLONE_LEN): New definition.
+	(amd64_linux_clone_running, amd64_linux_outermost_frame): New function.
+	(amd64_linux_init_abi): Initialize `outermost_frame_p'.
+	* gdb/i386-tdep.c (i386_gdbarch_init): Likewise.
+	* gdb/i386-tdep.h (gdbarch_tdep): Add `outermost_frame_p' member.
+	* gdb/amd64-tdep.c (amd64_frame_this_id): Call `outermost_frame_p'.
+
+2006-12-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.threads/bt-clone-stop.exp, gdb.threads/bt-clone-stop.c:
+	New file.
+
+2007-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7.
+
+Index: gdb-7.4.50.20120120/gdb/amd64-linux-tdep.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/amd64-linux-tdep.c	2012-03-02 22:15:48.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/amd64-linux-tdep.c	2012-03-02 22:16:13.526569163 +0100
+@@ -268,6 +268,80 @@ amd64_linux_register_reggroup_p (struct
+ 
+ /* Set the program counter for process PTID to PC.  */
+ 
++/* Detect the outermost frame; during unwind of
++   	#5  0x000000305cec68c3 in clone () from /lib64/tls/libc.so.6
++   avoid the additional bogus frame
++   	#6  0x0000000000000000 in ??
++   We compare if the `linux_clone_code' block is _before_ unwound PC.  */
++
++static const unsigned char linux_clone_code[] =
++{
++/* libc/sysdeps/unix/sysv/linux/x86_64/clone.S */
++/* #ifdef RESET_PID */
++/* ... */
++/* 	mov	$SYS_ify(getpid), %eax */
++/* 0xb8, 0x27, 0x00, 0x00, 0x00 */
++/* OR */
++/* 	mov	$SYS_ify(getpid), %rax */
++/* 0x48, 0xc7, 0xc0, 0x27, 0x00, 0x00, 0x00 */
++/* so just: */
++  0x27, 0x00, 0x00, 0x00,
++/* 	syscall */
++  0x0f, 0x05,
++/* 	movl	%eax, %fs:PID */
++  0x64, 0x89, 0x04, 0x25, 0x94, 0x00, 0x00, 0x00,
++/* 	movl	%eax, %fs:TID */
++  0x64, 0x89, 0x04, 0x25, 0x90, 0x00, 0x00, 0x00,
++/* #endif */
++/* 	|* Set up arguments for the function call.  *| */
++/* 	popq	%rax		|* Function to call.  *| */
++  0x58,
++/* 	popq	%rdi		|* Argument.  *| */
++  0x5f,
++/* 	call	*%rax$   */
++  0xff, 0xd0
++};
++
++#define LINUX_CLONE_LEN (sizeof linux_clone_code)
++
++static int
++amd64_linux_clone_running (struct frame_info *this_frame)
++{
++  CORE_ADDR pc = get_frame_pc (this_frame);
++  unsigned char buf[LINUX_CLONE_LEN];
++
++  if (!safe_frame_unwind_memory (this_frame, pc - LINUX_CLONE_LEN, buf,
++				 LINUX_CLONE_LEN))
++    return 0;
++
++  if (memcmp (buf, linux_clone_code, LINUX_CLONE_LEN) != 0)
++    return 0;
++
++  return 1;
++}
++
++static int
++amd64_linux_outermost_frame (struct frame_info *this_frame)
++{
++  CORE_ADDR pc = get_frame_pc (this_frame);
++  char *name;
++
++  find_pc_partial_function (pc, &name, NULL, NULL);
++
++  /* If we have NAME, we can optimize the search.
++     `clone' NAME still needs to have the code checked as its name may be
++     present in the user code.
++     `__clone' NAME should not be present in the user code but in the initial
++     parts of the `__clone' implementation the unwind still makes sense.
++     More detailed unwinding decision would be too much sensitive to possible
++     subtle changes in specific glibc revisions.  */
++  if (name == NULL || strcmp (name, "clone") == 0
++      || strcmp ("__clone", name) == 0)
++    return (amd64_linux_clone_running (this_frame) != 0);
++
++  return 0;
++}
++
+ static void
+ amd64_linux_write_pc (struct regcache *regcache, CORE_ADDR pc)
+ {
+@@ -1321,6 +1395,8 @@ amd64_linux_init_abi (struct gdbarch_inf
+ 
+   tdep->xsave_xcr0_offset = I386_LINUX_XSAVE_XCR0_OFFSET;
+ 
++  tdep->outermost_frame_p = amd64_linux_outermost_frame;
++
+   /* GNU/Linux uses SVR4-style shared libraries.  */
+   set_solib_svr4_fetch_link_map_offsets
+     (gdbarch, svr4_lp64_fetch_link_map_offsets);
+Index: gdb-7.4.50.20120120/gdb/amd64-tdep.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/amd64-tdep.c	2012-01-04 09:16:56.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/amd64-tdep.c	2012-03-02 22:17:39.133287571 +0100
+@@ -2108,6 +2108,7 @@ amd64_frame_unwind_stop_reason (struct f
+ {
+   struct amd64_frame_cache *cache =
+     amd64_frame_cache (this_frame, this_cache);
++  struct gdbarch_tdep *tdep = gdbarch_tdep (get_frame_arch (this_frame));
+ 
+   if (!cache->base_p)
+     return UNWIND_UNAVAILABLE;
+@@ -2116,6 +2117,10 @@ amd64_frame_unwind_stop_reason (struct f
+   if (cache->base == 0)
+     return UNWIND_OUTERMOST;
+ 
++  /* Detect OS dependent outermost frames; such as `clone'.  */
++  if (tdep->outermost_frame_p && tdep->outermost_frame_p (this_frame))
++    return UNWIND_OUTERMOST;
++
+   return UNWIND_NO_REASON;
+ }
+ 
+@@ -2125,6 +2130,7 @@ amd64_frame_this_id (struct frame_info *
+ {
+   struct amd64_frame_cache *cache =
+     amd64_frame_cache (this_frame, this_cache);
++  struct gdbarch_tdep *tdep = gdbarch_tdep (get_frame_arch (this_frame));
+ 
+   if (!cache->base_p)
+     return;
+@@ -2133,6 +2139,10 @@ amd64_frame_this_id (struct frame_info *
+   if (cache->base == 0)
+     return;
+ 
++  /* Detect OS dependent outermost frames; such as `clone'.  */
++  if (tdep->outermost_frame_p && tdep->outermost_frame_p (this_frame))
++    return;
++
+   (*this_id) = frame_id_build (cache->base + 16, cache->pc);
+ }
+ 
+Index: gdb-7.4.50.20120120/gdb/i386-tdep.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/i386-tdep.c	2012-03-02 22:15:48.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/i386-tdep.c	2012-03-02 22:16:13.528569157 +0100
+@@ -7613,6 +7613,9 @@ i386_gdbarch_init (struct gdbarch_info i
+ 
+   tdep->xsave_xcr0_offset = -1;
+ 
++  /* Unwinding stops on i386 automatically.  */
++  tdep->outermost_frame_p = NULL;
++
+   tdep->record_regmap = i386_record_regmap;
+ 
+   set_gdbarch_long_long_align_bit (gdbarch, 32);
+Index: gdb-7.4.50.20120120/gdb/i386-tdep.h
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/i386-tdep.h	2012-03-02 22:15:48.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/i386-tdep.h	2012-03-02 22:16:13.529569154 +0100
+@@ -219,6 +219,9 @@ struct gdbarch_tdep
+   int (*i386_sysenter_record) (struct regcache *regcache);
+   /* Parse syscall args.  */
+   int (*i386_syscall_record) (struct regcache *regcache);
++
++  /* Detect OS dependent outermost frames; such as `clone'.  */
++  int (*outermost_frame_p) (struct frame_info *this_frame);
+ };
+ 
+ /* Floating-point registers.  */
+Index: gdb-7.4.50.20120120/gdb/ia64-tdep.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/ia64-tdep.c	2012-03-02 22:15:48.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/ia64-tdep.c	2012-03-02 22:16:13.529569154 +0100
+@@ -2181,6 +2181,138 @@ static const struct frame_unwind ia64_fr
+   default_frame_sniffer
+ };
+ 
++/* Detect the outermost frame; during unwind of
++   	#6  0x2000000000347100 in __clone2 () from /lib/libc.so.6.1
++   avoid the additional bogus frame
++   	#7  0x0000000000000000 in ?? ()  */
++
++static char linux_clone2_code[] =
++{
++/* libc/sysdeps/unix/sysv/linux/ia64/clone2.S */
++  0x09, 0x00, 0x20, 0x12, 0x90, 0x11, 0x00, 0x40,
++  0x28, 0x20, 0x23, 0x00, 0x00, 0x00, 0x04, 0x00,
++/*         st4 [r9]=r8 */
++/*         st4 [r10]=r8 */
++/*         ;; */
++/* #endif */
++  0x02, 0x50, 0x21, 0x40, 0x18, 0x14, 0x90, 0x02,
++  0x90, 0x00, 0x42, 0x00, 0x00, 0x00, 0x04, 0x00,
++/* 1:      ld8 out1=[in0],8        |* Retrieve code pointer.       *| */
++/*         mov out0=in4            |* Pass proper argument to fn *| */
++/*         ;; */
++  0x11, 0x08, 0x00, 0x40, 0x18, 0x10, 0x60, 0x50,
++  0x05, 0x80, 0x03, 0x00, 0x68, 0x00, 0x80, 0x12,
++/*         ld8 gp=[in0]            |* Load function gp.            *| */
++/*         mov b6=out1 */
++/*         br.call.dptk.many rp=b6 |* Call fn(arg) in the child    *| */
++/*         ;; */
++  0x10, 0x48, 0x01, 0x10, 0x00, 0x21, 0x10, 0x00,
++  0xa0, 0x00, 0x42, 0x00, 0x98, 0xdf, 0xf7, 0x5b,
++/*         mov out0=r8             |* Argument to _exit            *| */
++/*         mov gp=loc0 */
++/*         .globl HIDDEN_JUMPTARGET(_exit) */
++/*         br.call.dpnt.many rp=HIDDEN_JUMPTARGET(_exit) */
++/*                                 |* call _exit with result from fn.      *| */
++  0x11, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
++  0x00, 0x02, 0x00, 0x80, 0x00, 0x00, 0x84, 0x00
++/*         ret                     |* Not reached.         *| */
++};
++
++#define LINUX_CLONE_PRE_SLOTS 3	/* Number of slots before PC.  */
++#define LINUX_CLONE_LEN (sizeof linux_clone2_code)
++
++static int
++ia64_linux_clone2_running (struct frame_info *this_frame)
++{
++  CORE_ADDR pc = get_frame_pc (this_frame);
++  char buf[LINUX_CLONE_LEN];
++  struct minimal_symbol *minsym;
++  long long instr;
++
++  if (!safe_frame_unwind_memory (this_frame, pc - LINUX_CLONE_PRE_SLOTS * 16,
++				 buf, LINUX_CLONE_LEN))
++    return 0;
++
++  if (memcmp (buf, linux_clone2_code, LINUX_CLONE_PRE_SLOTS * 16) != 0)
++    return 0;
++
++  /* Adjust the expected "_exit" address.  */
++  minsym = lookup_minimal_symbol_text ("_exit", NULL);
++  if (minsym == NULL)
++    return 0;
++
++  instr = slotN_contents (&linux_clone2_code[LINUX_CLONE_PRE_SLOTS * 16], 2);
++  instr &= ~(((1L << 20) - 1) << 13);
++  /* Address is relative to the jump instruction slot, not the next one.  */
++  instr |= (((SYMBOL_VALUE_ADDRESS (minsym) - (pc & ~0xfL)) >> 4)
++	    & ((1L << 20) - 1)) << 13;
++  replace_slotN_contents (&linux_clone2_code[LINUX_CLONE_PRE_SLOTS * 16], instr,
++			  2);
++
++  if (memcmp (&buf[LINUX_CLONE_PRE_SLOTS * 16],
++              &linux_clone2_code[LINUX_CLONE_PRE_SLOTS * 16],
++	      LINUX_CLONE_LEN - (LINUX_CLONE_PRE_SLOTS * 16)) != 0)
++    return 0;
++
++  return 1;
++}
++
++static int
++ia64_outermost_frame (struct frame_info *this_frame)
++{
++  CORE_ADDR pc = get_frame_pc (this_frame);
++  char *name;
++
++  find_pc_partial_function (pc, &name, NULL, NULL);
++
++  /* If we have NAME, we can optimize the search.
++     `clone' NAME still needs to have the code checked as its name may be
++     present in the user code.
++     `__clone' NAME should not be present in the user code but in the initial
++     parts of the `__clone' implementation the unwind still makes sense.
++     More detailed unwinding decision would be too much sensitive to possible
++     subtle changes in specific glibc revisions.  */
++  if (name == NULL || strcmp (name, "clone2") == 0
++      || strcmp ("__clone2", name) == 0)
++    return (ia64_linux_clone2_running (this_frame) != 0);
++
++  return 0;
++}
++
++static void
++ia64_clone2_frame_this_id (struct frame_info *this_frame, void **this_cache,
++			   struct frame_id *this_id)
++{
++  /* Leave the default outermost frame at *THIS_ID.  */
++}
++
++static struct value *
++ia64_clone2_frame_prev_register (struct frame_info *this_frame,
++				 void **this_cache, int regnum)
++{
++  return frame_unwind_got_register (this_frame, regnum, regnum);
++}
++
++static int
++ia64_clone2_frame_sniffer (const struct frame_unwind *self,
++			   struct frame_info *this_frame,
++			   void **this_prologue_cache)
++{
++  if (ia64_outermost_frame (this_frame))
++    return 1;
++
++  return 0;
++}
++
++static const struct frame_unwind ia64_clone2_frame_unwind =
++{
++  NORMAL_FRAME,
++  &ia64_clone2_frame_this_id,
++  &ia64_clone2_frame_prev_register,
++  NULL,
++  &ia64_clone2_frame_sniffer
++};
++
+ /* Signal trampolines.  */
+ 
+ static void
+@@ -4153,6 +4285,7 @@ ia64_gdbarch_init (struct gdbarch_info i
+   set_gdbarch_dummy_id (gdbarch, ia64_dummy_id);
+ 
+   set_gdbarch_unwind_pc (gdbarch, ia64_unwind_pc);
++  frame_unwind_append_unwinder (gdbarch, &ia64_clone2_frame_unwind);
+ #ifdef HAVE_LIBUNWIND_IA64_H
+   frame_unwind_append_unwinder (gdbarch,
+                                 &ia64_libunwind_sigtramp_frame_unwind);
+Index: gdb-7.4.50.20120120/gdb/testsuite/gdb.threads/bt-clone-stop.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.4.50.20120120/gdb/testsuite/gdb.threads/bt-clone-stop.c	2012-03-02 22:16:13.530569151 +0100
+@@ -0,0 +1,39 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2006 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++ 
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++   MA 02110-1301, USA.  */
++
++
++#include <pthread.h>
++#include <unistd.h>
++#include <assert.h>
++
++
++void *threader (void *arg)
++{
++	assert (0);
++	return NULL;
++}
++
++int main (void)
++{
++	pthread_t t1;
++
++	pthread_create (&t1, NULL, threader, (void *) NULL);
++	for (;;)
++		pause();
++}
+Index: gdb-7.4.50.20120120/gdb/testsuite/gdb.threads/bt-clone-stop.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.4.50.20120120/gdb/testsuite/gdb.threads/bt-clone-stop.exp	2012-03-02 22:16:13.530569151 +0100
+@@ -0,0 +1,61 @@
++# Copyright 2006 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++# 
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++# 
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
++
++# Backtraced `clone' must not have `PC == 0' as its previous frame.
++
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set testfile bt-clone-stop
++set srcfile ${testfile}.c
++set binfile ${objdir}/${subdir}/${testfile}
++if  { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++
++# Get things started.
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++# threader: threader.c:8: threader: Assertion `0' failed.
++# Program received signal SIGABRT, Aborted.
++
++gdb_test "run" \
++     "Program received signal SIGABRT.*" \
++     "run"
++
++# Former gdb unwind (the first function is `clone'):
++# #5  0x0000003421ecd62d in ?? () from /lib64/libc.so.6
++# #6  0x0000000000000000 in ?? ()
++# (gdb)
++# Tested `amd64_linux_outermost_frame' functionality should omit the line `#6'.
++# 
++# Two `-re' cases below must be in this order (1st is a subset of the 2nd one).
++# Unhandled case below should not happen and it is fortunately handled by
++# `amd64_linux_outermost_frame' as FAIL (and result `0x0 entry output invalid').
++gdb_test_multiple "bt" "0x0 entry output invalid" {
++    -re "in threader \\(.*\n#\[0-9\]* *0x0* in .*$gdb_prompt $" {
++    	fail "0x0 entry found"
++    }
++    -re "in threader \\(.*$gdb_prompt $" {
++    	pass "0x0 entry not found"
++    }
++}

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

@@ -1,50 +1,8 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
-
-;; Test sideeffects of skipping ppc .so libs trampolines (BZ 218379).
-;;=fedoratest
-
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
 
-diff --git a/gdb/testsuite/gdb.base/step-over-trampoline.c b/gdb/testsuite/gdb.base/step-over-trampoline.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/step-over-trampoline.c
-@@ -0,0 +1,28 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2006 Free Software Foundation, Inc.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+ 
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+   Please email any bugs, comments, and/or additions to this file to:
-+   bug-gdb@prep.ai.mit.edu  */
-+
-+#include <stdio.h>
-+
-+int main (void)
-+{
-+	puts ("hello world");
-+	return 0;
-+}
-diff --git a/gdb/testsuite/gdb.base/step-over-trampoline.exp b/gdb/testsuite/gdb.base/step-over-trampoline.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/step-over-trampoline.exp
+
+--- /dev/null	2006-12-17 14:18:21.881669220 -0500
++++ gdb-6.5/gdb/testsuite/gdb.base/step-over-trampoline.exp	2006-12-17 16:52:51.000000000 -0500
 @@ -0,0 +1,54 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
@@ -68,7 +26,7 @@ new file mode 100644
 +
 +set testfile step-over-trampoline
 +set srcfile ${testfile}.c
-+set binfile [standard_output_file ${testfile}]
++set binfile ${objdir}/${subdir}/${testfile}
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1
@@ -100,3 +58,34 @@ new file mode 100644
 +		fail "stepped into trampoline"
 +	}
 +}
+--- /dev/null	2006-12-17 14:18:21.881669220 -0500
++++ gdb-6.5/gdb/testsuite/gdb.base/step-over-trampoline.c	2006-12-17 16:18:12.000000000 -0500
+@@ -0,0 +1,28 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2006 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++ 
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++   Please email any bugs, comments, and/or additions to this file to:
++   bug-gdb@prep.ai.mit.edu  */
++
++#include <stdio.h>
++
++int main (void)
++{
++	puts ("hello world");
++	return 0;
++}

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

@@ -1,27 +1,21 @@
-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 ()); */
+
+Index: gdb-7.2.50.20110117/gdb/symtab.c
+===================================================================
+--- gdb-7.2.50.20110117.orig/gdb/symtab.c	2011-01-17 15:47:37.000000000 +0100
++++ gdb-7.2.50.20110117/gdb/symtab.c	2011-01-17 15:51:48.000000000 +0100
+@@ -2015,6 +2015,13 @@ find_pc_sect_line (CORE_ADDR pc, struct 
+ 	     SYMBOL_LINKAGE_NAME (msymbol)); */
  	  ;
  	/* 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));
++	else if (SYMBOL_VALUE (mfunsym) == pc)
++	  warning ("In stub for %s (0x%s); interlocked, please submit the binary to http://bugzilla.redhat.com", SYMBOL_LINKAGE_NAME (msymbol), paddress (target_gdbarch, pc));
 +	/* fall through */
  	else
- 	  {
- 	    /* Detect an obvious case of infinite recursion.  If this
+ 	  return find_pc_line (SYMBOL_VALUE_ADDRESS (mfunsym), 0);
+       }

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

@@ -1,15 +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
-Subject: gdb-6.5-bz243845-stale-testing-zombie-test.patch
-
-;; Test leftover zombie process (BZ 243845).
-;;=fedoratest
-
-diff --git a/gdb/testsuite/gdb.base/tracefork-zombie.exp b/gdb/testsuite/gdb.base/tracefork-zombie.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/tracefork-zombie.exp
+diff -u -ruNp gdb-6.3-unpatched/gdb/testsuite/gdb.base/tracefork-zombie.exp gdb-6.3/gdb/testsuite/gdb.base/tracefork-zombie.exp
+--- gdb-6.3-unpatched/gdb/testsuite/gdb.base/tracefork-zombie.exp	1969-12-31 19:00:00.000000000 -0500
++++ gdb-6.3/gdb/testsuite/gdb.base/tracefork-zombie.exp	2007-07-31 13:04:12.000000000 -0400
 @@ -0,0 +1,75 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +

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

@@ -1,15 +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
-Subject: gdb-6.5-gcore-buffer-limit-test.patch
-
-;; Test gcore memory and time requirements for large inferiors.
-;;=fedoratest
-
-diff --git a/gdb/testsuite/gdb.base/gcore-excessive-memory.c b/gdb/testsuite/gdb.base/gcore-excessive-memory.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gcore-excessive-memory.c
+diff -u -X /home/jkratoch/.diffi.list -ruNp gdb-6.5/gdb/testsuite/gdb.base/gcore-excessive-memory.c gdb-6.5-unknown/gdb/testsuite/gdb.base/gcore-excessive-memory.c
+--- gdb-6.5/gdb/testsuite/gdb.base/gcore-excessive-memory.c	1970-01-01 01:00:00.000000000 +0100
++++ gdb-6.5-unknown/gdb/testsuite/gdb.base/gcore-excessive-memory.c	2008-01-08 11:25:45.000000000 +0100
 @@ -0,0 +1,37 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -48,10 +39,9 @@ new file mode 100644
 +
 +  return 0;
 +}
-diff --git a/gdb/testsuite/gdb.base/gcore-excessive-memory.exp b/gdb/testsuite/gdb.base/gcore-excessive-memory.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gcore-excessive-memory.exp
+diff -u -X /home/jkratoch/.diffi.list -ruNp gdb-6.5/gdb/testsuite/gdb.base/gcore-excessive-memory.exp gdb-6.5-unknown/gdb/testsuite/gdb.base/gcore-excessive-memory.exp
+--- gdb-6.5/gdb/testsuite/gdb.base/gcore-excessive-memory.exp	1970-01-01 01:00:00.000000000 +0100
++++ gdb-6.5-unknown/gdb/testsuite/gdb.base/gcore-excessive-memory.exp	2008-01-08 11:47:32.000000000 +0100
 @@ -0,0 +1,94 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -71,9 +61,9 @@ new file mode 100644
 +
 +set testfile gcore-excessive-memory
 +set srcfile ${testfile}.c
-+set shfile [standard_output_file ${testfile}-gdb.sh]
-+set corefile [standard_output_file ${testfile}.core]
-+set binfile [standard_output_file ${testfile}]
++set shfile ${objdir}/${subdir}/${testfile}-gdb.sh
++set corefile ${objdir}/${subdir}/${testfile}.core
++set binfile ${objdir}/${subdir}/${testfile}
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1

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

@@ -1,15 +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
-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
+diff -u -rup gdb-6.3-orig/gdb/testsuite/gdb.base/unwind-leak.c gdb-6.3/gdb/testsuite/gdb.base/unwind-leak.c
+--- gdb-6.3-orig/gdb/testsuite/gdb.base/unwind-leak.c	2007-12-19 15:12:55.000000000 -0500
++++ gdb-6.3/gdb/testsuite/gdb.base/unwind-leak.c	2007-12-19 13:55:22.000000000 -0500
 @@ -0,0 +1,29 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -40,10 +31,9 @@ new file mode 100644
 +    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
+diff -u -rup gdb-6.3-orig/gdb/testsuite/gdb.base/unwind-leak.exp gdb-6.3/gdb/testsuite/gdb.base/unwind-leak.exp
+--- gdb-6.3-orig/gdb/testsuite/gdb.base/unwind-leak.exp	2007-12-19 15:12:53.000000000 -0500
++++ gdb-6.3/gdb/testsuite/gdb.base/unwind-leak.exp	2007-12-19 15:11:35.000000000 -0500
 @@ -0,0 +1,83 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -63,8 +53,8 @@ new file mode 100644
 +
 +set testfile unwind-leak
 +set srcfile ${testfile}.c
-+set shfile [standard_output_file ${testfile}-gdb.sh]
-+set binfile [standard_output_file ${testfile}]
++set shfile ${objdir}/${subdir}/${testfile}-gdb.sh
++set binfile ${objdir}/${subdir}/${testfile}
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1

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

@@ -1,15 +1,9 @@
-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
+Index: ./gdb/testsuite/gdb.base/largecore-last-address-lock.exp
+===================================================================
+RCS file: ./gdb/testsuite/gdb.base/largecore-last-address-lock.exp
+diff -N ./gdb/testsuite/gdb.base/largecore-last-address-lock.exp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.base/largecore-last-address-lock.exp	15 Nov 2006 21:43:24 -0000
 @@ -0,0 +1,49 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +

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

@@ -1,18 +1,55 @@
-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
+--- /dev/null	2007-12-14 20:45:09.113039517 +0100
++++ gdb-6.5/gdb/testsuite/gdb.base/watchpoint-during-step.exp	2007-12-24 19:42:00.000000000 +0100
+@@ -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 ${objdir}/${subdir}/${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"
+--- /dev/null	2007-12-14 20:45:09.113039517 +0100
++++ gdb-6.5/gdb/testsuite/gdb.base/watchpoint-during-step.c	2007-12-24 19:38:10.000000000 +0100
 @@ -0,0 +1,30 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -44,52 +81,3 @@ new file mode 100644
 +  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,18 +1,13 @@
-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 @@
+
+Index: ./gdb/testsuite/gdb.base/readline-overflow.exp
+===================================================================
+RCS file: ./gdb/testsuite/gdb.base/readline-overflow.exp
+diff -N ./gdb/testsuite/gdb.base/readline-overflow.exp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.base/readline-overflow.exp	13 Nov 2006 23:42:50 -0000
+@@ -0,0 +1,125 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -44,76 +39,98 @@ new file mode 100644
 +  strace $tracelevel
 +}
 +
++# Don't let a .inputrc file or an existing setting of INPUTRC mess up
++# the test results.  Even if /dev/null doesn't exist on the particular
++# platform, the readline library will use the default setting just by
++# failing to open the file.  OTOH, opening /dev/null successfully will
++# also result in the default settings being used since nothing will be
++# read from this file.
 +global env
++if [info exists env(INPUTRC)] {
++    set old_inputrc $env(INPUTRC)
++}
++set env(INPUTRC) "/dev/null"
 +
-+save_vars { env(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
++set oldtimeout1 $timeout
++set timeout 600
 +
-+    # 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"
++if [info exists env(GDBHISTFILE)] {
++    set old_gdbhistfile $env(GDBHISTFILE)
++}
++if [info exists env(HISTSIZE)] {
++    set old_histsize $env(HISTSIZE)
++}
++set env(GDBHISTFILE) "${srcdir}/${subdir}/gdb_history"
++set env(HISTSIZE) "10"
 +
-+    set timeout 600
-+
-+    set env(GDBHISTFILE) "${srcdir}/${subdir}/gdb_history"
-+    set env(HISTSIZE) "10"
-+
-+    gdb_exit
-+    gdb_start
-+    gdb_reinitialize_dir $srcdir/$subdir
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
 +
 +
-+    set width 11
-+    gdb_test "set width $width" \
-+	"" \
-+	"Setting width to $width."
-+    #gdb_test "set height 1" \
-+	#         "" \
-+	#         "Setting height to 1."
-+    send_gdb "run X"
-+    set i 0
-+    # It crashes using `set width 7' on `set total 3560'.
-+    # Sometimes it corrupts screen on `set width 7'.
-+    # Bugreport used `set total 130001':
-+    # 	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=214196
-+    # Check also `timeout' above.
-+    set total 4200
-+    gdb_expect {
++set width 11
++gdb_test "set width $width" \
++         "" \
++         "Setting width to $width."
++#gdb_test "set height 1" \
++#         "" \
++#         "Setting height to 1."
++send_gdb "run X"
++set i 0
++# It crashes using `set width 7' on `set total 3560'.
++# Sometimes it corrupts screen on `set width 7'.
++# Bugreport used `set total 130001':
++# 	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=214196
++# Check also `timeout' above.
++set total 4200
++gdb_expect {
 +	-re X {
-+	    incr i
-+	    if {$i <= $total} {
-+		send_gdb "X"
-+		exp_continue
-+	    }
++		incr i
++		if {$i <= $total} {
++			send_gdb "X"
++			exp_continue
++		}
 +	}
 +	-re "\[ \b\r\n\]" {
-+	    exp_continue
++		exp_continue
 +	}
 +	eof {
-+	    fail "gdb sending total $total characters"
-+	    note "Failed after sending $i characters, reason: EOF"
-+	    gdb_clear_suppressed
++		fail "gdb sending total $total characters"
++		note "Failed after sending $i characters, reason: EOF"
++		gdb_clear_suppressed
 +	}
 +	timeout {
-+	    fail "gdb sending total $total characters"
-+	    note "Failed after sending $i characters (timeout $timeout), reason: TIMEOUT"
-+	    gdb_clear_suppressed
++		fail "gdb sending total $total characters"
++		note "Failed after sending $i characters (timeout $timeout), reason: TIMEOUT"
++		gdb_clear_suppressed
 +	}
 +	default {
-+	    fail "gdb sending total $total characters"
-+	    note "Failed after sending $i characters, reason: 0=\[$expect_out(0,string)\] buffer=\[$expect_out(buffer)\]"
-+	    gdb_clear_suppressed
++		fail "gdb sending total $total characters"
++		note "Failed after sending $i characters, reason: 0=\[$expect_out(0,string)\] buffer=\[$expect_out(buffer)\]"
++		gdb_clear_suppressed
 +	}
-+    }
-+    send_gdb "\r"
-+    gdb_test "" \
-+	"No executable file specified..*" \
-+	"All the characters transferred"
 +}
++gdb_test "\r" \
++         "No executable file specified..*" \
++         "All the characters transferred"
++
++
++# Restore globals modified in this test...
++if [info exists old_inputrc] {
++    set env(INPUTRC) $old_inputrc
++} else {
++    unset env(INPUTRC)
++}
++if [info exists old_gdbhistfile] {
++    set env(GDBHISTFILE) $old_gdbhistfile
++} else {
++    unset env(GDBHISTFILE)
++}
++if [info exists old_histsize] {
++    set env(HISTSIZE) $old_histsize
++} else {
++    unset env(HISTSIZE)
++}
++set timeout $oldtimeout1
++
++return 0

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

@@ -1,15 +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
-Subject: gdb-6.5-section-num-fixup-test.patch
-
-;; Test a crash on libraries missing the .text section.
-;;=fedoratest
-
-diff --git a/gdb/testsuite/gdb.base/datalib-lib.c b/gdb/testsuite/gdb.base/datalib-lib.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/datalib-lib.c
+diff -up -ruNp gdb-6.5-orig/gdb/testsuite/gdb.base/datalib-lib.c gdb-6.5/gdb/testsuite/gdb.base/datalib-lib.c
+--- gdb-6.5-orig/gdb/testsuite/gdb.base/datalib-lib.c	1969-12-31 19:00:00.000000000 -0500
++++ gdb-6.5/gdb/testsuite/gdb.base/datalib-lib.c	2008-05-29 13:51:50.000000000 -0400
 @@ -0,0 +1,22 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -33,10 +24,9 @@ new file mode 100644
 +   bug-gdb@prep.ai.mit.edu  */
 +
 +int var;
-diff --git a/gdb/testsuite/gdb.base/datalib-main.c b/gdb/testsuite/gdb.base/datalib-main.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/datalib-main.c
+diff -up -ruNp gdb-6.5-orig/gdb/testsuite/gdb.base/datalib-main.c gdb-6.5/gdb/testsuite/gdb.base/datalib-main.c
+--- gdb-6.5-orig/gdb/testsuite/gdb.base/datalib-main.c	1969-12-31 19:00:00.000000000 -0500
++++ gdb-6.5/gdb/testsuite/gdb.base/datalib-main.c	2008-05-29 13:51:39.000000000 -0400
 @@ -0,0 +1,26 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -64,10 +54,9 @@ new file mode 100644
 +{
 +  return 0;
 +}
-diff --git a/gdb/testsuite/gdb.base/datalib.exp b/gdb/testsuite/gdb.base/datalib.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/datalib.exp
+diff -up -ruNp gdb-6.5-orig/gdb/testsuite/gdb.base/datalib.exp gdb-6.5/gdb/testsuite/gdb.base/datalib.exp
+--- gdb-6.5-orig/gdb/testsuite/gdb.base/datalib.exp	1969-12-31 19:00:00.000000000 -0500
++++ gdb-6.5/gdb/testsuite/gdb.base/datalib.exp	2008-05-29 14:58:33.000000000 -0400
 @@ -0,0 +1,51 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -88,8 +77,8 @@ new file mode 100644
 +set testfile datalib
 +set srcfilemain ${testfile}-main.c
 +set srcfilelib ${testfile}-lib.c
-+set libfile [standard_output_file ${testfile}-lib.so]
-+set binfile [standard_output_file ${testfile}-main]
++set libfile ${objdir}/${subdir}/${testfile}-lib.so
++set binfile ${objdir}/${subdir}/${testfile}-main
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfilelib}" "${libfile}" executable [list debug {additional_flags=-shared -nostdlib}]] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1

gdb-6.5-sharedlibrary-path.patch

@@ -1,21 +1,15 @@
-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
@@ -29,10 +23,10 @@ The testsuite needs `gdb-6.5-tls-of-separate-debuginfo.patch'.
 
 	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
+Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-main.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-main.c	2008-02-27 09:00:15.000000000 +0100
 @@ -0,0 +1,25 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -59,10 +53,10 @@ new file mode 100644
 +{
 +  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
+Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c	2008-02-27 09:00:15.000000000 +0100
 @@ -0,0 +1,22 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -86,11 +80,9 @@ new file mode 100644
 +   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 @@
+--- /dev/null	2009-02-10 00:19:00.494289687 +0100
++++ gdb-6.8.50.20090209-x/gdb/testsuite/gdb.threads/tls-sepdebug.exp	2009-02-10 00:49:38.000000000 +0100
+@@ -0,0 +1,86 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -115,10 +107,10 @@ new file mode 100644
 +set srcmainfile   ${testfile}-main.c
 +set srcsharedfile ${testfile}-shared.c
 +
-+set binmainfile        [standard_output_file ${testfile}-main]
++set binmainfile        ${objdir}/${subdir}/${testfile}-main
 +set binsharedbase      ${testfile}-shared.so
-+set binsharedfile      [standard_output_file ${binsharedbase}]
-+set binshareddebugfile [standard_output_file ${binsharedbase}.debug]
++set binsharedfile      ${objdir}/${subdir}/${binsharedbase}
++set binshareddebugfile ${objdir}/${subdir}/${binsharedbase}.debug
 +
 +# Use explicit -soname as otherwise the full path to the library would get
 +# encoded into ${binmainfile} making LD_LIBRARY_PATH tests useless.
@@ -152,8 +144,7 @@ new file mode 100644
 +# \$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 }  {
++foreach ld_library_path [list [pwd]/${subdir} ./${subdir}] name { absolute relative }  {
 +
 +    gdb_exit
 +    gdb_start

gdb-6.6-bfd-vdso8k.patch

@@ -0,0 +1,119 @@
+2007-09-23  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elfcode.h (NAME(_bfd_elf,bfd_from_remote_memory)): New variables
+	X_SHDR_SHSTRTAB and I_SHDR_SHSTRTAB.  Fixed the CONTENTS_SIZE trimming
+	check for its aligned size between the last segment and still before
+	the section header end.  Added variables check to cover also the
+	section header string table.
+
+--- gdb-7.4.50.20120120-orig/bfd/elfcode.h	2012-02-29 09:17:08.000000000 +0100
++++ gdb-7.4.50.20120120/bfd/elfcode.h	2012-02-29 10:23:03.000000000 +0100
+@@ -1621,6 +1621,8 @@ NAME(_bfd_elf,bfd_from_remote_memory)
+   Elf_Internal_Ehdr i_ehdr;	/* Elf file header, internal form */
+   Elf_External_Phdr *x_phdrs;
+   Elf_Internal_Phdr *i_phdrs, *last_phdr;
++  Elf_External_Shdr *x_shdrs;
++  Elf_Internal_Shdr *i_shdrs;
+   bfd *nbfd;
+   struct bfd_in_memory *bim;
+   int contents_size;
+@@ -1740,24 +1742,46 @@ NAME(_bfd_elf,bfd_from_remote_memory)
+ 
+   /* Trim the last segment so we don't bother with zeros in the last page
+      that are off the end of the file.  However, if the extra bit in that
+-     page includes the section headers, keep them.  */
+-  if ((bfd_vma) contents_size > last_phdr->p_offset + last_phdr->p_filesz
+-      && (bfd_vma) contents_size >= (i_ehdr.e_shoff
+-				     + i_ehdr.e_shnum * i_ehdr.e_shentsize))
++     page includes the section headers os the section header string table,
++     keep them.  */
++  if ((bfd_vma) contents_size > last_phdr->p_offset + last_phdr->p_filesz)
++    contents_size = last_phdr->p_offset + last_phdr->p_filesz;
++
++  if ((bfd_vma) contents_size < i_ehdr.e_shoff
++				+ i_ehdr.e_shnum * i_ehdr.e_shentsize)
++    contents_size = i_ehdr.e_shoff + i_ehdr.e_shnum * i_ehdr.e_shentsize;
++
++  /* Verify also all the sections fit into CONTENTS_SIZE.  */
++
++  x_shdrs = bfd_malloc (i_ehdr.e_shnum * (sizeof *x_shdrs + sizeof *i_shdrs));
++  if (x_shdrs == NULL)
+     {
+-      contents_size = last_phdr->p_offset + last_phdr->p_filesz;
+-      if ((bfd_vma) contents_size < (i_ehdr.e_shoff
+-				     + i_ehdr.e_shnum * i_ehdr.e_shentsize))
+-	contents_size = i_ehdr.e_shoff + i_ehdr.e_shnum * i_ehdr.e_shentsize;
++      free (x_phdrs);
++      bfd_set_error (bfd_error_no_memory);
++      return NULL;
+     }
++  err = target_read_memory (ehdr_vma + i_ehdr.e_shoff, (bfd_byte *) x_shdrs,
++			    i_ehdr.e_shnum * sizeof *x_shdrs);
++  if (err)
++    i_shdrs = NULL;
+   else
+-    contents_size = last_phdr->p_offset + last_phdr->p_filesz;
++    {
++      i_shdrs = (Elf_Internal_Shdr *) &x_shdrs[i_ehdr.e_shnum];
++      for (i = 0; i < i_ehdr.e_shnum; ++i)
++	{
++	  elf_swap_shdr_in (templ, &x_shdrs[i], &i_shdrs[i]);
++
++	  if ((bfd_vma) contents_size < i_shdrs[i].sh_offset + i_shdrs[i].sh_size)
++	    contents_size = i_shdrs[i].sh_offset + i_shdrs[i].sh_size;
++	}
++    }
+ 
+   /* Now we know the size of the whole image we want read in.  */
+   contents = (bfd_byte *) bfd_zmalloc (contents_size);
+   if (contents == NULL)
+     {
+       free (x_phdrs);
++      free (x_shdrs);
+       bfd_set_error (bfd_error_no_memory);
+       return NULL;
+     }
+@@ -1776,6 +1800,7 @@ NAME(_bfd_elf,bfd_from_remote_memory)
+ 	if (err)
+ 	  {
+ 	    free (x_phdrs);
++	    free (x_shdrs);
+ 	    free (contents);
+ 	    bfd_set_error (bfd_error_system_call);
+ 	    errno = err;
+@@ -1784,10 +1809,32 @@ NAME(_bfd_elf,bfd_from_remote_memory)
+       }
+   free (x_phdrs);
+ 
+-  /* If the segments visible in memory didn't include the section headers,
++  if (i_shdrs)
++    {
++      memcpy (contents + i_ehdr.e_shoff, x_shdrs,
++	      i_ehdr.e_shnum * sizeof *x_shdrs);
++
++      for (i = 0; i < i_ehdr.e_shnum; ++i)
++	{
++	  bfd_vma start = i_shdrs[i].sh_offset;
++	  bfd_vma end = i_shdrs[i].sh_offset + i_shdrs[i].sh_size;
++
++	  if (end > (bfd_vma) contents_size)
++	    end = contents_size;
++	  err = target_read_memory (ehdr_vma + start, contents + start,
++				    end - start);
++	  if (err)
++	    {
++	      i_shdrs = NULL;
++	      break;
++	    }
++	}
++    }
++  free (x_shdrs);
++
++  /* If the segments readable in memory didn't include the section headers,
+      then clear them from the file header.  */
+-  if ((bfd_vma) contents_size < (i_ehdr.e_shoff
+-				 + i_ehdr.e_shnum * i_ehdr.e_shentsize))
++  if (i_shdrs == NULL)
+     {
+       memset (&x_ehdr.e_shoff, 0, sizeof x_ehdr.e_shoff);
+       memset (&x_ehdr.e_shnum, 0, sizeof x_ehdr.e_shnum);

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

@@ -1,11 +1,5 @@
-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
+Subject: Re: [patch] print a more useful error message for "gdb core"
 
 [ Fixed up since the mail.  ]
 
@@ -37,13 +31,16 @@ 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.
@@ -61,19 +58,33 @@ Http://sourceware.org/ml/gdb-patches/2010-01/msg00517.html
 	* 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/>.  */
+Index: gdb-7.4.50.20111218/gdb/exceptions.h
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/exceptions.h	2011-10-09 21:21:38.000000000 +0200
++++ gdb-7.4.50.20111218/gdb/exceptions.h	2011-12-19 01:41:20.900509347 +0100
+@@ -88,6 +88,9 @@ enum errors {
+   /* DW_OP_GNU_entry_value resolving failed.  */
+   NO_ENTRY_VALUE_ERROR,
  
- #include "defs.h"
-+#include "arch-utils.h"
++  /* Attempt to load a core file as executable.  */
++  IS_CORE_ERROR,
++
+   /* Add more errors here.  */
+   NR_ERRORS
+ };
+Index: gdb-7.4.50.20111218/gdb/exec.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/exec.c	2011-03-23 19:23:54.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/exec.c	2011-12-19 01:41:04.863568846 +0100
+@@ -35,6 +35,7 @@
+ #include "arch-utils.h"
+ #include "gdbthread.h"
+ #include "progspace.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)
+ 
+ #include <fcntl.h>
+ #include "readline/readline.h"
+@@ -254,12 +255,27 @@ exec_file_attach (char *filename, int fr
  
        if (!bfd_check_format_matches (exec_bfd, bfd_object, &matching))
  	{
@@ -88,61 +99,64 @@ diff --git a/gdb/exec.c b/gdb/exec.c
  	  /* 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 ());
+-	  error (_("\"%s\": not in executable format: %s"),
+-		 scratch_pathname,
+-		 gdb_bfd_errmsg (bfd_get_error (), matching));
 +
 +	  if (is_core != 0)
 +	    throw_error (IS_CORE_ERROR,
-+			 _("\"%s\" is a core file.\n"
-+			   "Please specify an executable to debug."),
-+			 scratch_pathname);
++		   _("\"%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 ());
++	    error (_("\"%s\": not in executable format: %s"),
++		   scratch_pathname,
++		   gdb_bfd_errmsg (bfd_get_error (), matching));
  	}
  
-       if (build_section_table (exec_bfd, &sections, &sections_end))
-diff --git a/gdb/main.c b/gdb/main.c
---- a/gdb/main.c
-+++ b/gdb/main.c
-@@ -524,6 +524,34 @@ struct cmdarg
-   char *string;
- };
+       /* FIXME - This should only be run for RS6000, but the ifdef is a poor
+Index: gdb-7.4.50.20111218/gdb/main.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/main.c	2011-12-19 00:28:01.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/main.c	2011-12-19 01:41:04.863568846 +0100
+@@ -248,6 +248,36 @@ captured_command_loop (void *data)
+   return 1;
+ }
  
 +/* 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)
++exec_or_core_file_attach (char *filename, int from_tty)
 +{
++  volatile struct gdb_exception e;
++
 +  gdb_assert (exec_bfd == NULL);
 +
-+  try
++  TRY_CATCH (e, RETURN_MASK_ALL)
 +    {
 +      exec_file_attach (filename, from_tty);
 +    }
-+  catch (gdb_exception_error &e)
++  if (e.reason < 0)
 +    {
 +      if (e.error == IS_CORE_ERROR)
 +	{
-+	  core_file_command ((char *) filename, from_tty);
++	  core_file_command (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));
++      throw_exception (e);
 +    }
 +}
 +
- static void
- captured_main_1 (struct captured_main_args *context)
+ static int
+ captured_main (void *data)
  {
-@@ -959,6 +987,8 @@ captured_main_1 (struct captured_main_args *context)
+@@ -704,6 +734,8 @@ captured_main (void *data)
  	{
  	  symarg = argv[optind];
  	  execarg = argv[optind];
@@ -151,11 +165,11 @@ diff --git a/gdb/main.c b/gdb/main.c
  	  optind++;
  	}
  
-@@ -1114,12 +1144,25 @@ captured_main_1 (struct captured_main_args *context)
+@@ -845,11 +877,25 @@ captured_main (void *data)
        && symarg != NULL
        && strcmp (execarg, symarg) == 0)
      {
-+      catch_command_errors_const_ftype *func;
++      catch_command_errors_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).  */
@@ -170,27 +184,13 @@ diff --git a/gdb/main.c b/gdb/main.c
        /* 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)
+-      if (catch_command_errors (exec_file_attach, execarg,
+-				!batch_flag, RETURN_MASK_ALL))
 +         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);
++      if (catch_command_errors (func, execarg, !batch_flag, RETURN_MASK_ALL)
++	  && core_bfd == NULL)
+ 	catch_command_errors (symbol_file_add_main, symarg,
+ 			      !batch_flag, RETURN_MASK_ALL);
      }
-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-misleading-warning-missing-debuginfo-rhbz981154.patch

@@ -1,129 +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-misleading-warning-missing-debuginfo-rhbz981154.patch
-
-;; Fix 'gdb gives highly misleading error when debuginfo pkg is present,
-;; but not corresponding binary pkg' (RH BZ 981154).
-;;=push+jan
-
-Comments by Sergio Durigan Junior <sergiodj@redhat.com>:
-
-  This is the fix for RH BZ #981154
-
-  It is mainly a testcase addition, but a minor fix in the gdb/build-id.c
-  file was also needed.
-
-  gdb/build-id.c was added by:
-
-  commit dc294be54c96414035eed7d53dafdea0a6f31a72
-  Author: Tom Tromey <tromey@redhat.com>
-  Date:   Tue Oct 8 19:56:15 2013 +0000
-
-  and had a little thinko there.  The variable 'filename' needs to be set to
-  NULL after it is free'd, otherwise the code below thinks that it is still
-  valid and doesn't print the necessary warning ("Try: yum install ...").
-
-diff --git a/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp b/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp
-@@ -0,0 +1,97 @@
-+#   Copyright (C) 2014  Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+standard_testfile "normal.c"
-+
-+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
-+    return -1
-+}
-+
-+# Get the build-id of the file
-+set build_id_debug_file [build_id_debug_filename_get $binfile]
-+regsub -all ".debug$" $build_id_debug_file "" build_id_without_debug
-+
-+# Run to main
-+if { ![runto_main] } {
-+    return -1
-+}
-+
-+# We first need to generate a corefile
-+set escapedfilename [string_to_regexp [standard_output_file gcore.test]]
-+set core_supported 0
-+gdb_test_multiple "gcore [standard_output_file gcore.test]" \
-+	"save a corefile" \
-+{
-+  -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
-+    pass "save a corefile"
-+    global core_supported
-+    set core_supported 1
-+  }
-+  -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" {
-+    unsupported "save a corefile"
-+    global core_supported
-+    set core_supported 0
-+  }
-+}
-+
-+if {!$core_supported} {
-+  return -1
-+}
-+
-+# Move the binfile to a temporary name
-+remote_exec build "mv $binfile ${binfile}.old"
-+
-+# Reinitialize GDB and see if we get a yum/dnf warning
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
-+
-+with_test_prefix "first run:" {
-+    gdb_test "set build-id-verbose 1" "" \
-+	"set build-id-verbose"
-+
-+    gdb_test "set debug-file-directory [file dirname [standard_output_file gcore.test]]" "" \
-+	"set debug-file-directory"
-+
-+    gdb_test "core-file [standard_output_file gcore.test]" \
-+	"Missing separate debuginfo for the main executable file\r\nTry: (yum|dnf) --enablerepo='\\*debug\\*' install [standard_output_file $build_id_without_debug]\r\n.*" \
-+	"test first yum/dnf warning"
-+}
-+
-+# Now we define and create our .build-id
-+file mkdir [file dirname [standard_output_file ${build_id_without_debug}]]
-+# Cannot use "file link" (from TCL) because it requires the target file to
-+# exist.
-+remote_exec build "ln -s $binfile [standard_output_file ${build_id_without_debug}]"
-+
-+# Reinitialize GDB to get the second yum/dnf warning
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
-+
-+with_test_prefix "second run:" {
-+    gdb_test "set build-id-verbose 1" "" \
-+	"set build-id-verbose"
-+
-+    gdb_test "set debug-file-directory [file dirname [standard_output_file gcore.test]]" "" \
-+	"set debug-file-directory"
-+
-+    gdb_test "core-file [standard_output_file gcore.test]" \
-+	"Missing separate debuginfo for the main executable file\r\nTry: (yum|dnf) --enablerepo='\\*debug\\*' install $binfile\r\n.*" \
-+	"test second yum/dnf warning"
-+}
-+
-+# Leaving the link there will cause breakage in the next run.
-+remote_exec build "rm -f [standard_output_file ${build_id_without_debug}]"

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

@@ -1,15 +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
-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)
+--- ./gdb/elfread.c	2010-10-14 17:07:45.000000000 +0200
++++ ./gdb/elfread.c	2010-10-14 17:06:30.000000000 +0200
+@@ -1382,6 +1382,18 @@ build_id_to_filename (struct build_id *b
  #include <dlfcn.h>
  #endif
  
@@ -19,7 +10,6 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +   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)
 +{
@@ -29,9 +19,8 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
  /* 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/proc-service.list	2010-05-28 20:50:30.000000000 +0200
++++ ./gdb/proc-service.list	2010-10-14 17:06:30.000000000 +0200
 @@ -37,4 +37,7 @@
    ps_pstop;
    ps_ptread;

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,250 +1,47 @@
-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.patch
-
-;;=push+jan
-
-diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
---- a/gdb/aclocal.m4
-+++ b/gdb/aclocal.m4
-@@ -11,7 +11,223 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
+Index: gdb-7.4.50.20111218/gdb/event-top.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/event-top.c	2011-09-21 17:21:28.000000000 +0200
++++ gdb-7.4.50.20111218/gdb/event-top.c	2011-12-19 01:18:56.087539251 +0100
+@@ -36,6 +36,7 @@
+ #include "observer.h"
+ #include "continuations.h"
+ #include "gdbcmd.h"		/* for dont_repeat() */
++#include "symfile.h"
  
-+# 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
-+# 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.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
+ /* readline include files.  */
+ #include "readline/readline.h"
+@@ -176,6 +177,8 @@ rl_callback_read_char_wrapper (gdb_clien
+ void
+ cli_command_loop (void)
+ {
++  debug_flush_missing ();
 +
-+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+# ----------------------------------
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+fi
-+if test -n "$PKG_CONFIG"; then
-+	_pkg_min_version=m4_default([$1], [0.9.0])
-+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+		AC_MSG_RESULT([yes])
-+	else
-+		AC_MSG_RESULT([no])
-+		PKG_CONFIG=""
-+	fi
-+fi[]dnl
-+])# PKG_PROG_PKG_CONFIG
-+
-+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+#
-+# Check to see whether a particular set of modules exists.  Similar
-+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-+#
-+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+# only at the first occurence in configure.ac, so if the first place
-+# it's called might be skipped (such as if it is within an "if", you
-+# have to call PKG_CHECK_EXISTS manually
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_EXISTS],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+  m4_default([$2], [:])
-+m4_ifvaln([$3], [else
-+  $3])dnl
-+fi])
-+
-+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+# ---------------------------------------------
-+m4_define([_PKG_CONFIG],
-+[if test -n "$$1"; then
-+    pkg_cv_[]$1="$$1"
-+ elif test -n "$PKG_CONFIG"; then
-+    PKG_CHECK_EXISTS([$3],
-+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes ],
-+		     [pkg_failed=yes])
-+ else
-+    pkg_failed=untried
-+fi[]dnl
-+])# _PKG_CONFIG
-+
-+# _PKG_SHORT_ERRORS_SUPPORTED
-+# -----------------------------
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi[]dnl
-+])# _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
-+#
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+#
-+#
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
-+
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-+
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-+
-+if test $pkg_failed = yes; then
-+   	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 
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-+
-+	m4_default([$4], [AC_MSG_ERROR(
-+[Package requirements ($2) were not met:
-+
-+$$1_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+_PKG_TEXT])[]dnl
-+        ])
-+elif test $pkg_failed = untried; then
-+     	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
-+path to pkg-config.
-+
-+_PKG_TEXT
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-+        ])
-+else
-+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+        AC_MSG_RESULT([yes])
-+	$3
-+fi[]dnl
-+])# PKG_CHECK_MODULES
-+
-+
-+# PKG_INSTALLDIR(DIRECTORY)
-+# -------------------------
-+# Substitutes the variable pkgconfigdir as the location where a module
-+# should install pkg-config .pc files. By default the directory is
-+# $libdir/pkgconfig, but the default can be changed by passing
-+# DIRECTORY. The user can override through the --with-pkgconfigdir
-+# parameter.
-+AC_DEFUN([PKG_INSTALLDIR],
-+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-+m4_pushdef([pkg_description],
-+    [pkg-config installation directory @<:@]pkg_default[@:>@])
-+AC_ARG_WITH([pkgconfigdir],
-+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-+    [with_pkgconfigdir=]pkg_default)
-+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-+m4_popdef([pkg_default])
-+m4_popdef([pkg_description])
-+]) dnl PKG_INSTALLDIR
-+
-+
-+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-+# -------------------------
-+# Substitutes the variable noarch_pkgconfigdir as the location where a
-+# module should install arch-independent pkg-config .pc files. By
-+# default the directory is $datadir/pkgconfig, but the default can be
-+# changed by passing DIRECTORY. The user can override through the
-+# --with-noarch-pkgconfigdir parameter.
-+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-+m4_pushdef([pkg_description],
-+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-+AC_ARG_WITH([noarch-pkgconfigdir],
-+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-+    [with_noarch_pkgconfigdir=]pkg_default)
-+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-+m4_popdef([pkg_default])
-+m4_popdef([pkg_description])
-+]) dnl PKG_NOARCH_INSTALLDIR
-+
-+
-+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+# -------------------------------------------
-+# Retrieves the value of the pkg-config variable for the given module.
-+AC_DEFUN([PKG_CHECK_VAR],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-+
-+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-+AS_VAR_COPY([$1], [pkg_cv_][$1])
-+
-+AS_VAR_IF([$1], [""], [$5], [$4])dnl
-+])# PKG_CHECK_VAR
-+
- m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-+
- # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+   display_gdb_prompt (0);
  
- # Copyright (C) 2001-2017 Free Software Foundation, Inc.
-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"
+   /* Now it's time to start the event loop.  */
+@@ -241,6 +244,8 @@ display_gdb_prompt (char *new_prompt)
+   /* Reset the nesting depth used when trace-commands is set.  */
+   reset_command_nest_depth ();
+ 
++  debug_flush_missing ();
++
+   /* Each interpreter has its own rules on displaying the command
+      prompt.  */
+   if (!current_interp_display_prompt_p ())
+Index: gdb-7.4.50.20111218/gdb/elfread.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/elfread.c	2011-12-19 00:54:09.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/elfread.c	2011-12-19 01:16:15.248455897 +0100
+@@ -47,6 +47,7 @@
  #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;
+ #include "gdbcmd.h"
+ #include "observer.h"
++#include "elf/external.h"
+ #include <sys/stat.h>
+ 
+ extern void _initialize_elfread (void);
+@@ -1622,8 +1623,361 @@ build_id_to_filename (struct build_id *b
+   return retval;
  }
  
 +#ifdef HAVE_LIBRPM
@@ -321,9 +118,6 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +  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);
@@ -352,13 +146,13 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +	    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"))))
++	if (!((headerFormat_p = dlsym (h, "headerFormat"))
++	      && (rpmReadConfigFiles_p = dlsym (h, "rpmReadConfigFiles"))
++	      && (rpmdbFreeIterator_p = dlsym (h, "rpmdbFreeIterator"))
++	      && (rpmdbNextIterator_p = dlsym (h, "rpmdbNextIterator"))
++	      && (rpmtsCreate_p = dlsym (h, "rpmtsCreate"))
++	      && (rpmtsFree_p = dlsym (h, "rpmtsFree"))
++	      && (rpmtsInitIterator_p = dlsym (h, "rpmtsInitIterator"))))
 +	  {
 +	    warning (_("Opened library \"%s\" is incompatible (%s), "
 +		      "missing debuginfos notifications will not be displayed"),
@@ -414,12 +208,12 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +	  if (s > debuginfo && memcmp (s, ".src.rpm", srcrpmlen) == 0)
 +	    {
 +	      /* s2 = `-%{release}.src.rpm-debuginfo.%{arch}' */
-+	      s2 = (char *) memrchr (debuginfo, '-', s - debuginfo);
++	      s2 = memrchr (debuginfo, '-', s - debuginfo);
 +	    }
 +	  if (s2)
 +	    {
 +	      /* s2 = `-%{version}-%{release}.src.rpm-debuginfo.%{arch}' */
-+	      s2 = (char *) memrchr (debuginfo, '-', s2 - debuginfo);
++	      s2 = memrchr (debuginfo, '-', s2 - debuginfo);
 +	    }
 +	  if (!s2)
 +	    {
@@ -442,7 +236,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +
 +	  /* 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, RPMDBI_LABEL, debuginfo, 0);
 +	  xfree (debuginfo);
 +	  if (mi_debuginfo)
 +	    {
@@ -464,7 +258,8 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +
 +	  /* Base package name for `debuginfo-install'.  We do not use the
 +	     `yum' command directly as the line
-+		 yum --enablerepo='*debug*' install NAME-debuginfo.ARCH
++		 yum --disablerepo='*' --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
@@ -493,7 +288,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +
 +	      *slot = debuginfo;
 +
-+	      missing_rpm = (struct missing_rpm *) xmalloc (sizeof (*missing_rpm) + strlen (debuginfo));
++	      missing_rpm = xmalloc (sizeof (*missing_rpm) + strlen (debuginfo));
 +	      strcpy (missing_rpm->rpm, debuginfo);
 +	      missing_rpm->next = missing_rpm_list;
 +	      missing_rpm_list = missing_rpm;
@@ -512,10 +307,10 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +  return count;
 +}
 +
-+static bool
-+missing_rpm_list_compar (const char *ap, const char *bp)
++static int
++missing_rpm_list_compar (const char *const *ap, const char *const *bp)
 +{
-+  return strcoll (ap, bp) < 0;
++  return strcoll (*ap, *bp);
 +}
 +
 +/* It returns a NULL-terminated array of strings needing to be FREEd.  It may
@@ -524,50 +319,36 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +static void
 +missing_rpm_list_print (void)
 +{
++  char **array, **array_iter;
 +  struct missing_rpm *list_iter;
++  struct cleanup *cleanups;
 +
 +  if (missing_rpm_list_entries == 0)
 +    return;
 +
-+  std::vector<const char *> array (missing_rpm_list_entries);
-+  size_t idx = 0;
++  array = xmalloc (sizeof (*array) * missing_rpm_list_entries);
++  cleanups = make_cleanup (xfree, array);
 +
++  array_iter = array;
 +  for (list_iter = missing_rpm_list; list_iter != NULL;
 +       list_iter = list_iter->next)
 +    {
-+      array[idx++] = list_iter->rpm;
++      *array_iter++ = list_iter->rpm;
 +    }
-+  gdb_assert (idx == missing_rpm_list_entries);
++  gdb_assert (array_iter == array + missing_rpm_list_entries);
 +
-+  std::sort (array.begin (), array.end (), missing_rpm_list_compar);
-+
-+  /* We zero out the number of missing RPMs here because of a nasty
-+     bug (see RHBZ 1801974).
-+
-+     When we call 'puts_unfiltered' below, if pagination is on and if
-+     the number of missing RPMs is big enough to trigger pagination,
-+     we will end up in an infinite recursion.  The call chain looks
-+     like this:
-+
-+     missing_rpm_list_print -> puts_unfiltered -> fputs_maybe_filtered
-+     -> prompt_for_continue -> display_gdb_prompt ->
-+     debug_flush_missing -> missing_rpm_list_print ...
-+
-+     For this reason, we make sure MISSING_RPM_LIST_ENTRIES is zero
-+     *before* calling any print function.  */
-+  missing_rpm_list_entries = 0;
++  qsort (array, missing_rpm_list_entries, sizeof (*array),
++	 (int (*) (const void *, const void *)) missing_rpm_list_compar);
 +
 +  printf_unfiltered (_("Missing separate debuginfos, use: %s"),
-+#ifdef DNF_DEBUGINFO_INSTALL
-+		     "dnf "
-+#endif
 +		     "debuginfo-install");
-+  for (const char *el : array)
++  for (array_iter = array; array_iter < array + missing_rpm_list_entries;
++       array_iter++)
 +    {
-+      puts_unfiltered (" ");
-+      puts_unfiltered (el);
++      putchar_unfiltered (' ');
++      puts_unfiltered (*array_iter);
 +    }
-+  puts_unfiltered ("\n");
++  putchar_unfiltered ('\n');
 +
 +  while (missing_rpm_list != NULL)
 +    {
@@ -575,6 +356,9 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +      missing_rpm_list = list_iter->next;
 +      xfree (list_iter);
 +    }
++  missing_rpm_list_entries = 0;
++
++  do_cleanups (cleanups);
 +}
 +
 +static void
@@ -615,11 +399,11 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +
  /* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages
 -     Try to install the hash file ...
-+     yum --enablerepo='*debug*' install ...
++     yum --disablerepo='*' --enablerepo='*-debug*' install ...
     avoidance.  */
  
  struct missing_filepair
-@@ -752,11 +1119,17 @@ missing_filepair_change (void)
+@@ -1677,11 +2031,17 @@ missing_filepair_change (void)
        /* All their memory came just from missing_filepair_OBSTACK.  */
        missing_filepair_hash = NULL;
      }
@@ -637,7 +421,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
    missing_filepair_change ();
  }
  
-@@ -823,14 +1196,38 @@ debug_print_missing (const char *binary, const char *debug)
+@@ -1748,14 +2108,35 @@ debug_print_missing (const char *binary,
  
    *slot = missing_filepair;
  
@@ -646,16 +430,17 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +#ifdef HAVE_LIBRPM
 +  if (missing_exec == MISSING_EXEC_NOT_TRIED)
 +    {
-+      const char *execfilename = get_exec_file (0);
++      char *exec_filename;
  
 -  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)
++      exec_filename = get_exec_file (0);
++      if (exec_filename != NULL)
 +	{
-+	  if (missing_rpm_enlist (execfilename) == 0)
++	  if (missing_rpm_enlist (exec_filename) == 0)
 +	    missing_exec = MISSING_EXEC_NOT_FOUND;
 +	  else
 +	    missing_exec = MISSING_EXEC_ENLISTED;
@@ -673,22 +458,237 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +			    _("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);
++			      "yum --disablerepo='*' --enablerepo='*-debug*'"
++			      " install", debug);
 +      }
  }
  
- /* See build-id.h.  */
-diff --git a/gdb/config.in b/gdb/config.in
---- a/gdb/config.in
-+++ b/gdb/config.in
-@@ -39,6 +39,9 @@
- /* Handle .ctf type-info sections */
- #undef ENABLE_LIBCTF
+ static char *
+Index: gdb-7.4.50.20111218/gdb/symfile.h
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/symfile.h	2011-12-19 00:54:09.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/symfile.h	2011-12-19 01:16:15.249455893 +0100
+@@ -568,6 +568,8 @@ extern struct build_id *build_id_addr_ge
+ extern char *build_id_to_filename (struct build_id *build_id,
+ 				   char **link_return, int add_debug_suffix);
+ 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 */
+ 
+Index: gdb-7.4.50.20111218/gdb/testsuite/lib/gdb.exp
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/testsuite/lib/gdb.exp	2011-12-19 00:54:09.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/testsuite/lib/gdb.exp	2011-12-19 01:16:15.250455889 +0100
+@@ -1387,7 +1387,7 @@ proc default_gdb_start { } {
+ 	    warning "Couldn't set the width to 0."
+ 	}
+     }
+-    # Turn off the missing warnings as the testsuite does not expect it.
++    # Turn off the missing RPMs warnings as the testsuite does not expect it.
+     send_gdb "set build-id-verbose 0\n"
+     gdb_expect 10 {
+ 	-re "$gdb_prompt $" {
+Index: gdb-7.4.50.20111218/gdb/testsuite/lib/mi-support.exp
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/testsuite/lib/mi-support.exp	2011-12-19 00:54:49.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/testsuite/lib/mi-support.exp	2011-12-19 01:20:34.921163977 +0100
+@@ -212,7 +212,7 @@ proc default_mi_gdb_start { args } {
+ 	    warning "Couldn't set the width to 0."
+ 	}
+     }
+-    # Turn off the missing warnings as the testsuite does not expect it.
++    # Turn off the missing RPMs warnings as the testsuite does not expect it.
+     send_gdb "190-gdb-set build-id-verbose 0\n"
+     gdb_expect 10 {
+ 	-re ".*190-gdb-set build-id-verbose 0\r\n190\\\^done\r\n$mi_gdb_prompt$" {
+Index: gdb-7.4.50.20111218/gdb/tui/tui-interp.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/tui/tui-interp.c	2011-09-12 23:24:51.000000000 +0200
++++ gdb-7.4.50.20111218/gdb/tui/tui-interp.c	2011-12-19 01:16:15.252455883 +0100
+@@ -31,6 +31,7 @@
+ #include "tui/tui.h"
+ #include "tui/tui-io.h"
+ #include "exceptions.h"
++#include "symfile.h"
+ 
+ /* Set to 1 when the TUI mode must be activated when we first start
+    gdb.  */
+Index: gdb-7.4.50.20111218/gdb/aclocal.m4
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/aclocal.m4	2011-02-15 22:05:53.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/aclocal.m4	2011-12-19 01:16:15.252455883 +0100
+@@ -19,6 +19,162 @@ You have another version of autoconf.  I
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+ 
++# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
++# 
++# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# 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.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++	_pkg_min_version=m4_default([$1], [0.9.0])
++	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++		AC_MSG_RESULT([yes])
++	else
++		AC_MSG_RESULT([no])
++		PKG_CONFIG=""
++	fi
++		
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
++
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists.  Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++  m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++  $3])dnl
++fi])
++
++
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$$1"; then
++    pkg_cv_[]$1="$$1"
++ elif test -n "$PKG_CONFIG"; then
++    PKG_CHECK_EXISTS([$3],
++                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++		     [pkg_failed=yes])
++ else
++    pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
++
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
++
++
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
++
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
++
++if test $pkg_failed = yes; then
++        _PKG_SHORT_ERRORS_SUPPORTED
++        if test $_pkg_short_errors_supported = yes; then
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
++        else 
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++
++	ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
++
++$$1_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++_PKG_TEXT
++])],
++		[AC_MSG_RESULT([no])
++                $4])
++elif test $pkg_failed = untried; then
++	ifelse([$4], , [AC_MSG_FAILURE(dnl
++[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
++path to pkg-config.
++
++_PKG_TEXT
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
++		[$4])
++else
++	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++        AC_MSG_RESULT([yes])
++	ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
++
+ # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+Index: gdb-7.4.50.20111218/gdb/config.in
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/config.in	2011-11-20 09:59:56.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/config.in	2011-12-19 01:16:15.253455879 +0100
+@@ -46,6 +46,9 @@
+ /* Define to BFD's default target vector. */
+ #undef DEFAULT_BFD_VEC
  
 +/* librpm version specific library name to dlopen. */
 +#undef DLOPEN_LIBRPM
@@ -696,69 +696,70 @@ 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
+@@ -233,6 +236,9 @@
+ /* Define if Python 2.7 is being used. */
+ #undef HAVE_LIBPYTHON2_7
  
 +/* Define if librpm library is being used. */
 +#undef HAVE_LIBRPM
 +
- /* Define to 1 if you have the <libunwind-ia64.h> header file. */
- #undef HAVE_LIBUNWIND_IA64_H
+ /* Define if libunwind library is being used. */
+ #undef HAVE_LIBUNWIND
  
-diff --git a/gdb/configure b/gdb/configure
---- a/gdb/configure
-+++ b/gdb/configure
-@@ -769,6 +769,11 @@ PKG_CONFIG
- HAVE_NATIVE_GCORE_TARGET
+Index: gdb-7.4.50.20111218/gdb/configure
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/configure	2011-11-20 09:59:56.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/configure	2011-12-19 01:16:15.256455867 +0100
+@@ -684,6 +684,9 @@ REPORT_BUGS_TO
+ PKGVERSION
  TARGET_OBS
  subdirs
 +RPM_LIBS
 +RPM_CFLAGS
-+PKG_CONFIG_LIBDIR
-+PKG_CONFIG_PATH
 +PKG_CONFIG
  GDB_DATADIR
  DEBUGDIR
- MAKEINFO_EXTRA_FLAGS
-@@ -873,6 +878,7 @@ with_gdb_datadir
+ am__fastdepCC_FALSE
+@@ -952,6 +955,7 @@ enable_dependency_tracking
+ with_separate_debug_dir
+ with_gdb_datadir
  with_relocated_sources
- with_auto_load_dir
- with_auto_load_safe_path
 +with_rpm
  enable_targets
  enable_64_bit_bfd
- enable_gdbmi
-@@ -949,6 +955,8 @@ PKG_CONFIG_PATH
- PKG_CONFIG_LIBDIR
- DEBUGINFOD_CFLAGS
- DEBUGINFOD_LIBS
+ enable_gdbcli
+@@ -995,6 +999,9 @@ LDFLAGS
+ LIBS
+ CPPFLAGS
+ CPP
++PKG_CONFIG
 +RPM_CFLAGS
 +RPM_LIBS
  YACC
  YFLAGS
  XMKMF'
-@@ -1621,6 +1629,8 @@ Optional Packages:
-                           do not restrict auto-loaded files locations
-   --with-debuginfod       Enable debuginfo lookups with debuginfod
-                           (auto/yes/no)
+@@ -1658,6 +1665,8 @@ Optional Packages:
+                           [DATADIR/gdb]
+   --with-relocated-sources=PATH
+                           automatically relocate this path for source files
 +  --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-libunwind        use libunwind frame unwinding support
    --with-curses           use the curses library instead of the termcap
                            library
-@@ -1702,6 +1712,8 @@ Some influential environment variables:
-               C compiler flags for DEBUGINFOD, overriding pkg-config
-   DEBUGINFOD_LIBS
-               linker flags for DEBUGINFOD, overriding pkg-config
+@@ -1696,6 +1705,9 @@ Some influential environment variables:
+   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+               you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
++  PKG_CONFIG  path to pkg-config utility
 +  RPM_CFLAGS  C compiler flags for RPM, overriding pkg-config
 +  RPM_LIBS    linker flags for RPM, overriding pkg-config
-   YACC        The `Yet Another Compiler Compiler' implementation to use.
-               Defaults to the first program found out of: `bison -y', `byacc',
-               `yacc'.
-@@ -6666,6 +6678,494 @@ _ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_auto_load_safe_path" >&5
- $as_echo "$with_auto_load_safe_path" >&6; }
+   YACC        The `Yet Another C Compiler' implementation to use. Defaults to
+               the first program found out of: `bison -y', `byacc', `yacc'.
+   YFLAGS      The list of arguments that will be passed by default to $YACC.
+@@ -7968,6 +7980,486 @@ _ACEOF
+ fi
+ 
  
 +# Integration with rpm library to support missing debuginfo suggestions.
 +# --without-rpm: Disable any rpm support.
@@ -987,11 +988,6 @@ diff --git a/gdb/configure b/gdb/configure
 +    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.
@@ -1104,6 +1100,7 @@ diff --git a/gdb/configure b/gdb/configure
 +$as_echo "no" >&6; }
 +		PKG_CONFIG=""
 +	fi
++
 +fi
 +
 +pkg_failed=no
@@ -1120,7 +1117,6 @@ diff --git a/gdb/configure b/gdb/configure
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
 +  pkg_cv_RPM_CFLAGS=`$PKG_CONFIG --cflags "rpm" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
 +else
 +  pkg_failed=yes
 +fi
@@ -1137,7 +1133,6 @@ diff --git a/gdb/configure b/gdb/configure
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
 +  pkg_cv_RPM_LIBS=`$PKG_CONFIG --libs "rpm" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
 +else
 +  pkg_failed=yes
 +fi
@@ -1148,8 +1143,6 @@ 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 "no" >&6; }
 +
 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 +        _pkg_short_errors_supported=yes
@@ -1157,17 +1150,17 @@ diff --git a/gdb/configure b/gdb/configure
 +        _pkg_short_errors_supported=no
 +fi
 +        if test $_pkg_short_errors_supported = yes; then
-+	        RPM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "rpm" 2>&1`
++	        RPM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "rpm" 2>&1`
 +        else
-+	        RPM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "rpm" 2>&1`
++	        RPM_PKG_ERRORS=`$PKG_CONFIG --print-errors "rpm" 2>&1`
 +        fi
 +	# Put the nasty error message in config.log where it belongs
 +	echo "$RPM_PKG_ERRORS" >&5
 +
-+	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
++elif test $pkg_failed = untried; then
 +	HAVE_LIBRPM=false
 +else
 +	RPM_CFLAGS=$pkg_cv_RPM_CFLAGS
@@ -1251,12 +1244,13 @@ diff --git a/gdb/configure b/gdb/configure
  
  
  subdirs="$subdirs testsuite"
-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,
- 	      [Directories safe to hold auto-loaded files.])
- AC_MSG_RESULT([$with_auto_load_safe_path])
+Index: gdb-7.4.50.20111218/gdb/configure.ac
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/configure.ac	2011-11-20 09:59:56.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/configure.ac	2011-12-19 01:16:15.257455863 +0100
+@@ -140,6 +140,199 @@ AS_HELP_STRING([--with-relocated-sources
+               [Relocated directory for source files. ])
+ ])
  
 +# Integration with rpm library to support missing debuginfo suggestions.
 +# --without-rpm: Disable any rpm support.
@@ -1454,46 +1448,35 @@ diff --git a/gdb/configure.ac b/gdb/configure.ac
  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"
- #include "async-event.h"
-+#include "symfile.h"
- 
- /* readline include files.  */
- #include "readline/readline.h"
-@@ -364,6 +365,8 @@ display_gdb_prompt (const char *new_prompt)
-   /* Reset the nesting depth used when trace-commands is set.  */
-   reset_command_nest_depth ();
- 
-+  debug_flush_missing ();
+Index: gdb-7.4.50.20111218/gdb/acinclude.m4
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/acinclude.m4	2010-05-27 05:40:45.000000000 +0200
++++ gdb-7.4.50.20111218/gdb/acinclude.m4	2011-12-19 01:16:15.257455863 +0100
+@@ -1,3 +1,5 @@
++# serial 1
 +
-   /* 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)
-       command_handler (cmd);
+ dnl written by Rob Savoye <rob@cygnus.com> for Cygnus Support
+ dnl major rewriting for Tcl 7.5 by Don Libes <libes@nist.gov>
  
-       if (ui->prompt_state != PROMPTED)
--	display_gdb_prompt (0);
-+	{
-+	  debug_flush_missing ();
-+	  display_gdb_prompt (0);
-+	}
+@@ -81,8 +83,6 @@ AC_MSG_RESULT(yes)
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ # Boston, MA 02110-1301, USA.
+ 
+-# serial 1
+-
+ # @defmac AC_PROG_CC_STDC
+ # @maindex PROG_CC_STDC
+ # @ovindex CC
+Index: gdb-7.4.50.20111218/gdb/corelow.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/corelow.c	2011-12-19 00:54:09.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/corelow.c	2011-12-19 01:16:15.258455859 +0100
+@@ -321,7 +321,7 @@ build_id_locate_exec (int from_tty)
+         symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
      }
- }
+   else
+-    debug_print_missing (_("the main executable file"), build_id_filename);
++    debug_print_missing (BUILD_ID_MAIN_EXECUTABLE_FILENAME, build_id_filename);
  
-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);
- /* 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")
+   do_cleanups (back_to);
  
- /* From dwarf2read.c */

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

@@ -1,32 +1,18 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.6-buildid-locate-solib-missing-ids.patch
-
-;; Fix loading of core files without build-ids but with build-ids in executables.
-;; Load strictly build-id-checked core files only if no executable is specified
-;; (Jan Kratochvil, RH BZ 1339862).
-;;=push+jan
-
-gdb returns an incorrect back trace when applying a debuginfo
-https://bugzilla.redhat.com/show_bug.cgi?id=1339862
-
-diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
---- a/gdb/solib-svr4.c
-+++ b/gdb/solib-svr4.c
-@@ -1340,14 +1340,27 @@ svr4_read_so_list (svr4_info *info, CORE_ADDR lm, CORE_ADDR prev_lm,
+--- gdb-7.4.50.20120120/gdb/solib-svr4.c.orig	2012-03-17 10:23:11.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/solib-svr4.c	2012-03-17 10:36:22.265628529 +0100
+@@ -1228,14 +1228,27 @@ svr4_read_so_list (CORE_ADDR lm, struct
  	}
  
        {
--	struct bfd_build_id *build_id;
-+	struct bfd_build_id *build_id = NULL;
+-	struct build_id *build_id;
++	struct build_id *build_id = NULL;
  
- 	strncpy (newobj->so_original_name, buffer.get (), SO_NAME_MAX_PATH_SIZE - 1);
- 	newobj->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
+ 	strncpy (new->so_original_name, buffer, SO_NAME_MAX_PATH_SIZE - 1);
+ 	new->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
  	/* May get overwritten below.  */
- 	strcpy (newobj->so_name, newobj->so_original_name);
+ 	strcpy (new->so_name, new->so_original_name);
  
--	build_id = build_id_addr_get (((lm_info_svr4 *) newobj->lm_info)->l_ld);
+-	build_id = build_id_addr_get (new->lm_info->l_ld);
 +	/* In the case the main executable was found according to its build-id
 +	   (from a core file) prevent loading a different build of a library
 +	   with accidentally the same SO_NAME.
@@ -40,16 +26,16 @@ diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
 +	   to the only existing file loaded that time - the executable.  */
 +	if (symfile_objfile != NULL
 +	    && (symfile_objfile->flags & OBJF_BUILD_ID_CORE_LOADED) != 0)
-+	  build_id = build_id_addr_get (li->l_ld);
++	  build_id = build_id_addr_get (new->lm_info->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,
+@@ -1250,23 +1263,7 @@ svr4_read_so_list (CORE_ADDR lm, struct
  		xfree (name);
  	      }
  	    else
 -	      {
--		debug_print_missing (newobj->so_name, build_id_filename);
+-		debug_print_missing (new->so_name, build_id_filename);
 -
 -		/* In the case the main executable was found according to
 -		   its build-id (from a core file) prevent loading
@@ -63,175 +49,9 @@ diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
 -		if (symfile_objfile != NULL
 -		    && (symfile_objfile->flags
 -			& OBJF_BUILD_ID_CORE_LOADED) != 0)
--		  newobj->so_name[0] = 0;
+-		  new->so_name[0] = 0;
 -	      }
-+	      debug_print_missing (newobj->so_name, build_id_filename);
++	      debug_print_missing (new->so_name, build_id_filename);
  
  	    xfree (build_id_filename);
  	    xfree (build_id);
-diff --git a/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-lib.c b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-lib.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-lib.c
-@@ -0,0 +1,21 @@
-+/* Copyright 2010 Free Software Foundation, Inc.
-+
-+   This file is part of GDB.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+void
-+lib (void)
-+{
-+}
-diff --git a/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-main.c b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-main.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-main.c
-@@ -0,0 +1,25 @@
-+/* Copyright 2010 Free Software Foundation, Inc.
-+
-+   This file is part of GDB.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+extern void lib (void);
-+
-+int
-+main (void)
-+{
-+  lib ();
-+  return 0;
-+}
-diff --git a/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp
-@@ -0,0 +1,105 @@
-+# Copyright 2016 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+if {[skip_shlib_tests]} {
-+    return 0
-+}
-+
-+set testfile "gcore-buildid-exec-but-not-solib"
-+set srcmainfile ${testfile}-main.c
-+set srclibfile ${testfile}-lib.c
-+set libfile [standard_output_file ${testfile}-lib.so]
-+set objfile [standard_output_file ${testfile}-main.o]
-+set executable ${testfile}-main
-+set binfile [standard_output_file ${executable}]
-+set gcorefile [standard_output_file ${executable}.gcore]
-+set outdir [file dirname $binfile]
-+
-+if { [gdb_compile_shlib ${srcdir}/${subdir}/${srclibfile} ${libfile} "debug additional_flags=-Wl,--build-id"] != ""
-+     || [gdb_compile ${srcdir}/${subdir}/${srcmainfile} ${objfile} object {debug}] != "" } {
-+     unsupported "-Wl,--build-id compilation failed"
-+     return -1
-+}
-+set opts [list debug shlib=${libfile} "additional_flags=-Wl,--build-id"]
-+if { [gdb_compile ${objfile} ${binfile} executable $opts] != "" } {
-+     unsupported "-Wl,--build-id compilation failed"
-+     return -1
-+}
-+
-+clean_restart $executable
-+gdb_load_shlib $libfile
-+
-+# Does this gdb support gcore?
-+set test "help gcore"
-+gdb_test_multiple $test $test {
-+    -re "Undefined command: .gcore.*\r\n$gdb_prompt $" {
-+	# gcore command not supported -- nothing to test here.
-+	unsupported "gdb does not support gcore on this target"
-+	return -1;
-+    }
-+    -re "Save a core file .*\r\n$gdb_prompt $" {
-+	pass $test
-+    }
-+}
-+
-+if { ![runto lib] } then {
-+    return -1
-+}
-+
-+set escapedfilename [string_to_regexp ${gcorefile}]
-+
-+set test "save a corefile"
-+gdb_test_multiple "gcore ${gcorefile}" $test {
-+    -re "Saved corefile ${escapedfilename}\r\n$gdb_prompt $" {
-+	pass $test
-+    }
-+    -re "Can't create a corefile\r\n$gdb_prompt $" {
-+	unsupported $test
-+	return -1
-+    }
-+}
-+
-+# Now restart gdb and load the corefile.
-+
-+clean_restart $executable
-+gdb_load_shlib $libfile
-+
-+set buildid [build_id_debug_filename_get $libfile]
-+
-+regsub {\.debug$} $buildid {} buildid
-+
-+set debugdir [standard_output_file ${testfile}-debugdir]
-+file delete -force -- $debugdir
-+
-+file mkdir $debugdir/[file dirname $libfile]
-+file copy $libfile $debugdir/${libfile}
-+
-+file mkdir $debugdir/[file dirname $buildid]
-+file copy $libfile $debugdir/${buildid}
-+
-+remote_exec build "ln -s /lib       ${debugdir}/"
-+remote_exec build "ln -s /lib64     ${debugdir}/"
-+# /usr is not needed, all the libs are in /lib64: libm.so.6 libc.so.6 ld-linux-x86-64.so.2
-+
-+gdb_test "set solib-absolute-prefix $debugdir"
-+
-+gdb_test_no_output "set debug-file-directory $debugdir" "set debug-file-directory"
-+
-+gdb_test "core ${gcorefile}" "Core was generated by .*" "re-load generated corefile"
-+
-+gdb_test "frame" "#0 \[^\r\n\]* lib .*" "library got loaded"
-+
-+gdb_test "bt"
-+gdb_test "info shared"

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

@@ -1,11 +1,3 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Jan Kratochvil <jan.kratochvil@redhat.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.6-bz229517-gcore-without-terminal.patch
-
-;; Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
-;;=fedoratest
-
 2007-04-22  Jan Kratochvil <jan.kratochvil@redhat.com>
 
 	* gdb_gcore.sh: Redirect GDB from `</dev/null'.
@@ -14,25 +6,21 @@ Subject: gdb-6.6-bz229517-gcore-without-terminal.patch
 
 	* gdb.base/gcorebg.exp, gdb.base/gcorebg.c: New files.
 
-diff --git a/gdb/testsuite/gdb.base/gcorebg.c b/gdb/testsuite/gdb.base/gcorebg.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gcorebg.c
-@@ -0,0 +1,49 @@
+
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.base/gcorebg.c	25 Feb 2007 12:21:20 -0000
+@@ -0,0 +1,43 @@
 +#include <stdio.h>
 +#include <sys/types.h>
 +#include <unistd.h>
 +#include <stdlib.h>
 +#include <signal.h>
-+#include <string.h>
-+#include <assert.h>
 +
 +int main (int argc, char **argv)
 +{
 +  pid_t pid = 0;
 +  pid_t ppid;
-+  char buf[1024*2 + 500];
-+  int gotint;
++  char buf[256];
 +
 +  if (argc != 4)
 +    {
@@ -49,10 +37,8 @@ new file mode 100644
 +        if (strcmp (argv[1], "detached") == 0)
 +	  setpgrp ();
 +	ppid = getppid ();
-+	gotint = snprintf (buf, sizeof (buf), "sh %s -o %s %d", argv[2], argv[3], (int) ppid);
-+	assert (gotint < sizeof (buf));
++	sprintf (buf, "sh %s -o %s %d", argv[2], argv[3], (int) ppid);
 +	system (buf);
-+	fprintf (stderr, "Killing parent PID %d\n", ppid);
 +	kill (ppid, SIGTERM);
 +	break;
 +
@@ -62,16 +48,13 @@ new file mode 100644
 +	break;
 +
 +      default:
-+	fprintf (stderr,"Sleeping as PID %d\n", getpid ());
 +	sleep (60);
 +    }
 +
 +  return 0;
 +}
-diff --git a/gdb/testsuite/gdb.base/gcorebg.exp b/gdb/testsuite/gdb.base/gcorebg.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gcorebg.exp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.base/gcorebg.exp	25 Feb 2007 12:21:20 -0000
 @@ -0,0 +1,113 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -98,14 +81,14 @@ new file mode 100644
 +# accessible terminal.
 +
 +if ![info exists GCORE] {
-+    set GCORE "[standard_output_file ../../../../gcore]"
++    set GCORE "${srcdir}/../gdb_gcore.sh"
 +}
 +verbose "using GCORE = $GCORE" 2
 +
 +set testfile "gcorebg"
 +set srcfile  ${testfile}.c
-+set binfile  [standard_output_file ${testfile}]
-+set corefile [standard_output_file ${testfile}.test]
++set binfile  ${objdir}/${subdir}/${testfile}
++set corefile ${objdir}/${subdir}/${testfile}.test
 +
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +     untested gcorebg.exp
@@ -154,11 +137,11 @@ new file mode 100644
 +    pass "Spawning $detached gcore"
 +    remote_expect target 20 {
 +	timeout {
-+	    fail "Spawned $detached gcore finished (timeout)"
++	    fail "Spawned $detached gcore finished"
 +	    remote_exec target "kill -9 -[exp_pid -i $res]"
 +	    return 1
 +	}
-+	"Saved corefile .*\r\nKilling parent PID " {
++	eof {
 +	    pass "Spawned $detached gcore finished"
 +	    remote_wait target 20
 +	}

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

@@ -1,21 +1,12 @@
-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
+
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.arch/powerpc-power6.exp	25 Feb 2007 18:27:39 -0000
 @@ -0,0 +1,54 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -42,7 +33,7 @@ new file mode 100644
 +
 +set testfile "powerpc-power6"
 +set srcfile ${testfile}.s
-+set objfile [standard_output_file ${testfile}.o]
++set objfile ${objdir}/${subdir}/${testfile}.o
 +
 +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug}] != "" } {
 +    untested "PowerPC prologue tests"
@@ -62,19 +53,17 @@ new file mode 100644
 +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" ":\tdaddq  *f1,f2,f1\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" ":\tdsubq  *f1,f2,f1\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" ":\tdmulq  *f1,f2,f1\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" ":\tddivq  *f1,f2,f1\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
++gdb_test "disass func" ":\tdcmpuq  *cr1,f2,f1\r\n.*" "Power6 disassembly dcmpuq"
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.arch/powerpc-power6.s	25 Feb 2007 18:27:39 -0000
 @@ -0,0 +1,16 @@
 +	.text
 +	.globl	func
@@ -83,12 +72,12 @@ new file mode 100644
 +	.long	0x7c284fec	/* dcbzl	r8,r9		*/
 +	.long	0xed405834	/* frsqrtes	f10,f11		*/
 +	.long	0xec220804	/* dadd		f1,f2,f1	*/
-+	.long	0xfc020004	/* daddq	f0,f2,f0	*/
++	.long	0xfc220804	/* daddq	f1,f2,f1	*/
 +	.long	0xec220c04	/* dsub		f1,f2,f1	*/
-+	.long	0xfc020404	/* dsubq	f0,f2,f0	*/
++	.long	0xfc220c04	/* dsubq	f1,f2,f1	*/
 +	.long	0xec220844	/* dmul		f1,f2,f1	*/
-+	.long	0xfc020044	/* dmulq	f0,f2,f0	*/
++	.long	0xfc220844	/* dmulq	f1,f2,f1	*/
 +	.long	0xec220c44	/* ddiv		f1,f2,f1	*/
-+	.long	0xfc020444	/* ddivq	f0,f2,f0	*/
++	.long	0xfc220c44	/* ddivq	f1,f2,f1	*/
 +	.long	0xec820d04	/* dcmpu	cr1,f2,f1	*/
-+	.long	0xfc820504	/* dcmpuq	cr1,f2,f0	*/
++	.long	0xfc820d04	/* dcmpuq	cr1,f2,f1	*/

gdb-6.6-bz235197-fork-detach-info.patch

@@ -0,0 +1,121 @@
+2008-03-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.8pre.
+	Remove the `[' character from the GDB-6.8 default message.
+
+Index: gdb-7.2.50.20110320/gdb/linux-nat.c
+===================================================================
+--- gdb-7.2.50.20110320.orig/gdb/linux-nat.c	2011-03-20 16:59:51.000000000 +0100
++++ gdb-7.2.50.20110320/gdb/linux-nat.c	2011-03-20 16:59:51.000000000 +0100
+@@ -716,7 +716,7 @@ holding the child stopped.  Try \"set de
+ 	      remove_breakpoints_pid (GET_PID (inferior_ptid));
+ 	    }
+ 
+-	  if (info_verbose || debug_linux_nat)
++	  if (1 /* Fedora Bug 235197 */ || info_verbose || debug_linux_nat)
+ 	    {
+ 	      target_terminal_ours ();
+ 	      fprintf_filtered (gdb_stdlog,
+Index: gdb-7.2.50.20110320/gdb/testsuite/gdb.base/fork-detach.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.2.50.20110320/gdb/testsuite/gdb.base/fork-detach.c	2011-03-20 16:59:51.000000000 +0100
+@@ -0,0 +1,57 @@
++/* 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 <sys/types.h>
++#include <sys/wait.h>
++#include <unistd.h>
++#include <assert.h>
++#include <stdlib.h>
++
++static void func (void)
++{
++}
++
++int main (void)
++{
++  pid_t child;
++
++  child = fork ();
++  switch (child)
++    {
++      case -1:
++	abort ();
++      case 0:
++	func ();
++	break;
++      default:
++        {
++/* We do not test the switching to the other fork by GDB `fork 1'.  */
++#if 0
++	  pid_t got;
++
++	  got = waitpid (child, NULL, 0);
++	  assert (got == child);
++#endif
++	  break;
++	}
++    }
++  return 0;
++}
+Index: gdb-7.2.50.20110320/gdb/testsuite/gdb.base/fork-detach.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.2.50.20110320/gdb/testsuite/gdb.base/fork-detach.exp	2011-03-20 17:12:22.000000000 +0100
+@@ -0,0 +1,36 @@
++# 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 fork-detach
++set srcfile ${testfile}.c
++set binfile ${objdir}/${subdir}/${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}
++
++gdb_run_cmd
++# `Starting program: .*' prefix is available since gdb-6.7.
++gdb_test "" \
++         "Detaching after fork from child process.*\\\[Inferior .* exited normally\\\]" \
++         "Info message caught"

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

@@ -1,20 +1,12 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Jan Kratochvil <jan.kratochvil@redhat.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
-
-;; Support for stepping over PPC atomic instruction sequences (BZ 237572).
-;;=fedoratest
-
 2007-06-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.threads/atomic-seq-threaded.c,
 	gdb.threads/atomic-seq-threaded.exp: New files.
 
-diff --git a/gdb/testsuite/gdb.threads/atomic-seq-threaded.c b/gdb/testsuite/gdb.threads/atomic-seq-threaded.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.threads/atomic-seq-threaded.c
+Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/atomic-seq-threaded.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/atomic-seq-threaded.c	2008-12-08 22:27:01.000000000 +0100
 @@ -0,0 +1,171 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -187,10 +179,10 @@ new file mode 100644
 +
 +  return 0;						/* _exit_ */
 +}
-diff --git a/gdb/testsuite/gdb.threads/atomic-seq-threaded.exp b/gdb/testsuite/gdb.threads/atomic-seq-threaded.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.threads/atomic-seq-threaded.exp
+Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/atomic-seq-threaded.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/atomic-seq-threaded.exp	2008-12-08 22:31:01.000000000 +0100
 @@ -0,0 +1,84 @@
 +# atomic-seq-threaded.exp -- Test case for stepping over RISC atomic code seqs.
 +# This variant testcases the code for stepping another thread while skipping
@@ -217,7 +209,7 @@ new file mode 100644
 +
 +set testfile atomic-seq-threaded
 +set srcfile ${testfile}.c
-+set binfile [standard_output_file ${testfile}]
++set binfile ${objdir}/${subdir}/${testfile}
 +
 +foreach opts {{} {compiler=gcc4} {FAIL}} {
 +    if {$opts eq "FAIL"} {

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

@@ -0,0 +1,54 @@
+Index: gdb-7.3.50.20110722/gdb/infrun.c
+===================================================================
+--- gdb-7.3.50.20110722.orig/gdb/infrun.c	2011-07-22 19:12:56.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/infrun.c	2011-07-22 19:17:06.000000000 +0200
+@@ -1549,7 +1549,7 @@ static const char *scheduler_enums[] = {
+   schedlock_step,
+   NULL
+ };
+-static const char *scheduler_mode = schedlock_off;
++static const char *scheduler_mode = schedlock_step;
+ static void
+ show_scheduler_mode (struct ui_file *file, int from_tty,
+ 		     struct cmd_list_element *c, const char *value)
+Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.mi/mi-console.exp
+===================================================================
+--- gdb-7.3.50.20110722.orig/gdb/testsuite/gdb.mi/mi-console.exp	2011-01-01 16:33:47.000000000 +0100
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.mi/mi-console.exp	2011-07-22 19:17:06.000000000 +0200
+@@ -47,6 +47,9 @@ if  { [gdb_compile "${srcdir}/${subdir}/
+ 
+ mi_run_to_main
+ 
++# thread-id=\"all\" vs. thread-id=\"1\" below:
++mi_gdb_test "210-gdb-set scheduler-locking off" "210\\^done" "set scheduler-locking off"
++
+ # Next over the hello() call which will produce lots of output
+ mi_gdb_test "220-exec-next" \
+ 	    "220\\^running(\r\n\\*running,thread-id=\"all\")?" \
+Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.mi/mi2-console.exp
+===================================================================
+--- gdb-7.3.50.20110722.orig/gdb/testsuite/gdb.mi/mi2-console.exp	2011-06-23 11:40:50.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.mi/mi2-console.exp	2011-07-22 19:17:27.000000000 +0200
+@@ -47,6 +47,9 @@ if  { [gdb_compile "${srcdir}/${subdir}/
+ 
+ mi_run_to_main
+ 
++# thread-id=\"all\" vs. thread-id=\"1\" below:
++mi_gdb_test "210-gdb-set scheduler-locking off" "210\\^done" "set scheduler-locking off"
++
+ # Next over the hello() call which will produce lots of output
+ mi_gdb_test "220-exec-next" "220\\^running(\r\n)?(\\*running,thread-id=\"all\")?" \
+ 	"Started step over hello"
+Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.mi/mi-cli.exp
+===================================================================
+--- gdb-7.3.50.20110722.orig/gdb/testsuite/gdb.mi/mi-cli.exp	2011-04-27 12:17:38.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.mi/mi-cli.exp	2011-07-22 19:17:06.000000000 +0200
+@@ -176,7 +176,7 @@ mi_execute_to "exec-continue" "breakpoin
+ # Test that the token is output even for CLI commands
+ # Also test that *stopped includes frame information.
+ mi_gdb_test "34 next" \
+-    ".*34\\\^running.*\\*running,thread-id=\"all\"" \
++    ".*34\\\^running.*\\*running,thread-id=\"1\"" \
+     "34 next: run"
+ 
+ if {!$async} {

gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch

@@ -0,0 +1,204 @@
+2007-06-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* inferior.h (enum resume_step): New definition.
+	(resume): Change STEP parameter type to ENUM RESUME_STEP.
+	* infrun.c (resume): Likewise.  Extend debug printing of the STEP
+	parameter.  Lock the scheduler only for intentional stepping.
+	(proceed): Replace the variable ONESTEP with tristate RESUME_STEP.
+	Set the third RESUME_STEP state according to BPSTAT_SHOULD_STEP.
+	(currently_stepping): Change the return type to ENUM RESUME_STEP.
+	Return RESUME_STEP_NEEDED if it is just due to BPSTAT_SHOULD_STEP.
+	* linux-nat.c (select_singlestep_lwp_callback): Do not focus on
+	the software watchpoint events.
+	* linux-nat.h (struct lwp_info): Redeclare STEP as ENUM RESUME_STEP.
+
+2007-10-19  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* infrun.c (proceed): RESUME_STEP initialized for non-stepping.
+	RESUME_STEP set according to STEP only at the end of the function.
+
+2008-02-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.8pre.
+
+Index: gdb-7.4.50.20111218/gdb/inferior.h
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/inferior.h	2011-10-07 14:06:46.000000000 +0200
++++ gdb-7.4.50.20111218/gdb/inferior.h	2011-12-18 23:40:59.257300451 +0100
+@@ -162,7 +162,15 @@ extern void reopen_exec_file (void);
+ /* The `resume' routine should only be called in special circumstances.
+    Normally, use `proceed', which handles a lot of bookkeeping.  */
+ 
+-extern void resume (int, enum target_signal);
++enum resume_step
++  {
++    /* currently_stepping () should return non-zero for non-continue.  */
++    RESUME_STEP_CONTINUE = 0,
++    RESUME_STEP_USER,		/* Stepping is intentional by the user.  */
++    RESUME_STEP_NEEDED		/* Stepping only for software watchpoints.  */
++  };
++
++extern void resume (enum resume_step, enum target_signal);
+ 
+ extern ptid_t user_visible_resume_ptid (int step);
+ 
+Index: gdb-7.4.50.20111218/gdb/infrun.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/infrun.c	2011-11-22 22:25:17.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/infrun.c	2011-12-19 00:12:34.470854218 +0100
+@@ -79,7 +79,7 @@ static int follow_fork (void);
+ static void set_schedlock_func (char *args, int from_tty,
+ 				struct cmd_list_element *c);
+ 
+-static int currently_stepping (struct thread_info *tp);
++static enum resume_step currently_stepping (struct thread_info *tp);
+ 
+ static int currently_stepping_or_nexting_callback (struct thread_info *tp,
+ 						   void *data);
+@@ -1668,7 +1668,8 @@ user_visible_resume_ptid (int step)
+     }
+   else if ((scheduler_mode == schedlock_on)
+ 	   || (scheduler_mode == schedlock_step
+-	       && (step || singlestep_breakpoints_inserted_p)))
++	       && (step == RESUME_STEP_USER
++		   || singlestep_breakpoints_inserted_p)))
+     {
+       /* User-settable 'scheduler' mode requires solo thread resume.  */
+       resume_ptid = inferior_ptid;
+@@ -1686,7 +1687,7 @@ user_visible_resume_ptid (int step)
+    STEP nonzero if we should step (zero to continue instead).
+    SIG is the signal to give the inferior (zero for none).  */
+ void
+-resume (int step, enum target_signal sig)
++resume (enum resume_step step, enum target_signal sig)
+ {
+   int should_resume = 1;
+   struct cleanup *old_cleanups = make_cleanup (resume_cleanups, 0);
+@@ -1719,9 +1720,13 @@ resume (int step, enum target_signal sig
+ 
+   if (debug_infrun)
+     fprintf_unfiltered (gdb_stdlog,
+-                        "infrun: resume (step=%d, signal=%d), "
++                        "infrun: resume (step=%s, signal=%d), "
+ 			"trap_expected=%d, current thread [%s] at %s\n",
+- 			step, sig, tp->control.trap_expected,
++			(step == RESUME_STEP_CONTINUE
++			 ? "RESUME_STEP_CONTINUE"
++			 : (step == RESUME_STEP_USER ? "RESUME_STEP_USER"
++						     : "RESUME_STEP_NEEDED")),
++ 			sig, tp->control.trap_expected,
+ 			target_pid_to_str (inferior_ptid),
+ 			paddress (gdbarch, pc));
+ 
+@@ -2094,7 +2099,7 @@ proceed (CORE_ADDR addr, enum target_sig
+   struct thread_info *tp;
+   CORE_ADDR pc;
+   struct address_space *aspace;
+-  int oneproc = 0;
++  enum resume_step resume_step = RESUME_STEP_CONTINUE;
+ 
+   /* If we're stopped at a fork/vfork, follow the branch set by the
+      "set follow-fork-mode" command; otherwise, we'll just proceed
+@@ -2134,13 +2139,13 @@ proceed (CORE_ADDR addr, enum target_sig
+ 	   actually be executing the breakpoint insn anyway.
+ 	   We'll be (un-)executing the previous instruction.  */
+ 
+-	oneproc = 1;
++	resume_step = RESUME_STEP_USER;
+       else if (gdbarch_single_step_through_delay_p (gdbarch)
+ 	       && gdbarch_single_step_through_delay (gdbarch,
+ 						     get_current_frame ()))
+ 	/* We stepped onto an instruction that needs to be stepped
+ 	   again before re-inserting the breakpoint, do so.  */
+-	oneproc = 1;
++	resume_step = RESUME_STEP_USER;
+     }
+   else
+     {
+@@ -2171,13 +2176,13 @@ proceed (CORE_ADDR addr, enum target_sig
+ 	 is required it returns TRUE and sets the current thread to
+ 	 the old thread.  */
+       if (prepare_to_proceed (step))
+-	oneproc = 1;
++	resume_step = RESUME_STEP_USER;
+     }
+ 
+   /* prepare_to_proceed may change the current thread.  */
+   tp = inferior_thread ();
+ 
+-  if (oneproc)
++  if (resume_step == RESUME_STEP_USER)
+     {
+       tp->control.trap_expected = 1;
+       /* If displaced stepping is enabled, we can step over the
+@@ -2264,8 +2269,13 @@ proceed (CORE_ADDR addr, enum target_sig
+   /* Reset to normal state.  */
+   init_infwait_state ();
+ 
++  if (step)
++    resume_step = RESUME_STEP_USER;
++  if (resume_step == RESUME_STEP_CONTINUE && bpstat_should_step ())
++    resume_step = RESUME_STEP_NEEDED;
++
+   /* Resume inferior.  */
+-  resume (oneproc || step || bpstat_should_step (), tp->suspend.stop_signal);
++  resume (resume_step, tp->suspend.stop_signal);
+ 
+   /* Wait for it to stop (if not standalone)
+      and in any case decode why it stopped, and act accordingly.  */
+@@ -5223,13 +5233,18 @@ process_event_stop_test:
+ 
+ /* Is thread TP in the middle of single-stepping?  */
+ 
+-static int
++static enum resume_step
+ currently_stepping (struct thread_info *tp)
+ {
+-  return ((tp->control.step_range_end
+-	   && tp->control.step_resume_breakpoint == NULL)
+-	  || tp->control.trap_expected
+-	  || bpstat_should_step ());
++  if ((tp->control.step_range_end
++       && tp->control.step_resume_breakpoint == NULL)
++      || tp->control.trap_expected)
++    return RESUME_STEP_USER;
++
++  if (bpstat_should_step ())
++    return RESUME_STEP_NEEDED;
++
++  return RESUME_STEP_CONTINUE;
+ }
+ 
+ /* Returns true if any thread *but* the one passed in "data" is in the
+Index: gdb-7.4.50.20111218/gdb/linux-nat.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/linux-nat.c	2011-12-18 23:35:23.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/linux-nat.c	2011-12-19 00:08:41.824855353 +0100
+@@ -3036,7 +3036,11 @@ static int
+ select_singlestep_lwp_callback (struct lwp_info *lp, void *data)
+ {
+   if (lp->last_resume_kind == resume_step
+-      && lp->status != 0)
++      && lp->status != 0
++      /* We do not focus on software watchpoints as we would not catch
++	 STEPPING_PAST_SINGLESTEP_BREAKPOINT breakpoints in some other thread
++	 as they would remain pending due to `Push back breakpoint for %s'.  */
++      && lp->step == RESUME_STEP_USER)
+     return 1;
+   else
+     return 0;
+Index: gdb-7.4.50.20111218/gdb/linux-nat.h
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/linux-nat.h	2011-12-18 23:35:23.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/linux-nat.h	2011-12-18 23:40:59.262300431 +0100
+@@ -74,8 +74,8 @@ struct lwp_info
+   /* If non-zero, a pending wait status.  */
+   int status;
+ 
+-  /* Non-zero if we were stepping this LWP.  */
+-  int step;
++  /* The kind of stepping of this LWP.  */
++  enum resume_step step;
+ 
+   /* Non-zero si_signo if this LWP stopped with a trap.  si_addr may
+      be the address of a hardware watchpoint.  */

gdb-6.6-testsuite-timeouts.patch

@@ -1,32 +1,26 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.6-testsuite-timeouts.patch
-
-;; Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
-;;=fedoratest
-
-diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
---- a/gdb/testsuite/gdb.base/annota1.exp
-+++ b/gdb/testsuite/gdb.base/annota1.exp
-@@ -39,6 +39,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
- 
- clean_restart ${binfile}
+Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.base/annota1.exp
+===================================================================
+--- gdb-7.4.50.20111219.orig/gdb/testsuite/gdb.base/annota1.exp	2011-12-13 18:22:08.000000000 +0100
++++ gdb-7.4.50.20111219/gdb/testsuite/gdb.base/annota1.exp	2011-12-20 00:01:36.518847033 +0100
+@@ -50,6 +50,8 @@ gdb_start
+ gdb_reinitialize_dir $srcdir/$subdir
+ gdb_load ${binfile}
  
 +gdb_test "set breakpoint pending off" "" "Avoid lockup on nonexisting functions"
 +
- # The commands we test here produce many lines of output; disable "press 
- # <return> to continue" prompts.
- gdb_test_no_output "set height 0"
-diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
---- a/gdb/testsuite/gdb.base/annota3.exp
-+++ b/gdb/testsuite/gdb.base/annota3.exp
-@@ -38,6 +38,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
- 
- clean_restart ${binfile}
+ #
+ # the line at which break main will put the breakpoint
+ #
+Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.base/annota3.exp
+===================================================================
+--- gdb-7.4.50.20111219.orig/gdb/testsuite/gdb.base/annota3.exp	2011-12-13 18:22:08.000000000 +0100
++++ gdb-7.4.50.20111219/gdb/testsuite/gdb.base/annota3.exp	2011-12-20 00:01:36.518847033 +0100
+@@ -50,6 +50,8 @@ gdb_start
+ gdb_reinitialize_dir $srcdir/$subdir
+ gdb_load ${binfile}
  
 +gdb_test "set breakpoint pending off" "" "Avoid lockup on nonexisting functions"
 +
- # The commands we test here produce many lines of output; disable "press 
- # <return> to continue" prompts.
- gdb_test_no_output "set height 0"
+ #
+ # the line at which break main will put the breakpoint
+ #

gdb-6.6-threads-static-test.patch

@@ -0,0 +1,18 @@
+Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.threads/staticthreads.exp
+===================================================================
+--- gdb-7.4.50.20111219.orig/gdb/testsuite/gdb.threads/staticthreads.exp	2011-12-19 21:07:01.436475201 +0100
++++ gdb-7.4.50.20111219/gdb/testsuite/gdb.threads/staticthreads.exp	2011-12-19 22:08:55.444514127 +0100
+@@ -45,6 +45,13 @@ gdb_test_no_output "set print sevenbit-s
+ # See if the static multi-threaded program runs.
+ 
+ runto_main
++
++# See if we get excessive LWP there (patched glibc with unpatched GDB):
++# * 2 Thread 135661664 (LWP 3856)  main () at threadloop.c:41
++#   1 process 3856  main () at threadloop.c:41
++
++gdb_test "info threads" "^info threads\r\n\[ \t\]*Id\[ \t\]+Target Id\[ \t\]+Frame\[ \t\]*\r\n\[^\r\n\]* Thread \[^\r\n\]*" "info threads on start"
++
+ gdb_test "break sem_post"
+ set test "Continue to main's call of sem_post"
+ gdb_test_multiple "continue" "$test" {

gdb-6.7-bz426600-DW_TAG_interface_type-test.patch

@@ -0,0 +1,703 @@
+http://sourceware.org/ml/gdb-patches/2007-12/msg00397.html
+
+2007-12-22  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.arch/i386-interface.S, gdb.arch/i386-interface.exp: New files.
+
+2008-03-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.arch/i386-interface.exp: Fix a testcase race.
+
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.arch/i386-interface.S	22 Dec 2007 19:07:28 -0000
+@@ -0,0 +1,628 @@
++/* Copyright 2007 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++   Please email any bugs, comments, and/or additions to this file to:
++   bug-gdb@gnu.org
++
++   This file is part of the gdb testsuite.
++
++   This file was produced by:
++   $ gcj -S interface.java -ggdb2 -Wall -m32
++   from the .java file:
++     interface Interface
++     {
++     }
++     class Class implements Interface
++     {  
++     }
++*/
++
++	.file	"cc28Pp2B.jar"
++	.section	.debug_abbrev,"",@progbits
++.Ldebug_abbrev0:
++	.section	.debug_info,"",@progbits
++.Ldebug_info0:
++	.section	.debug_line,"",@progbits
++.Ldebug_line0:
++	.text
++.Ltext0:
++	.local	_MT_Interface
++	.comm	_MT_Interface,0,4
++	.data
++	.align 4
++	.type	_catch_classes_Interface, @object
++	.size	_catch_classes_Interface, 24
++_catch_classes_Interface:
++	.zero	24
++	.section	.rodata
++	.align 2
++	.type	_Utf1, @object
++	.size	_Utf1, 4
++_Utf1:
++	.value	36121
++	.value	9
++	.ascii	"Interface"
++	.zero	1
++.globl _ZN9Interface6class$E
++	.data
++	.align 32
++	.type	_ZN9Interface6class$E, @object
++	.size	_ZN9Interface6class$E, 144
++_ZN9Interface6class$E:
++	.long	_ZTVN4java4lang5ClassE+8
++	.long	403000
++	.long	_Utf1
++	.value	1536
++	.zero	2
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	_MT_Interface
++	.value	0
++	.value	6
++	.long	0
++	.long	4
++	.value	0
++	.value	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	_catch_classes_Interface
++	.long	0
++	.long	0
++	.value	0
++	.byte	1
++	.zero	1
++	.long	0
++	.value	0
++	.zero	2
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.hidden	_ZN9Interface7class$$E
++.globl _ZN9Interface7class$$E
++	.section	.rodata
++	.align 4
++	.type	_ZN9Interface7class$$E, @object
++	.size	_ZN9Interface7class$$E, 4
++_ZN9Interface7class$$E:
++	.long	_ZN9Interface6class$E
++	.text
++	.align 2
++.globl _ZN5ClassC1Ev
++	.type	_ZN5ClassC1Ev, @function
++_ZN5ClassC1Ev:
++.LFB2:
++	pushl	%ebp
++.LCFI0:
++	movl	%esp, %ebp
++.LCFI1:
++	subl	$24, %esp
++.LCFI2:
++.LBB2:
++#if 0
++	.file 1 "interface.java"
++#else
++	.file "interface.java"
++#endif
++	.loc 1 4 0
++	movl	8(%ebp), %eax
++	movl	%eax, -4(%ebp)
++	movl	-4(%ebp), %eax
++	movl	%eax, (%esp)
++	call	_ZN4java4lang6ObjectC1Ev
++.LBE2:
++	leave
++	ret
++.LFE2:
++	.size	_ZN5ClassC1Ev, .-_ZN5ClassC1Ev
++	.hidden	_ZTVN5ClassE
++.globl _ZTVN5ClassE
++	.data
++	.align 32
++	.type	_ZTVN5ClassE, @object
++	.size	_ZTVN5ClassE, 40
++_ZTVN5ClassE:
++	.long	0
++	.long	0
++	.long	_ZN5Class6class$E
++	.long	4
++	.long	_ZN4java4lang6Object8finalizeEJvv
++	.long	_ZN4java4lang6Object8hashCodeEJiv
++	.long	_ZN4java4lang6Object6equalsEJbPS1_
++	.long	_ZN4java4lang6Object8toStringEJPNS0_6StringEv
++	.long	_ZN4java4lang6Object5cloneEJPS1_v
++	.long	_ZN4java4lang6Object22throwNoSuchMethodErrorEJvv
++	.set	.L_ZN5ClassC1Ev0,_ZN5ClassC1Ev
++	.section	.rodata
++	.align 2
++	.type	_Utf2, @object
++	.size	_Utf2, 4
++_Utf2:
++	.value	626
++	.value	6
++	.ascii	"<init>"
++	.zero	1
++	.align 2
++	.type	_Utf3, @object
++	.size	_Utf3, 4
++_Utf3:
++	.value	39797
++	.value	3
++	.ascii	"()V"
++	.zero	1
++	.data
++	.align 4
++	.type	_MT_Class, @object
++	.size	_MT_Class, 20
++_MT_Class:
++	.long	_Utf2
++	.long	_Utf3
++	.value	16384
++	.value	-1
++	.long	.L_ZN5ClassC1Ev0
++	.long	0
++	.align 4
++	.type	_IF_Class, @object
++	.size	_IF_Class, 4
++_IF_Class:
++	.long	_ZN9Interface6class$E
++	.align 4
++	.type	_catch_classes_Class, @object
++	.size	_catch_classes_Class, 24
++_catch_classes_Class:
++	.zero	24
++	.section	.rodata
++	.align 2
++	.type	_Utf4, @object
++	.size	_Utf4, 4
++_Utf4:
++	.value	47448
++	.value	5
++	.ascii	"Class"
++	.zero	1
++.globl _ZN5Class6class$E
++	.data
++	.align 32
++	.type	_ZN5Class6class$E, @object
++	.size	_ZN5Class6class$E, 144
++_ZN5Class6class$E:
++	.long	_ZTVN4java4lang5ClassE+8
++	.long	403000
++	.long	_Utf4
++	.value	32
++	.zero	2
++	.long	_ZN4java4lang6Object6class$E
++	.long	0
++	.long	0
++	.long	0
++	.long	_MT_Class
++	.value	1
++	.value	6
++	.long	0
++	.long	4
++	.value	0
++	.value	0
++	.long	_ZTVN5ClassE+8
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	_catch_classes_Class
++	.long	_IF_Class
++	.long	0
++	.value	1
++	.byte	1
++	.zero	1
++	.long	0
++	.value	0
++	.zero	2
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.long	0
++	.hidden	_ZN5Class7class$$E
++.globl _ZN5Class7class$$E
++	.section	.rodata
++	.align 4
++	.type	_ZN5Class7class$$E, @object
++	.size	_ZN5Class7class$$E, 4
++_ZN5Class7class$$E:
++	.long	_ZN5Class6class$E
++	.section	.jcr,"aw",@progbits
++	.align 4
++	.long	_ZN9Interface6class$E
++	.long	_ZN5Class6class$E
++	.section	.debug_frame,"",@progbits
++.Lframe0:
++	.long	.LECIE0-.LSCIE0
++.LSCIE0:
++	.long	0xffffffff
++	.byte	0x1
++	.string	""
++	.uleb128 0x1
++	.sleb128 -4
++	.byte	0x8
++	.byte	0xc
++	.uleb128 0x4
++	.uleb128 0x4
++	.byte	0x88
++	.uleb128 0x1
++	.align 4
++.LECIE0:
++.LSFDE0:
++	.long	.LEFDE0-.LASFDE0
++.LASFDE0:
++	.long	.Lframe0
++	.long	.LFB2
++	.long	.LFE2-.LFB2
++	.byte	0x4
++	.long	.LCFI0-.LFB2
++	.byte	0xe
++	.uleb128 0x8
++	.byte	0x85
++	.uleb128 0x2
++	.byte	0x4
++	.long	.LCFI1-.LCFI0
++	.byte	0xd
++	.uleb128 0x5
++	.align 4
++.LEFDE0:
++	.section	.eh_frame,"a",@progbits
++.Lframe1:
++	.long	.LECIE1-.LSCIE1
++.LSCIE1:
++	.long	0x0
++	.byte	0x1
++.globl __gcj_personality_v0
++	.string	"zP"
++	.uleb128 0x1
++	.sleb128 -4
++	.byte	0x8
++	.uleb128 0x5
++	.byte	0x0
++	.long	__gcj_personality_v0
++	.byte	0xc
++	.uleb128 0x4
++	.uleb128 0x4
++	.byte	0x88
++	.uleb128 0x1
++	.align 4
++.LECIE1:
++.LSFDE1:
++	.long	.LEFDE1-.LASFDE1
++.LASFDE1:
++	.long	.LASFDE1-.Lframe1
++	.long	.LFB2
++	.long	.LFE2-.LFB2
++	.uleb128 0x0
++	.byte	0x4
++	.long	.LCFI0-.LFB2
++	.byte	0xe
++	.uleb128 0x8
++	.byte	0x85
++	.uleb128 0x2
++	.byte	0x4
++	.long	.LCFI1-.LCFI0
++	.byte	0xd
++	.uleb128 0x5
++	.align 4
++.LEFDE1:
++	.text
++.Letext0:
++	.section	.debug_loc,"",@progbits
++.Ldebug_loc0:
++.LLST0:
++	.long	.LFB2-.Ltext0
++	.long	.LCFI0-.Ltext0
++	.value	0x2
++	.byte	0x74
++	.sleb128 4
++	.long	.LCFI0-.Ltext0
++	.long	.LCFI1-.Ltext0
++	.value	0x2
++	.byte	0x74
++	.sleb128 8
++	.long	.LCFI1-.Ltext0
++	.long	.LFE2-.Ltext0
++	.value	0x2
++	.byte	0x75
++	.sleb128 8
++	.long	0x0
++	.long	0x0
++	.section	.debug_info
++	.long	0x117
++	.value	0x2
++	.long	.Ldebug_abbrev0
++	.byte	0x4
++	.uleb128 0x1
++	.string	"GNU Java 4.3.0 20071221 (experimental)"
++	.byte	0xb
++	.string	"interface.java"
++	.string	"/home/jkratoch/redhat/bz371831"
++	.long	.Ltext0
++	.long	.Letext0
++	.long	.Ldebug_line0
++	.uleb128 0x2
++	.string	"Interface"
++	.byte	0x4
++	.byte	0x1
++	.byte	0x0
++	.long	0x8e
++	.long	0x8e
++	.uleb128 0x3
++	.long	0x8e
++	.byte	0x2
++	.byte	0x23
++	.uleb128 0x0
++	.byte	0x1
++	.byte	0x0
++	.uleb128 0x4
++	.string	"java.lang.Object"
++	.byte	0x1
++	.uleb128 0x5
++	.string	"Class"
++	.byte	0x4
++	.byte	0x1
++	.byte	0x0
++	.long	0x8e
++	.long	0xe8
++	.uleb128 0x3
++	.long	0x8e
++	.byte	0x2
++	.byte	0x23
++	.uleb128 0x0
++	.byte	0x1
++	.uleb128 0x6
++	.long	0x6e
++	.byte	0x2
++	.byte	0x23
++	.uleb128 0x0
++	.byte	0x1
++	.byte	0x1
++	.uleb128 0x7
++	.byte	0x1
++	.string	"<init>"
++	.byte	0x1
++	.byte	0x0
++	.string	"_ZN5ClassC1Ev"
++	.byte	0x1
++	.uleb128 0x8
++	.long	0xe8
++	.byte	0x1
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x9
++	.byte	0x4
++	.long	0xa1
++	.uleb128 0xa
++	.long	0xc6
++	.long	.LFB2
++	.long	.LFE2
++	.long	.LLST0
++	.long	0x114
++	.uleb128 0xb
++	.long	0xe8
++	.byte	0x2
++	.byte	0x91
++	.sleb128 0
++	.uleb128 0xc
++	.long	0x114
++	.byte	0x2
++	.byte	0x91
++	.sleb128 -12
++	.byte	0x0
++	.uleb128 0x9
++	.byte	0x4
++	.long	0x8e
++	.byte	0x0
++	.section	.debug_abbrev
++	.uleb128 0x1
++	.uleb128 0x11
++	.byte	0x1
++	.uleb128 0x25
++	.uleb128 0x8
++	.uleb128 0x13
++	.uleb128 0xb
++	.uleb128 0x3
++	.uleb128 0x8
++	.uleb128 0x1b
++	.uleb128 0x8
++	.uleb128 0x11
++	.uleb128 0x1
++	.uleb128 0x12
++	.uleb128 0x1
++	.uleb128 0x10
++	.uleb128 0x6
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x2
++	.uleb128 0x38
++	.byte	0x1
++	.uleb128 0x3
++	.uleb128 0x8
++	.uleb128 0xb
++	.uleb128 0xb
++	.uleb128 0x3a
++	.uleb128 0xb
++	.uleb128 0x3b
++	.uleb128 0xb
++	.uleb128 0x1d
++	.uleb128 0x13
++	.uleb128 0x1
++	.uleb128 0x13
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x3
++	.uleb128 0x1c
++	.byte	0x0
++	.uleb128 0x49
++	.uleb128 0x13
++	.uleb128 0x38
++	.uleb128 0xa
++	.uleb128 0x32
++	.uleb128 0xb
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x4
++	.uleb128 0x2
++	.byte	0x0
++	.uleb128 0x3
++	.uleb128 0x8
++	.uleb128 0x3c
++	.uleb128 0xc
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x5
++	.uleb128 0x2
++	.byte	0x1
++	.uleb128 0x3
++	.uleb128 0x8
++	.uleb128 0xb
++	.uleb128 0xb
++	.uleb128 0x3a
++	.uleb128 0xb
++	.uleb128 0x3b
++	.uleb128 0xb
++	.uleb128 0x1d
++	.uleb128 0x13
++	.uleb128 0x1
++	.uleb128 0x13
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x6
++	.uleb128 0x1c
++	.byte	0x0
++	.uleb128 0x49
++	.uleb128 0x13
++	.uleb128 0x38
++	.uleb128 0xa
++	.uleb128 0x4c
++	.uleb128 0xb
++	.uleb128 0x32
++	.uleb128 0xb
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x7
++	.uleb128 0x2e
++	.byte	0x1
++	.uleb128 0x3f
++	.uleb128 0xc
++	.uleb128 0x3
++	.uleb128 0x8
++	.uleb128 0x3a
++	.uleb128 0xb
++	.uleb128 0x3b
++	.uleb128 0xb
++	.uleb128 0x2007
++	.uleb128 0x8
++	.uleb128 0x3c
++	.uleb128 0xc
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x8
++	.uleb128 0x5
++	.byte	0x0
++	.uleb128 0x49
++	.uleb128 0x13
++	.uleb128 0x34
++	.uleb128 0xc
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x9
++	.uleb128 0xf
++	.byte	0x0
++	.uleb128 0xb
++	.uleb128 0xb
++	.uleb128 0x49
++	.uleb128 0x13
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0xa
++	.uleb128 0x2e
++	.byte	0x1
++	.uleb128 0x47
++	.uleb128 0x13
++	.uleb128 0x11
++	.uleb128 0x1
++	.uleb128 0x12
++	.uleb128 0x1
++	.uleb128 0x40
++	.uleb128 0x6
++	.uleb128 0x1
++	.uleb128 0x13
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0xb
++	.uleb128 0x5
++	.byte	0x0
++	.uleb128 0x49
++	.uleb128 0x13
++	.uleb128 0x2
++	.uleb128 0xa
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0xc
++	.uleb128 0x34
++	.byte	0x0
++	.uleb128 0x49
++	.uleb128 0x13
++	.uleb128 0x2
++	.uleb128 0xa
++	.byte	0x0
++	.byte	0x0
++	.byte	0x0
++	.section	.debug_pubnames,"",@progbits
++	.long	0x15
++	.value	0x2
++	.long	.Ldebug_info0
++	.long	0x11b
++	.long	0xee
++	.string	"()"
++	.long	0x0
++	.section	.debug_aranges,"",@progbits
++	.long	0x1c
++	.value	0x2
++	.long	.Ldebug_info0
++	.byte	0x4
++	.byte	0x0
++	.value	0x0
++	.value	0x0
++	.long	.Ltext0
++	.long	.Letext0-.Ltext0
++	.long	0x0
++	.long	0x0
++	.ident	"GCC: (GNU) 4.3.0 20071221 (experimental)"
++	.section	.note.GNU-stack,"",@progbits
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.arch/i386-interface.exp	22 Dec 2007 19:07:28 -0000
+@@ -0,0 +1,59 @@
++# Copyright 2007 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++# Please email any bugs, comments, and/or additions to this file to:
++# bug-gdb@gnu.org
++
++# This file is part of the gdb testsuite.
++
++# Test basis recognization of DW_TAG_interface_type.
++# GCC java_classify_record() produces it if returns RECORD_IS_INTERFACE.
++
++if {![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]} then {
++    verbose "Skipping i386 Java DW_TAG_interface_type test."
++    return
++}
++
++set testfile "i386-interface"
++set srcfile ${testfile}.S
++set binfile ${objdir}/${subdir}/${testfile}.o
++
++if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug additional_flags=-m32}] != "" } {
++    untested i386-gnu-cfi.exp
++    return -1
++}
++
++# Get things started.
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++gdb_test "set language java"
++
++set test "ptype Interface"
++gdb_test_multiple $test $test {
++    -re "type = class Interface  *extends java.lang.Object \{.*$gdb_prompt $" {
++	pass $test
++    }
++}
++
++set test "ptype Class"
++gdb_test_multiple $test $test {
++    -re "type = class Class  *extends java.lang.Object implements Interface \{.*$gdb_prompt $" {
++	pass $test
++    }
++}

gdb-6.7-charsign-test.patch

@@ -1,11 +1,3 @@
-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>
@@ -18,10 +10,8 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=224128
 	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
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.base/charsign.c	26 Jan 2007 10:32:00 -0000
 @@ -0,0 +1,37 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -60,10 +50,8 @@ new file mode 100644
 +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
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.base/charsign.exp	26 Jan 2007 10:32:00 -0000
 @@ -0,0 +1,63 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -83,7 +71,7 @@ new file mode 100644
 +
 +set testfile charsign
 +set srcfile ${testfile}.c
-+set binfile [standard_output_file ${testfile}]
++set binfile ${objdir}/${subdir}/${testfile}
 +
 +proc do_test { cflags } {
 +    global srcdir

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

@@ -1,11 +1,3 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Jan Kratochvil <jan.kratochvil@redhat.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.7-ppc-clobbered-registers-O2-test.patch
-
-;; Test PPC hiding of call-volatile parameter register.
-;;=fedoratest
-
 2007-11-04  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.arch/ppc-clobbered-registers-O2.exp: `powerpc64' changed to
@@ -21,10 +13,8 @@ http://sourceware.org/ml/gdb-patches/2007-09/msg00228.html
 	* (rs6000_gdbarch_init): Install ppc_dwarf2_frame_init_reg as
 	default dwarf2_frame_set_init_reg function.
 
-diff --git a/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.c b/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.c
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.c	3 Nov 2007 22:22:28 -0000
 @@ -0,0 +1,21 @@
 +
 +unsigned * __attribute__((noinline))
@@ -47,10 +37,8 @@ new file mode 100644
 +  y = 14;
 +  return (int)gen_movsd (&x, &y);
 +}
-diff --git a/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.exp b/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.exp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.exp	3 Nov 2007 22:22:28 -0000
 @@ -0,0 +1,54 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +#
@@ -80,7 +68,7 @@ new file mode 100644
 +
 +set testfile "ppc-clobbered-registers-O2"
 +set srcfile ${testfile}.c
-+set binfile [standard_output_file ${testfile}]
++set binfile ${objdir}/${subdir}/${testfile}
 +set compile_flags "debug additional_flags=-O2"
 +
 +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ${compile_flags}] != "" } {

gdb-6.7-testsuite-stable-results.patch

@@ -1,11 +1,3 @@
-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>
@@ -16,22 +8,44 @@ gdb/testsuite/gdb.base/fileio.exp:
 	* 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)
+Index: gdb-7.4.50.20120103/gdb/testsuite/gdb.base/fileio.c
+===================================================================
+--- gdb-7.4.50.20120103.orig/gdb/testsuite/gdb.base/fileio.c	2009-10-01 17:39:13.000000000 +0200
++++ gdb-7.4.50.20120103/gdb/testsuite/gdb.base/fileio.c	2012-01-03 15:21:28.122729249 +0100
+@@ -58,6 +58,8 @@ system (const char * string);
+ 1) Invalid string/command. -  returns 127.  */
+ static const char *strerrno (int err);
+ 
++#define ROOTSUBDIR "fileio.dir"
++
+ #define FILENAME    "foo.fileio.test"
+ #define RENAMED     "bar.fileio.test"
+ #define NONEXISTANT "nofoo.fileio.test"
+@@ -542,6 +544,37 @@ strerrno (int err)
  int
  main ()
  {
++  /* ROOTSUBDIR is already prepared by fileio.exp.  We use it for easy cleanup
++     (by fileio.exp) if we are run by multiple users in the same directory.  */
++
++  if (chdir (ROOTSUBDIR) != 0)
++    {
++      printf ("chdir " ROOTSUBDIR ": %s\n", strerror (errno));
++      exit (1);
++    }
++
 +  /* These tests
 +       Open for write but no write permission returns EACCES
 +       Unlinking a file in a directory w/o write access returns EACCES
@@ -41,10 +55,10 @@ diff --git a/gdb/testsuite/gdb.base/fileio.c b/gdb/testsuite/gdb.base/fileio.c
 +    {
 +      uid_t uid = 99;
 +
-+      if (chown (OUTDIR, uid, uid) != 0)
++      if (chown (".", uid, uid) != 0)
 +	{
-+	  printf ("chown %d.%d %s: %s\n", (int) uid, (int) uid,
-+		  OUTDIR, strerror (errno));
++	  printf ("chown %d.%d " ROOTSUBDIR ": %s\n", (int) uid, (int) uid,
++		  strerror (errno));
 +	  exit (1);
 +	}
 +      if (setuid (uid) || geteuid () == 0)
@@ -57,48 +71,38 @@ diff --git a/gdb/testsuite/gdb.base/fileio.c b/gdb/testsuite/gdb.base/fileio.c
    /* 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"]
+Index: gdb-7.4.50.20120103/gdb/testsuite/gdb.base/fileio.exp
+===================================================================
+--- gdb-7.4.50.20120103.orig/gdb/testsuite/gdb.base/fileio.exp	2011-12-26 12:24:55.000000000 +0100
++++ gdb-7.4.50.20120103/gdb/testsuite/gdb.base/fileio.exp	2012-01-03 15:22:02.716601956 +0100
+@@ -42,8 +42,8 @@ if [get_compiler_info ${binfile}] {
+     return -1;
  }
  
- 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]"
+-remote_exec build {sh -xc test\ -r\ dir2.fileio.test\ &&\ chmod\ -f\ +w\ dir2.fileio.test}
+-remote_exec build {sh -xc rm\ -rf\ *.fileio.test}
++remote_exec build {sh -xc rm\ -rf\ fileio.dir}
++remote_exec build {sh -xc mkdir\ -m777\ fileio.dir}
  
  set oldtimeout $timeout
  set timeout [expr "$timeout + 60"]
-@@ -89,7 +90,7 @@ gdb_test continue \
+@@ -85,7 +85,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]\""
+-catch "system \"chmod -f -w nowrt.fileio.test\""
++catch "system \"chmod -f -w fileio.dir/nowrt.fileio.test\""
  
  gdb_test continue \
  "Continuing\\..*open 5:.*EACCES$stop_msg" \
-@@ -276,9 +277,7 @@ gdb_test continue \
- gdb_exit
+@@ -251,8 +251,8 @@ gdb_exit
+ # Wait till GDB really exits.
+ sleep 1
  
- # 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"
+-remote_exec build {sh -xc test\ -r\ dir2.fileio.test\ &&\ chmod\ -f\ +w\ dir2.fileio.test}
+-remote_exec build {sh -xc rm\ -rf\ *.fileio.test}
++remote_exec build {sh -xc test\ -r\ fileio.dir/dir2.fileio.test\ &&\ chmod\ -f\ +w\ fileio.dir/dir2.fileio.test}
++remote_exec build {sh -xc rm\ -rf\ fileio.dir}
  
  set timeout $oldtimeout
  return 0

gdb-6.8-attach-signalled-detach-stopped.patch

@@ -0,0 +1,152 @@
+Index: gdb-7.0.50.20100115/gdb/linux-nat.c
+===================================================================
+--- gdb-7.0.50.20100115.orig/gdb/linux-nat.c	2010-01-15 11:53:34.000000000 +0100
++++ gdb-7.0.50.20100115/gdb/linux-nat.c	2010-01-15 12:13:53.000000000 +0100
+@@ -175,6 +175,9 @@ blocked.  */
+ static struct target_ops *linux_ops;
+ static struct target_ops linux_ops_saved;
+ 
++/* PID of the inferior stopped by SIGSTOP before attaching (or zero).  */
++static pid_t pid_was_stopped;
++
+ /* The method to call, if any, when a new thread is attached.  */
+ static void (*linux_nat_new_thread) (struct lwp_info *);
+ 
+@@ -933,7 +936,14 @@ Attaching after process %d fork to child
+ 	  parent_inf->waiting_for_vfork_done = 0;
+ 	}
+       else if (detach_fork)
+-	target_detach (NULL, 0);
++	{
++	  /* We should check PID_WAS_STOPPED and detach it stopped accordingly.
++	     In this point of code it cannot be 1 as we would not get FORK
++	     executed without CONTINUE first which resets PID_WAS_STOPPED.
++	     We would have to first TARGET_STOP and WAITPID it as with running
++	     inferior PTRACE_DETACH, SIGSTOP will ignore the signal.  */
++	  target_detach (NULL, 0);
++	}
+ 
+       /* Note that the detach above makes PARENT_INF dangling.  */
+ 
+@@ -1427,6 +1437,7 @@ linux_nat_post_attach_wait (ptid_t ptid,
+       if (debug_linux_nat)
+ 	fprintf_unfiltered (gdb_stdlog,
+ 			    "LNPAW: Attaching to a stopped process\n");
++      pid_was_stopped = GET_PID (ptid);
+ 
+       /* The process is definitely stopped.  It is in a job control
+ 	 stop, unless the kernel predates the TASK_STOPPED /
+@@ -1757,6 +1768,9 @@ GPT: lwp %s had signal %s, but it is in 
+ 			    target_signal_to_string (signo));
+     }
+ 
++  if (*status == 0 && GET_PID (lp->ptid) == pid_was_stopped)
++    *status = W_STOPCODE (SIGSTOP);
++
+   return 0;
+ }
+ 
+@@ -1866,6 +1880,8 @@ linux_nat_detach (struct target_ops *ops
+     }
+   else
+     linux_ops->to_detach (ops, args, from_tty);
++
++  pid_was_stopped = 0;
+ }
+ 
+ /* Resume LP.  */
+@@ -2031,6 +2047,14 @@ linux_nat_resume (struct target_ops *ops
+      resume_callback.  */
+   lp->stopped = 0;
+ 
++  /* 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 == GET_PID (lp->ptid))
++    pid_was_stopped = 0;
++
+   if (resume_many)
+     iterate_over_lwps (ptid, resume_callback, NULL);
+ 
+@@ -3923,6 +3947,8 @@ linux_nat_mourn_inferior (struct target_
+        there are other viable forks to debug.  Delete the exiting
+        one and context-switch to the first available.  */
+     linux_fork_mourn_inferior ();
++
++  pid_was_stopped = 0;
+ }
+ 
+ /* Convert a native/host siginfo object, into/from the siginfo in the
+Index: gdb-7.0.50.20100115/gdb/testsuite/gdb.threads/attach-stopped.exp
+===================================================================
+--- gdb-7.0.50.20100115.orig/gdb/testsuite/gdb.threads/attach-stopped.exp	2010-01-01 08:32:06.000000000 +0100
++++ gdb-7.0.50.20100115/gdb/testsuite/gdb.threads/attach-stopped.exp	2010-01-15 11:54:57.000000000 +0100
+@@ -62,7 +62,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-6.8-bz254229-gcore-prpsinfo.patch

@@ -0,0 +1,289 @@
+Index: gdb-7.2.50.20110320/bfd/elf-bfd.h
+===================================================================
+--- gdb-7.2.50.20110320.orig/bfd/elf-bfd.h	2011-03-20 15:17:42.000000000 +0100
++++ gdb-7.2.50.20110320/bfd/elf-bfd.h	2011-03-20 15:24:02.000000000 +0100
+@@ -2193,8 +2193,10 @@ extern Elf_Internal_Phdr * _bfd_elf_find
+ /* Exported interface for writing elf corefile notes. */
+ extern char *elfcore_write_note
+   (bfd *, char *, int *, const char *, int, const void *, int);
++struct elf_prpsinfo;
++typedef struct elf_prpsinfo prpsinfo_t;
+ extern char *elfcore_write_prpsinfo
+-  (bfd *, char *, int *, const char *, const char *);
++  (bfd *, char *, int *, const prpsinfo_t *);
+ extern char *elfcore_write_prstatus
+   (bfd *, char *, int *, long, int, const void *);
+ extern char * elfcore_write_pstatus
+Index: gdb-7.2.50.20110320/bfd/elf.c
+===================================================================
+--- gdb-7.2.50.20110320.orig/bfd/elf.c	2011-03-20 15:17:42.000000000 +0100
++++ gdb-7.2.50.20110320/bfd/elf.c	2011-03-20 15:24:02.000000000 +0100
+@@ -8814,13 +8814,12 @@ elfcore_write_note (bfd *abfd,
+   return buf;
+ }
+ 
+-#if defined (HAVE_PRPSINFO_T) || defined (HAVE_PSINFO_T)
++#if defined (HAVE_PRPSINFO_T)
+ char *
+ elfcore_write_prpsinfo (bfd  *abfd,
+ 			char *buf,
+ 			int  *bufsiz,
+-			const char *fname,
+-			const char *psargs)
++			const prpsinfo_t *input)
+ {
+   const char *note_name = "CORE";
+   const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+@@ -8828,48 +8827,55 @@ elfcore_write_prpsinfo (bfd  *abfd,
+   if (bed->elf_backend_write_core_note != NULL)
+     {
+       char *ret;
++      char fname[sizeof (input->pr_fname) + 1];
++      char psargs[sizeof (input->pr_psargs) + 1];
++
++      strncpy (fname, input->pr_fname, sizeof (input->pr_fname));
++      fname[sizeof (input->pr_fname)] = 0;
++      strncpy (psargs, input->pr_psargs, sizeof (input->pr_psargs));
++      psargs[sizeof (input->pr_psargs)] = 0;
++
+       ret = (*bed->elf_backend_write_core_note) (abfd, buf, bufsiz,
+ 						 NT_PRPSINFO, fname, psargs);
+       if (ret != NULL)
+ 	return ret;
+     }
+ 
+-#if defined (HAVE_PRPSINFO32_T) || defined (HAVE_PSINFO32_T)
++#if defined (HAVE_PRPSINFO32_T)
+   if (bed->s->elfclass == ELFCLASS32)
+     {
+-#if defined (HAVE_PSINFO32_T)
+-      psinfo32_t data;
+-      int note_type = NT_PSINFO;
+-#else
+       prpsinfo32_t data;
+       int note_type = NT_PRPSINFO;
+-#endif
+ 
+       memset (&data, 0, sizeof (data));
+-      strncpy (data.pr_fname, fname, sizeof (data.pr_fname));
+-      strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs));
++      data.pr_state = input->pr_state;
++      data.pr_sname = input->pr_sname;
++      data.pr_zomb = input->pr_zomb;
++      data.pr_nice = input->pr_nice;
++      data.pr_flag = input->pr_flag;
++      data.pr_uid = input->pr_uid;
++      data.pr_gid = input->pr_gid;
++      data.pr_pid = input->pr_pid;
++      data.pr_ppid = input->pr_ppid;
++      data.pr_pgrp = input->pr_pgrp;
++      data.pr_sid = input->pr_sid;
++      BFD_ASSERT (sizeof (data.pr_fname) == sizeof (input->pr_fname));
++      memcpy (data.pr_fname, input->pr_fname, sizeof (data.pr_fname));
++      BFD_ASSERT (sizeof (data.pr_psargs) == sizeof (input->pr_psargs));
++      memcpy (data.pr_psargs, input->pr_psargs, sizeof (data.pr_psargs));
+       return elfcore_write_note (abfd, buf, bufsiz,
+ 				 note_name, note_type, &data, sizeof (data));
+     }
+   else
+ #endif
+     {
+-#if defined (HAVE_PSINFO_T)
+-      psinfo_t data;
+-      int note_type = NT_PSINFO;
+-#else
+-      prpsinfo_t data;
+       int note_type = NT_PRPSINFO;
+-#endif
+ 
+-      memset (&data, 0, sizeof (data));
+-      strncpy (data.pr_fname, fname, sizeof (data.pr_fname));
+-      strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs));
+       return elfcore_write_note (abfd, buf, bufsiz,
+-				 note_name, note_type, &data, sizeof (data));
++				 note_name, note_type, input, sizeof (*input));
+     }
+ }
+-#endif	/* PSINFO_T or PRPSINFO_T */
++#endif	/* PRPSINFO_T */
+ 
+ #if defined (HAVE_PRSTATUS_T)
+ char *
+Index: gdb-7.2.50.20110320/gdb/linux-nat.c
+===================================================================
+--- gdb-7.2.50.20110320.orig/gdb/linux-nat.c	2011-03-20 15:17:46.000000000 +0100
++++ gdb-7.2.50.20110320/gdb/linux-nat.c	2011-03-20 15:25:36.000000000 +0100
+@@ -4603,6 +4603,131 @@ linux_spu_make_corefile_notes (bfd *obfd
+   return args.note_data;
+ }
+ 
++/* Should be always true for Linux */
++#define HAVE_PRPSINFO_T 1
++
++#if defined (HAVE_PRPSINFO_T)
++
++/* Fills struct elf_prpsinfo{32,64} as much as possible, imitate Linux kernel
++   binfmt_elf.c.  Unknown values are filled with zeroes.  The structure is
++   malloced.  */
++
++static const prpsinfo_t *
++fill_prpsinfo (void)
++{
++  struct stat sb;
++  char filename[sizeof ("/proc//cmdline") + sizeof (int) * 3 + 2];
++  char buf[1024];
++  char proc_state[5];
++  char proc_cmdline[sizeof (((struct elf_prpsinfo*)0)->pr_psargs) + 1];
++  unsigned flags;
++  long proc_nice;
++  unsigned proc_ppid;
++  unsigned proc_pgid;
++  unsigned proc_sid;
++  pid_t pid;
++  int fd, n;
++  char *cp, *proc_comm, *state_s;
++  /* String comes from Linux kernel binfmt_elf.c FILL_PSINFO but it is already
++     obsolete there to <linux/sched.h> TASK_* constants.  */
++  const char state_string[] = "RSDTZW";
++  int state_num;
++  static prpsinfo_t retval;
++
++  /* Get /proc/$PID/stat.  */
++  pid = ptid_get_pid (inferior_ptid);
++  sprintf (filename, "/proc/%u/stat", (unsigned)pid);
++  fd = open (filename, O_RDONLY);
++  if (fd < 0)
++    return NULL;
++  fstat (fd, &sb); /* No error checking (can it ever happen?).  */
++  n = read (fd, buf, sizeof (buf) - 1);
++  close (fd);
++  if (n < 0)
++    return NULL;
++  buf[n] = 0;
++
++  cp = strrchr (buf, ')'); /* Split into "PID (COMM" and "<rest>".  */
++  if (!cp)
++    return NULL;
++  *cp = 0;
++
++  /* Grab COMM.  */
++  proc_comm = strchr (buf, '(');
++  if (!proc_comm)
++    return NULL;
++  proc_comm++;
++
++  /* Read /proc/$PID/cmdline.  */
++  proc_cmdline[0] = 0;
++  strcpy (strrchr (filename, '/'), "/cmdline");
++  fd = open (filename, O_RDONLY);
++  if (fd >= 0)
++    {
++      int n;
++
++      n = read (fd, proc_cmdline, sizeof (proc_cmdline) - 1);
++      if (n < 0)
++	n = 0;
++      proc_cmdline[n] = 0;
++      while (n--) /* Replace NULs with spaces.  */
++	if (proc_cmdline[n] == 0)
++	  proc_cmdline[n] = ' ';
++      close (fd);
++    }
++
++  /* Parse /proc/$PID/stat.  */
++  n = sscanf (cp + 2, /* skip ") " */
++	      "%4s %u "          /* state, ppid */
++	      "%u %u %*s %*s "   /* pgid, sid, tty, tpgid */
++	      "%u %*s %*s %*s "  /* flags, min_flt, cmin_flt, maj_flt */
++	      "%*s "             /* cmaj_flt */
++	      "%*s %*s "         /* utime, stime */
++	      "%*s %*s %*s "     /* cutime, cstime, priority */
++	      "%ld "             /* nice */
++	      /*"%*s %*s "          timeout, it_real_value */
++	      /*"%lu "              start_time */
++	      /*"%lu "              vsize */
++	      /*"%lu "              rss */
++	      /*"%lu %lu %lu "      rss_rlim, start_code, end_code */
++	      /*"%lu %lu %lu "      start_stack, kstk_esp, kstk_eip */
++	      /*"%u %u %u %u "      signal, blocked, sigignore, sigcatch */
++	      /*"%lu %lu %lu"       wchan, nswap, cnswap */
++	      , proc_state, &proc_ppid,
++	      &proc_pgid, &proc_sid,
++	      &flags,
++	      &proc_nice);
++  if (n != 6)
++    return NULL;
++
++  state_s = strchr (state_string, proc_state[0]);
++  if (state_s != NULL)
++    state_num = state_s - state_string;
++  else
++    {
++      /* 0 means Running, some more unusal state would be better.  */
++      state_num = 0;
++    }
++
++  memset (&retval, 0, sizeof (retval));
++  retval.pr_state = state_num;
++  retval.pr_sname = proc_state[0];
++  retval.pr_zomb = (proc_state[0] == 'Z');
++  retval.pr_nice = proc_nice;
++  retval.pr_flag = flags;
++  retval.pr_uid = sb.st_uid;
++  retval.pr_gid = sb.st_gid;
++  retval.pr_pid = pid;
++  retval.pr_ppid = proc_ppid;
++  retval.pr_pgrp = proc_pgid;
++  retval.pr_sid = proc_sid;
++  strncpy (retval.pr_fname, proc_comm, sizeof (retval.pr_fname));
++  strncpy (retval.pr_psargs, proc_cmdline, sizeof (retval.pr_psargs));
++
++  return &retval;
++}
++#endif
++
+ /* Fills the "to_make_corefile_note" target vector.  Builds the note
+    section for a corefile, and returns it in a malloc buffer.  */
+ 
+@@ -4621,26 +4746,11 @@ linux_nat_make_corefile_notes (bfd *obfd
+ 
+   if (get_exec_file (0))
+     {
+-      strncpy (fname, lbasename (get_exec_file (0)), sizeof (fname));
+-      strncpy (psargs, get_exec_file (0), sizeof (psargs));
+-      if (get_inferior_args ())
+-	{
+-	  char *string_end;
+-	  char *psargs_end = psargs + sizeof (psargs);
+-
+-	  /* linux_elfcore_write_prpsinfo () handles zero unterminated
+-	     strings fine.  */
+-	  string_end = memchr (psargs, 0, sizeof (psargs));
+-	  if (string_end != NULL)
+-	    {
+-	      *string_end++ = ' ';
+-	      strncpy (string_end, get_inferior_args (),
+-		       psargs_end - string_end);
+-	    }
+-	}
++      const prpsinfo_t *data = fill_prpsinfo ();
++
+       note_data = (char *) elfcore_write_prpsinfo (obfd,
+ 						   note_data,
+-						   note_size, fname, psargs);
++						   note_size, data);
+     }
+ 
+   /* Dump information for threads.  */
+Index: gdb-7.2.50.20110320/gdb/procfs.c
+===================================================================
+--- gdb-7.2.50.20110320.orig/gdb/procfs.c	2011-03-09 13:48:55.000000000 +0100
++++ gdb-7.2.50.20110320/gdb/procfs.c	2011-03-20 15:24:02.000000000 +0100
+@@ -5752,6 +5752,7 @@ procfs_make_note_section (bfd *obfd, int
+   note_data = (char *) elfcore_write_prpsinfo (obfd,
+ 					       note_data,
+ 					       note_size,
++					       NULL,
+ 					       fname,
+ 					       psargs);
+ 

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

@@ -0,0 +1,25 @@
+Index: gdb-6.8.50.20090803/gdb/valops.c
+===================================================================
+--- gdb-6.8.50.20090803.orig/gdb/valops.c	2009-08-04 06:30:45.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/valops.c	2009-08-04 06:33:05.000000000 +0200
+@@ -926,10 +926,18 @@ value_assign (struct value *toval, struc
+ 	struct gdbarch *gdbarch;
+ 	int value_reg;
+ 
+-	/* Figure out which frame this is in currently.  */
+-	frame = frame_find_by_id (VALUE_FRAME_ID (toval));
+ 	value_reg = VALUE_REGNUM (toval);
+ 
++	/* Figure out which frame this is in currently.  */
++	frame = frame_find_by_id (VALUE_FRAME_ID (toval));
++	/* "set $reg+=1" should work on programs with no debug info,
++	   but frame_find_by_id returns NULL here (RH bug 436037).
++	   Use current frame, it represents CPU state in this case.
++	   If frame_find_by_id is changed to do it internally
++	   (it is contemplated there), remove this.  */
++	if (!frame)
++	  frame = get_current_frame ();
++	/* Probably never happens.  */
+ 	if (!frame)
+ 	  error (_("Value being assigned to is no longer active."));
+ 

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

@@ -1,16 +1,8 @@
-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
+diff -up -u -X /root/jkratoch/.diffi.list -rup gdb-6.8/gdb/testsuite/gdb.threads/threaded-exec.c gdb-6.8-patched/gdb/testsuite/gdb.threads/threaded-exec.c
+--- gdb-6.8/gdb/testsuite/gdb.threads/threaded-exec.c	2008-04-16 17:05:19.000000000 -0400
++++ gdb-6.8-patched/gdb/testsuite/gdb.threads/threaded-exec.c	2008-04-16 14:43:50.000000000 -0400
 @@ -18,21 +18,95 @@
     Boston, MA 02111-1307, USA.  */
  
@@ -147,16 +139,16 @@ diff --git a/gdb/testsuite/gdb.threads/threaded-exec.c b/gdb/testsuite/gdb.threa
 +  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
+diff -up -u -X /root/jkratoch/.diffi.list -rup gdb-6.8/gdb/testsuite/gdb.threads/threaded-exec.exp gdb-6.8-patched/gdb/testsuite/gdb.threads/threaded-exec.exp
+--- gdb-6.8/gdb/testsuite/gdb.threads/threaded-exec.exp	2008-04-16 17:05:19.000000000 -0400
++++ gdb-6.8-patched/gdb/testsuite/gdb.threads/threaded-exec.exp	2008-04-16 14:42:49.000000000 -0400
 @@ -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]
+-set binfile ${objdir}/${subdir}/${testfile}
++set binfile_nothreads ${objdir}/${subdir}/${testfile}N
++set binfile_threads ${objdir}/${subdir}/${testfile}Y
  
 -if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable []] != "" } {
 +if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile_nothreads}" executable {additional_flags=-UTHREADS}] != "" } {

gdb-6.8-bz457187-largefile-test.patch

@@ -0,0 +1,105 @@
+--- /dev/null	2009-04-19 14:49:00.974648389 +0200
++++ gdb-6.8/gdb/testsuite/gdb.arch/i386-biarch-core.exp	2009-04-19 16:30:12.000000000 +0200
+@@ -0,0 +1,61 @@
++# 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 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 ability to load an elf64-i386 core file.  The provided core file was
++# elf64-x8664 one but it got binary patched to i386:
++# Elf32_Ehdr.e_machine @0x12..0x13
++# Elf64_Ehdr.e_machine @0x12..0x13
++# #define EM_386           3              /* Intel 80386 */
++# #define EM_X86_64       62              /* AMD x86-64 architecture */
++# patch @0x12: 0x3E -> 0x03
++
++if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } then {
++    verbose "Skipping i386-biarch-core test."
++    return
++}
++
++set testfile "i386-biarch-core"
++set corebz2uufile ${srcdir}/${subdir}/${testfile}.core.bz2.uu
++set corefile ${objdir}/${subdir}/${testfile}.core
++# Entry point of the original executable.
++set address 0x400078
++
++if {[catch "system \"uudecode -o - ${corebz2uufile} | bzip2 -dc >${corefile}\""] != 0} {
++    untested "failed uudecode or bzip2"
++    return -1
++}
++file stat ${corefile} corestat
++if {$corestat(size) != 102400} {
++    untested "uudecode or bzip2 produce invalid result"
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++
++# Wrongly built GDB complains by:
++# "..." is not a core dump: File format not recognized
++# As the provided test core has 64bit PRSTATUS i386 built GDB cannot parse it.
++# This is just a problem of the test care, real-world elf64-i386 file will have
++# 32bit PRSTATUS.  One cannot prepare elf64-i386 core file from elf32-i386 by
++# objcopy as it corrupts the core file beyond all recognition.
++# "\r\nCore was generated by `\[^\r\n\]*'\\.\r\nProgram terminated with signal 11, Segmentation fault\\.\r\n.*"
++gdb_test "core-file ${corefile}"
++
++gdb_test "x/i $address" "\r\n\[ \t\]*$address:\[ \t\]*hlt\[ \t\]*" ".text is readable"
+--- /dev/null	2009-04-19 14:49:00.974648389 +0200
++++ gdb-6.8/gdb/testsuite/gdb.arch/i386-biarch-core.S	2009-04-19 14:52:28.000000000 +0200
+@@ -0,0 +1,22 @@
++/* 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 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.
++ */
++
++	.globl _start
++_start:
++	hlt
+--- /dev/null	2009-04-19 14:49:00.974648389 +0200
++++ gdb-6.8/gdb/testsuite/gdb.arch/i386-biarch-core.core.bz2.uu	2009-04-19 15:02:12.000000000 +0200
+@@ -0,0 +1,13 @@
++begin 600 i386-biarch-core.core.bz2
++M0EIH.3%!629361`P1\P`!)?_____\9'@"8Q)6P380'9@'&#`0D@``"``%(``
++M@`#`"!<(L`%F"(:$GH13::F-)M&D&U,AD:`--#)M0&FT0XR9--,)D9`P(Q-&
++M",(-&F``02)%38HT]0T`&AH```'H@``T^>9T*(,("&)SE`>`9@+GP=[,N)KB
++M'I8BL(L]N5TCY\%V]/?DB.BN*UZ'U@]TN7-]UJ5\_%0QTT<*086#%MHT7XVJ
++M9D"+C!"2*L:8D1XPD!`--M@*XT1H5RFYN&)(!0P0#:`I:;2;$5M&\*9"0@%:
++MK@X[T()M)9N7`D$VA!^63)%,;@8LT`(7\K&[7G;U:"B6'!GG+46ALOZF.2F-
++M!@>C*%86X$-]C2`KE;HG)UL(913VR2G]0BD:J=Z_`G@S,`W%.8RMS-#5P:J0
++MAJ2\8&X?@DE;UF68QHM<,D`('::J65/S:PAG*R-09["8DBI)'V]Y.[(/AM*L
++M"X_O^V;%FY.S6Q]FM=D37>5F,%4-F1ZF#,CFJVU;H*^IT<(%<V`.32$`JU["
++/G`68?\7<D4X4)`0,$?,`
++`
++end

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

@@ -1,17 +1,147 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.8-bz466901-backtrace-full-prelinked.patch
-
-;; Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
-;;=fedoratest
-
 Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 
-diff --git a/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S b/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp	2009-09-09 20:10:35.000000000 +0200
+@@ -0,0 +1,102 @@
++# Copyright 2008 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++# 
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++# 
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++# Minimal DWARF-2 unit test
++
++# This test can only be run on i386/x86_64 targets which support DWARF-2.
++# For now pick a sampling of likely targets.
++if {(![istarget *-*-linux*]
++     && ![istarget *-*-gnu*]
++     && ![istarget *-*-elf*]
++     && ![istarget *-*-openbsd*])
++    || (![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"])} {
++    return 0  
++}
++
++set testfile "dw2-loclist-prelinked"
++set srcfuncfile ${testfile}-func.S
++set binsharedfuncfile ${objdir}/${subdir}/${testfile}.so
++set srcmainfile ${testfile}-main.c
++set binfile ${objdir}/${subdir}/${testfile}
++
++remote_exec build "rm -f ${binfile}"
++
++# get the value of gcc_compiled
++if [get_compiler_info ${binfile}] {
++    return -1
++}
++
++# This test can only be run on gcc as we use additional_flags=FIXME
++if {$gcc_compiled == 0} {
++    return 0
++}
++
++if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfuncfile}" "${binsharedfuncfile}" {debug additional_flags=-m32}] != "" } {
++    untested "Couldn't compile test library"
++    return -1
++}
++
++# The new separate debug info file will be stored in the .debug subdirectory.
++
++if [gdb_gnu_strip_debug ${binsharedfuncfile}] {
++    # check that you have a recent version of strip and objcopy installed
++    unsupported "cannot produce separate debug info files"
++    return -1
++}
++
++if {[catch "system \"/usr/sbin/prelink -qNR --no-exec-shield ${binsharedfuncfile}\""] != 0} {
++    # Maybe we don't have prelink.
++    return -1
++}
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcmainfile}" \
++		   "${binfile}" executable [list debug additional_flags=-m32 shlib=${binsharedfuncfile}]] != "" } {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++gdb_run_cmd
++
++gdb_test "" "Program received signal SIGABRT, Aborted..*" "Enter abort()"
++
++# Incorrect:
++# #0  0x00110430 in __kernel_vsyscall ()
++# No symbol table info available.
++# #1  0x003d44c0 in raise () from /lib/libc.so.6
++# No symbol table info available.
++# #2  0x003d5e88 in abort () from /lib/libc.so.6
++# No symbol table info available.
++# #3  0x44f10437 in func () at dw2-loclist-prelinked.c:8
++# 	i = Could not find the frame base for "func".
++
++# Correct:
++# #0  0x00110430 in __kernel_vsyscall ()
++# No symbol table info available.
++# #1  0x003d44c0 in raise () from /lib/libc.so.6
++# No symbol table info available.
++# #2  0x003d5e88 in abort () from /lib/libc.so.6
++# No symbol table info available.
++# #3  0x4ae36437 in func () at dw2-loclist-prelinked.c:8
++# 	i = 3827288
++# #4  0x0804851a in main () at ../../../gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c:24
++# No locals.
++
++# `abort' can get expressed as `*__GI_abort'.
++gdb_test "bt full" "in \[^ \]*abort \\(.*in func \\(.*\r\n\[\t \]+i = -?\[0-9\].*in main \\(.*" "Backtrace after abort()"
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c	2009-09-09 20:10:35.000000000 +0200
+@@ -0,0 +1,26 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2008 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++/* dw2-loclist-prelinked-func.S */
++extern void func (void);
++
++int
++main (void)
++{
++  func ();
++  return 0;
++}
+Index: gdb-6.8.50.20090909/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090909/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S	2009-09-09 20:10:35.000000000 +0200
 @@ -0,0 +1,328 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -341,141 +471,3 @@ new file mode 100644
 +	.string	"short int"
 +	.ident	"GCC: (GNU) 4.3.2 20081007 (Red Hat 4.3.2-6)"
 +	.section	.note.GNU-stack,"",@progbits
-diff --git a/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c b/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c
-@@ -0,0 +1,26 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2008 Free Software Foundation, Inc.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+/* dw2-loclist-prelinked-func.S */
-+extern void func (void);
-+
-+int
-+main (void)
-+{
-+  func ();
-+  return 0;
-+}
-diff --git a/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp b/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp
-@@ -0,0 +1,102 @@
-+# Copyright 2008 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+# 
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+# 
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+# Minimal DWARF-2 unit test
-+
-+# This test can only be run on i386/x86_64 targets which support DWARF-2.
-+# For now pick a sampling of likely targets.
-+if {(![istarget *-*-linux*]
-+     && ![istarget *-*-gnu*]
-+     && ![istarget *-*-elf*]
-+     && ![istarget *-*-openbsd*])
-+    || (![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"])} {
-+    return 0  
-+}
-+
-+set testfile "dw2-loclist-prelinked"
-+set srcfuncfile ${testfile}-func.S
-+set binsharedfuncfile [standard_output_file ${testfile}.so]
-+set srcmainfile ${testfile}-main.c
-+set binfile [standard_output_file ${testfile}]
-+
-+remote_exec build "rm -f ${binfile}"
-+
-+# get the value of gcc_compiled
-+if [get_compiler_info ${binfile}] {
-+    return -1
-+}
-+
-+# This test can only be run on gcc as we use additional_flags=FIXME
-+if {$gcc_compiled == 0} {
-+    return 0
-+}
-+
-+if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfuncfile}" "${binsharedfuncfile}" {debug additional_flags=-m32}] != "" } {
-+    untested "Couldn't compile test library"
-+    return -1
-+}
-+
-+# The new separate debug info file will be stored in the .debug subdirectory.
-+
-+if [gdb_gnu_strip_debug ${binsharedfuncfile}] {
-+    # check that you have a recent version of strip and objcopy installed
-+    unsupported "cannot produce separate debug info files"
-+    return -1
-+}
-+
-+if {[catch "system \"/usr/sbin/prelink -qNR --no-exec-shield ${binsharedfuncfile}\""] != 0} {
-+    # Maybe we don't have prelink.
-+    return -1
-+}
-+
-+if  { [gdb_compile "${srcdir}/${subdir}/${srcmainfile}" \
-+		   "${binfile}" executable [list debug additional_flags=-m32 shlib=${binsharedfuncfile}]] != "" } {
-+    return -1
-+}
-+
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
-+gdb_load ${binfile}
-+
-+gdb_run_cmd
-+
-+gdb_test "" "Program received signal SIGABRT, Aborted..*" "Enter abort()"
-+
-+# Incorrect:
-+# #0  0x00110430 in __kernel_vsyscall ()
-+# No symbol table info available.
-+# #1  0x003d44c0 in raise () from /lib/libc.so.6
-+# No symbol table info available.
-+# #2  0x003d5e88 in abort () from /lib/libc.so.6
-+# No symbol table info available.
-+# #3  0x44f10437 in func () at dw2-loclist-prelinked.c:8
-+# 	i = Could not find the frame base for "func".
-+
-+# Correct:
-+# #0  0x00110430 in __kernel_vsyscall ()
-+# No symbol table info available.
-+# #1  0x003d44c0 in raise () from /lib/libc.so.6
-+# No symbol table info available.
-+# #2  0x003d5e88 in abort () from /lib/libc.so.6
-+# No symbol table info available.
-+# #3  0x4ae36437 in func () at dw2-loclist-prelinked.c:8
-+# 	i = 3827288
-+# #4  0x0804851a in main () at ../../../gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c:24
-+# No locals.
-+
-+# `abort' can get expressed as `*__GI_abort'.
-+gdb_test "bt full" "in \[^ \]*abort \\(.*in func \\(.*\r\n\[\t \]+i = -?\[0-9\].*in main \\(.*" "Backtrace after abort()"

gdb-6.8-quit-never-aborts.patch

@@ -1,11 +1,3 @@
-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.
 
@@ -13,66 +5,68 @@ 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;
+Index: gdb-7.2.50.20110117/gdb/defs.h
+===================================================================
+--- gdb-7.2.50.20110117.orig/gdb/defs.h	2011-01-17 15:47:37.000000000 +0100
++++ gdb-7.2.50.20110117/gdb/defs.h	2011-01-17 15:53:05.000000000 +0100
+@@ -165,6 +165,7 @@ extern char *python_libdir;
+ extern char *debug_file_directory;
  
-+#ifdef NEED_DETACH_SIGSTOP
+ extern int quit_flag;
 +extern int quit_flag_cleanup;
-+#endif
-+
- extern void quit (void);
+ extern int immediate_quit;
+ extern int sevenbit_strings;
  
- /* 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;
+@@ -178,7 +179,7 @@ extern void quit (void);
+    needed.  */
  
-+#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;
+ #define QUIT { \
+-  if (quit_flag) quit (); \
++  if (quit_flag && !quit_flag_cleanup) quit (); \
+   if (deprecated_interactive_hook) deprecated_interactive_hook (); \
+ }
  
-+#ifndef NEED_DETACH_SIGSTOP
-   /* We want to handle any quit errors and exit regardless.  */
-+#else
+Index: gdb-7.2.50.20110117/gdb/event-top.c
+===================================================================
+--- gdb-7.2.50.20110117.orig/gdb/event-top.c	2011-01-17 15:52:39.000000000 +0100
++++ gdb-7.2.50.20110117/gdb/event-top.c	2011-01-17 15:52:49.000000000 +0100
+@@ -904,7 +904,7 @@ async_request_quit (gdb_client_data arg)
+      is no reason to call quit again here, unless immediate_quit is
+      set.  */
+ 
+-  if (quit_flag || immediate_quit)
++  if ((quit_flag || immediate_quit) && !quit_flag_cleanup)
+     quit ();
+ }
+ 
+Index: gdb-7.2.50.20110117/gdb/top.c
+===================================================================
+--- gdb-7.2.50.20110117.orig/gdb/top.c	2011-01-17 15:47:37.000000000 +0100
++++ gdb-7.2.50.20110117/gdb/top.c	2011-01-17 15:52:49.000000000 +0100
+@@ -1257,7 +1257,9 @@ quit_force (char *args, int from_tty)
+   qt.args = args;
+   qt.from_tty = from_tty;
+ 
+-  /* We want to handle any quit errors and exit regardless.  */
 +  /* 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
+   catch_errors (quit_target, &qt,
+ 	        "Quitting: ", RETURN_MASK_ALL);
  
-   /* 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;
+Index: gdb-7.2.50.20110117/gdb/utils.c
+===================================================================
+--- gdb-7.2.50.20110117.orig/gdb/utils.c	2011-01-17 15:47:37.000000000 +0100
++++ gdb-7.2.50.20110117/gdb/utils.c	2011-01-17 15:52:49.000000000 +0100
+@@ -121,6 +121,11 @@ int job_control;
  
- static bool debug_timestamp = false;
+ int quit_flag;
  
-+#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.)  */
+ /* Nonzero means quit immediately if Control-C is typed now, rather
+    than waiting until QUIT is executed.  Be careful in setting this;
+    code which executes with immediate_quit set has to be very careful

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

@@ -0,0 +1,12 @@
+Index: gdb-7.4.50.20111218/gdb/sparc-tdep.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/sparc-tdep.c	2011-09-28 19:59:42.000000000 +0200
++++ gdb-7.4.50.20111218/gdb/sparc-tdep.c	2011-12-19 01:25:29.294046199 +0100
+@@ -1316,6 +1316,7 @@ sparc32_store_return_value (struct type
+   if (sparc_floating_p (type) || sparc_complex_floating_p (type))
+     {
+       /* Floating return values.  */
++      len = (len <= 8) ? len : 8;
+       memcpy (buf, valbuf, len);
+       regcache_cooked_write (regcache, SPARC_F0_REGNUM, buf);
+       if (len > 4)

gdb-6.8-watchpoint-conditionals-test.patch

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

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

@@ -0,0 +1,51 @@
+Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
+===================================================================
+--- gdb-7.3.50.20110722.orig/gdb/dwarf2read.c	2011-07-22 19:37:15.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/dwarf2read.c	2011-07-22 19:44:42.000000000 +0200
+@@ -67,12 +67,14 @@
+ #ifdef HAVE_ZLIB_H
+ #include <zlib.h>
+ #endif
++#ifndef __sparc__
+ #ifdef HAVE_MMAP
+ #include <sys/mman.h>
+ #ifndef MAP_FAILED
+ #define MAP_FAILED ((void *) -1)
+ #endif
+ #endif
++#endif
+ 
+ typedef struct symbol *symbolp;
+ DEF_VEC_P (symbolp);
+@@ -1618,6 +1620,7 @@ dwarf2_read_section (struct objfile *obj
+         }
+     }
+ 
++#ifndef __sparc__
+ #ifdef HAVE_MMAP
+   if (pagesize == 0)
+     pagesize = getpagesize ();
+@@ -1641,6 +1644,7 @@ dwarf2_read_section (struct objfile *obj
+ 	}
+     }
+ #endif
++#endif
+ 
+   /* If we get here, we are a normal, not-compressed section.  */
+   info->buffer = buf
+@@ -15983,6 +15987,7 @@ munmap_section_buffer (struct dwarf2_sec
+ {
+   if (info->map_addr != NULL)
+     {
++#ifndef __sparc__
+ #ifdef HAVE_MMAP
+       int res;
+ 
+@@ -15992,6 +15997,7 @@ munmap_section_buffer (struct dwarf2_sec
+       /* Without HAVE_MMAP, we should never be here to begin with.  */
+       gdb_assert_not_reached ("no mmap support");
+ #endif
++#endif
+     }
+ }
+ 

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

@@ -1,18 +1,8 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-archer-next-over-throw-cxx-exec.patch
-
-;; Fix follow-exec for C++ programs (bugreported by Martin Stransky).
-;;=fedoratest
-
 Archer-upstreamed:
 http://sourceware.org/ml/archer/2010-q2/msg00031.html
 
-diff --git a/gdb/testsuite/gdb.cp/cxxexec.cc b/gdb/testsuite/gdb.cp/cxxexec.cc
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/cxxexec.cc
+--- ./gdb/testsuite/gdb.cp/cxxexec.cc	1970-01-01 01:00:00.000000000 +0100
++++ ./gdb/testsuite/gdb.cp/cxxexec.cc	2010-05-29 01:18:56.000000000 +0200
 @@ -0,0 +1,25 @@
 +/* This test script is part of GDB, the GNU debugger.
 +
@@ -39,11 +29,9 @@ new file mode 100644
 +  execlp ("true", "true", NULL);
 +  return 1;
 +}
-diff --git a/gdb/testsuite/gdb.cp/cxxexec.exp b/gdb/testsuite/gdb.cp/cxxexec.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/cxxexec.exp
-@@ -0,0 +1,42 @@
+--- ./gdb/testsuite/gdb.cp/cxxexec.exp	1970-01-01 01:00:00.000000000 +0100
++++ ./gdb/testsuite/gdb.cp/cxxexec.exp	2010-05-29 01:29:25.000000000 +0200
+@@ -0,0 +1,51 @@
 +# Copyright 2010 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -83,6 +71,15 @@ new file mode 100644
 +    }
 +}
 +
-+# Run to end.  The buggy GDB failed instead with:
-+#  Cannot access memory at address ADDR.
-+gdb_continue_to_end "" "continue" 1
++set test continue
++gdb_test_multiple $test $test {
++    -re "Cannot access memory at address 0x\[0-9a-f\]+\r\n$gdb_prompt $" {
++	fail $test
++    }
++    -re "\r\n$gdb_prompt $" {
++	pass $test
++    }
++}
++
++# `info inferiors' can show <null> on older GDBs.
++gdb_test "info threads" "info threads" "program finished"

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

@@ -1,19 +1,12 @@
-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;
+Index: gdb-7.4.50.20120103/gdb/breakpoint.c
+===================================================================
+--- gdb-7.4.50.20120103.orig/gdb/breakpoint.c	2012-01-03 05:52:15.000000000 +0100
++++ gdb-7.4.50.20120103/gdb/breakpoint.c	2012-01-03 15:22:56.105405559 +0100
+@@ -13724,6 +13724,50 @@ initialize_breakpoint_ops (void)
+ }
  
- cmd_list_element *commands_cmd_element = nullptr;
- 
-+void
-+breakpoints_relocate (struct objfile *objfile, section_offsets &delta)
+ void
++breakpoints_relocate (struct objfile *objfile, struct section_offsets *delta)
 +{
 +  struct bp_location *bl, **blp_tmp;
 +  int changed = 0;
@@ -32,7 +25,7 @@ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
 +	  CORE_ADDR relocated_address;
 +	  CORE_ADDR delta_offset;
 +
-+	  delta_offset = delta[osect->the_bfd_section->index];
++	  delta_offset = ANOFFSET (delta, osect->the_bfd_section->index);
 +	  if (delta_offset == 0)
 +	    continue;
 +	  relocated_address = bl->address + delta_offset;
@@ -41,7 +34,7 @@ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
 +	      && relocated_address < obj_section_endaddr (osect))
 +	    {
 +	      if (bl->inserted)
-+		remove_breakpoint (bl);
++		remove_breakpoint (bl, mark_uninserted);
 +
 +	      bl->address += delta_offset;
 +	      bl->requested_address += delta_offset;
@@ -52,32 +45,33 @@ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
 +    }
 +
 +  if (changed)
-+    std::sort (bp_locations, bp_locations + bp_locations_count,
-+	       bp_location_is_less_than);
++    qsort (bp_location, bp_location_count, sizeof (*bp_location),
++	   bp_location_compare);
 +}
 +
- 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);
++void
+ _initialize_breakpoint (void)
+ {
+   struct cmd_list_element *c;
+Index: gdb-7.4.50.20120103/gdb/breakpoint.h
+===================================================================
+--- gdb-7.4.50.20120103.orig/gdb/breakpoint.h	2012-01-03 05:52:15.000000000 +0100
++++ gdb-7.4.50.20120103/gdb/breakpoint.h	2012-01-03 15:23:09.444356484 +0100
+@@ -1393,4 +1393,7 @@ extern struct gdbarch *get_sal_arch (str
+ 
+ extern void modify_semaphore (struct bp_location *location, int set);
  
 +extern void breakpoints_relocate (struct objfile *objfile,
-+				  section_offsets &delta);
++				  struct section_offsets *delta);
 +
- /* Print the specified breakpoint.  */
- extern void print_breakpoint (breakpoint *bp);
- 
-diff --git a/gdb/objfiles.c b/gdb/objfiles.c
---- a/gdb/objfiles.c
-+++ b/gdb/objfiles.c
-@@ -742,6 +742,11 @@ objfile_relocate1 (struct objfile *objfile,
- 				obj_section_addr (s));
-     }
+ #endif /* !defined (BREAKPOINT_H) */
+Index: gdb-7.4.50.20120103/gdb/objfiles.c
+===================================================================
+--- gdb-7.4.50.20120103.orig/gdb/objfiles.c	2012-01-03 05:52:15.000000000 +0100
++++ gdb-7.4.50.20120103/gdb/objfiles.c	2012-01-03 15:23:28.141287697 +0100
+@@ -818,6 +818,11 @@ objfile_relocate1 (struct objfile *objfi
+     objfile->sf->sym_probe_fns->sym_relocate_probe (objfile,
+ 						    new_offsets, delta);
  
 +  /* Final call of breakpoint_re_set can keep breakpoint locations disabled if
 +     their addresses match.  */

gdb-archer-pie-addons.patch

@@ -1,39 +1,135 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-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
+Index: gdb-7.4.50.20111218/gdb/dwarf2read.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/dwarf2read.c	2011-12-19 01:31:24.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/dwarf2read.c	2011-12-19 01:33:25.263238972 +0100
+@@ -8347,7 +8347,12 @@ read_common_block (struct die_info *die,
+ {
+   struct attribute *attr;
+   struct symbol *sym;
+-  CORE_ADDR base = (CORE_ADDR) 0;
++  struct objfile *objfile = cu->objfile;
++  CORE_ADDR baseaddr = ANOFFSET (objfile->section_offsets,
++				 SECT_OFF_TEXT (objfile));
++  /* This is used only for DW_AT_data_member_location entries.  */
++  CORE_ADDR base = 0;
++  int base_p = 0;
+ 
+   attr = dwarf2_attr (die, DW_AT_location, cu);
+   if (attr)
+@@ -8356,6 +8361,7 @@ read_common_block (struct die_info *die,
+       if (attr_form_is_block (attr))
+         {
+           base = decode_locdesc (DW_BLOCK (attr), cu);
++	  base_p = 1;
+         }
+       else if (attr_form_is_section_offset (attr))
+         {
+@@ -8408,12 +8414,15 @@ read_common_block (struct die_info *die,
+ 	  if (sym != NULL
+ 	      && handle_data_member_location (child_die, cu, &offset))
+ 	    {
+-	      SYMBOL_VALUE_ADDRESS (sym) = base + offset;
++	      if (!base_p)
++		dwarf2_invalid_attrib_class_complaint
++		  ("DW_AT_data_member_location", "common block member");
++	      SYMBOL_VALUE_ADDRESS (sym) = base + offset + baseaddr;
+ 	      add_symbol_to_list (sym, &global_symbols);
+ 	    }
+ 
+ 	  if (SYMBOL_CLASS (sym) == LOC_STATIC)
+-	    SET_FIELD_PHYSADDR (*field, SYMBOL_VALUE_ADDRESS (sym));
++	    SET_FIELD_PHYSADDR (*field, SYMBOL_VALUE_ADDRESS (sym) - baseaddr);
+ 	  else
+ 	    SET_FIELD_PHYSNAME (*field, SYMBOL_LINKAGE_NAME (sym));
+ 	  FIELD_TYPE (*field) = SYMBOL_TYPE (sym);
+@@ -8427,7 +8436,7 @@ read_common_block (struct die_info *die,
+ 
+       sym = new_symbol (die, type, cu);
+       /* SYMBOL_VALUE_ADDRESS never gets used as all its fields are static.  */
+-      SYMBOL_VALUE_ADDRESS (sym) = base;
++      SYMBOL_VALUE_ADDRESS (sym) = base + baseaddr;
+ 
+       set_die_type (die, type, cu);
+     }
+Index: gdb-7.4.50.20111218/gdb/gdbtypes.h
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/gdbtypes.h	2011-12-18 23:35:23.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/gdbtypes.h	2011-12-19 01:34:21.448025620 +0100
+@@ -396,6 +396,7 @@ enum type_instance_flag_value
+ enum field_loc_kind
    {
-     FIELD_LOC_KIND_BITPOS,	/**< bitpos */
-     FIELD_LOC_KIND_ENUMVAL,	/**< enumval */
+     FIELD_LOC_KIND_BITPOS,	/* bitpos */
 +    /* 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.  */
+     FIELD_LOC_KIND_PHYSADDR,	/* physaddr */
+     FIELD_LOC_KIND_PHYSNAME,	/* physname */
+     FIELD_LOC_KIND_DWARF_BLOCK	/* dwarf_block */
+@@ -581,6 +582,7 @@ struct main_type
+ 	   is the location (in the target) of the static 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;
++	/* 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)
+@@ -1194,6 +1196,7 @@ extern void allocate_gnat_aux_type (stru
+ #define FIELD_LOC_KIND(thisfld) ((thisfld).loc_kind)
+ #define FIELD_BITPOS(thisfld) ((thisfld).loc.bitpos)
+ #define FIELD_STATIC_PHYSNAME(thisfld) ((thisfld).loc.physname)
++/* This address is unrelocated by the objfile's ANOFFSET.  */
+ #define FIELD_STATIC_PHYSADDR(thisfld) ((thisfld).loc.physaddr)
+ #define FIELD_DWARF_BLOCK(thisfld) ((thisfld).loc.dwarf_block)
+ #define SET_FIELD_BITPOS(thisfld, bitpos)			\
+@@ -1202,6 +1205,7 @@ extern void allocate_gnat_aux_type (stru
+ #define SET_FIELD_PHYSNAME(thisfld, name)			\
+   (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSNAME,		\
+    FIELD_STATIC_PHYSNAME (thisfld) = (name))
++/* This address is unrelocated by the objfile's ANOFFSET.  */
+ #define SET_FIELD_PHYSADDR(thisfld, addr)			\
+   (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSADDR,		\
+    FIELD_STATIC_PHYSADDR (thisfld) = (addr))
+@@ -1217,6 +1221,7 @@ extern void allocate_gnat_aux_type (stru
+ #define TYPE_FIELD_LOC_KIND(thistype, n) FIELD_LOC_KIND (TYPE_FIELD (thistype, n))
+ #define TYPE_FIELD_BITPOS(thistype, n) FIELD_BITPOS (TYPE_FIELD (thistype, n))
+ #define TYPE_FIELD_STATIC_PHYSNAME(thistype, n) FIELD_STATIC_PHYSNAME (TYPE_FIELD (thistype, n))
++/* This address is unrelocated by the objfile's ANOFFSET.  */
+ #define TYPE_FIELD_STATIC_PHYSADDR(thistype, n) FIELD_STATIC_PHYSADDR (TYPE_FIELD (thistype, n))
+ #define TYPE_FIELD_DWARF_BLOCK(thistype, n) FIELD_DWARF_BLOCK (TYPE_FIELD (thistype, n))
+ #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL(TYPE_FIELD(thistype,n))
+Index: gdb-7.4.50.20111218/gdb/jv-lang.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/jv-lang.c	2011-12-06 19:54:39.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/jv-lang.c	2011-12-19 01:33:25.280238908 +0100
+@@ -430,7 +430,8 @@ java_link_class_type (struct gdbarch *gd
+ 
+   fields = NULL;
+   nfields--;			/* First set up dummy "class" field.  */
+-  SET_FIELD_PHYSADDR (TYPE_FIELD (type, nfields), value_address (clas));
++  SET_FIELD_PHYSADDR (TYPE_FIELD (type, nfields), value_address (clas)
++    - (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));
+   TYPE_FIELD_NAME (type, nfields) = "class";
+   TYPE_FIELD_TYPE (type, nfields) = value_type (clas);
+   SET_TYPE_FIELD_PRIVATE (type, nfields);
+@@ -478,7 +479,8 @@ java_link_class_type (struct gdbarch *gd
+ 	  SET_TYPE_FIELD_PROTECTED (type, i);
+ 	}
+       if (accflags & 0x0008)	/* ACC_STATIC */
+-	SET_FIELD_PHYSADDR (TYPE_FIELD (type, i), boffset);
++	SET_FIELD_PHYSADDR (TYPE_FIELD (type, i), boffset
++	  - (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));
+       else
+ 	TYPE_FIELD_BITPOS (type, i) = 8 * boffset;
+       if (accflags & 0x8000)	/* FIELD_UNRESOLVED_FLAG */
+Index: gdb-7.4.50.20111218/gdb/value.c
+===================================================================
+--- gdb-7.4.50.20111218.orig/gdb/value.c	2011-12-18 23:35:23.000000000 +0100
++++ gdb-7.4.50.20111218/gdb/value.c	2011-12-19 01:33:25.283238896 +0100
+@@ -2481,7 +2481,8 @@ value_static_field (struct type *type, i
      {
      case FIELD_LOC_KIND_PHYSADDR:
-       retval = value_at_lazy (type->field (fieldno).type (),
+       retval = value_at_lazy (TYPE_FIELD_TYPE (type, fieldno),
 -			      TYPE_FIELD_STATIC_PHYSADDR (type, fieldno));
 +			      TYPE_FIELD_STATIC_PHYSADDR (type, fieldno)
-+			      + (TYPE_OBJFILE (type) == NULL ? 0 : TYPE_OBJFILE (type)->section_offsets[SECT_OFF_TEXT (TYPE_OBJFILE (type))]));
++			      + (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));
        break;
      case FIELD_LOC_KIND_PHYSNAME:
      {

gdb-archer-vla-rhel5gcc.patch

@@ -0,0 +1,34 @@
+commit a999ae2c722b366b94987941f0ce899f95e8d679
+Author: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date:   Fri Mar 2 22:08:49 2012 +0100
+
+    Fix crash for gdb.fortran/dynamic.exp with gcc-gfortran-4.1.2-51.el5.x86_64.
+
+--- a/gdb/valops.c
++++ b/gdb/valops.c
+@@ -1037,7 +1037,8 @@ int
+ value_fetch_lazy (struct value *val)
+ {
+   gdb_assert (value_lazy (val));
+-  allocate_value_contents (val);
++  if (VALUE_LVAL (val) != lval_memory)
++    allocate_value_contents (val);
+   if (value_bitsize (val))
+     {
+       /* To read a lazy bitfield, read the entire enclosing value.  This
+@@ -1080,11 +1081,15 @@ value_fetch_lazy (struct value *val)
+ 
+ 	  if (length)
+ 	    {
++	      /* Delay it after object_address_get_data above.  */
++	      allocate_value_contents (val);
+ 	      addr += value_offset (val);
+ 	      read_value_memory (val, 0, value_stack (val),
+ 				 addr, value_contents_all_raw (val), length);
+ 	    }
+ 	}
++      /* Just to be sure it has been called.  */
++      allocate_value_contents (val);
+     }
+   else if (VALUE_LVAL (val) == lval_register)
+     {

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

@@ -0,0 +1,88 @@
+http://sourceware.org/ml/gdb-cvs/2012-02/msg00180.html
+
+### src/gdb/gdbserver/ChangeLog	2012/02/25 19:54:50	1.556
+### src/gdb/gdbserver/ChangeLog	2012/02/27 16:19:19	1.557
+## -1,3 +1,9 @@
++2012-02-27  Pedro Alves  <palves@redhat.com>
++
++	PR server/9684
++	* linux-low.c (pid_is_stopped): New.
++	(linux_attach_lwp_1): Handle attaching to 'T (stopped)' processes.
++
+ 2012-02-25  Luis Machado  <lgustavo@codesourcery.com>
+ 
+ 	* mem-break.c (clear_gdb_breakpoint_conditions): Fix de-allocation
+--- src/gdb/gdbserver/linux-low.c	2012/02/24 15:15:56	1.193
++++ src/gdb/gdbserver/linux-low.c	2012/02/27 16:19:19	1.194
+@@ -598,6 +598,37 @@
+   return pid;
+ }
+ 
++/* Detect `T (stopped)' in `/proc/PID/status'.
++   Other states including `T (tracing stop)' are reported as false.  */
++
++static int
++pid_is_stopped (pid_t pid)
++{
++  FILE *status_file;
++  char buf[100];
++  int retval = 0;
++
++  snprintf (buf, sizeof (buf), "/proc/%d/status", (int) pid);
++  status_file = fopen (buf, "r");
++  if (status_file != NULL)
++    {
++      int have_state = 0;
++
++      while (fgets (buf, sizeof (buf), status_file))
++	{
++	  if (strncmp (buf, "State:", 6) == 0)
++	    {
++	      have_state = 1;
++	      break;
++	    }
++	}
++      if (have_state && strstr (buf, "T (stopped)") != NULL)
++	retval = 1;
++      fclose (status_file);
++    }
++  return retval;
++}
++
+ /* Attach to an inferior process.  */
+ 
+ static void
+@@ -643,6 +674,33 @@
+      ptrace call on this LWP.  */
+   new_lwp->must_set_ptrace_flags = 1;
+ 
++  if (pid_is_stopped (lwpid))
++    {
++      if (debug_threads)
++	fprintf (stderr,
++		 "Attached to a stopped process\n");
++
++      /* The process is definitely stopped.  It is in a job control
++	 stop, unless the kernel predates the TASK_STOPPED /
++	 TASK_TRACED distinction, in which case it might be in a
++	 ptrace stop.  Make sure it is in a ptrace stop; from there we
++	 can kill it, signal it, et cetera.
++
++	 First make sure there is a pending SIGSTOP.  Since we are
++	 already attached, the process can not transition from stopped
++	 to running without a PTRACE_CONT; so we know this signal will
++	 go into the queue.  The SIGSTOP generated by PTRACE_ATTACH is
++	 probably already in the queue (unless this kernel is old
++	 enough to use TASK_STOPPED for ptrace stops); but since
++	 SIGSTOP is not an RT signal, it can only be queued once.  */
++      kill_lwp (lwpid, SIGSTOP);
++
++      /* Finally, resume the stopped process.  This will deliver the
++	 SIGSTOP (or a higher priority signal, just like normal
++	 PTRACE_ATTACH), which we'll catch later on.  */
++      ptrace (PTRACE_CONT, lwpid, 0, 0);
++    }
++
+   /* The next time we wait for this LWP we'll see a SIGSTOP as PTRACE_ATTACH
+      brings it to a halt.
+ 

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

@@ -0,0 +1,178 @@
+http://sourceware.org/ml/gdb-cvs/2012-02/msg00181.html
+
+### src/gdb/ChangeLog	2012/02/24 23:48:37	1.13869
+### src/gdb/ChangeLog	2012/02/27 16:22:06	1.13870
+## -1,3 +1,13 @@
++2012-02-27  Pedro Alves  <palves@redhat.com>
++
++	* linux-nat.c (pid_is_stopped): Delete, moved to common/.
++	(linux_nat_post_attach_wait): Adjust to use
++	linux_proc_pid_is_stopped.
++	* common/linux-procfs.h (linux_proc_pid_is_stopped): Declare.
++	* common/linux-procfs.c (linux_proc_pid_is_stopped): New function,
++	based on pid_is_stopped from both linux-nat.c and
++	gdbserver/linux-low.c, and renamed.
++
+ 2012-02-24  Maciej W. Rozycki  <macro@codesourcery.com>
+ 
+ 	* remote.c (remote_watchpoint_addr_within_range): New function.
+--- src/gdb/linux-nat.c	2012/02/16 21:07:20	1.239
++++ src/gdb/linux-nat.c	2012/02/27 16:22:13	1.240
+@@ -1356,37 +1356,6 @@
+   delete_lwp (lp->ptid);
+ }
+ 
+-/* Detect `T (stopped)' in `/proc/PID/status'.
+-   Other states including `T (tracing stop)' are reported as false.  */
+-
+-static int
+-pid_is_stopped (pid_t pid)
+-{
+-  FILE *status_file;
+-  char buf[100];
+-  int retval = 0;
+-
+-  snprintf (buf, sizeof (buf), "/proc/%d/status", (int) pid);
+-  status_file = fopen (buf, "r");
+-  if (status_file != NULL)
+-    {
+-      int have_state = 0;
+-
+-      while (fgets (buf, sizeof (buf), status_file))
+-	{
+-	  if (strncmp (buf, "State:", 6) == 0)
+-	    {
+-	      have_state = 1;
+-	      break;
+-	    }
+-	}
+-      if (have_state && strstr (buf, "T (stopped)") != NULL)
+-	retval = 1;
+-      fclose (status_file);
+-    }
+-  return retval;
+-}
+-
+ /* Wait for the LWP specified by LP, which we have just attached to.
+    Returns a wait status for that LWP, to cache.  */
+ 
+@@ -1397,7 +1366,7 @@
+   pid_t new_pid, pid = GET_LWP (ptid);
+   int status;
+ 
+-  if (pid_is_stopped (pid))
++  if (linux_proc_pid_is_stopped (pid))
+     {
+       if (debug_linux_nat)
+ 	fprintf_unfiltered (gdb_stdlog,
+--- src/gdb/common/linux-procfs.c	2012/01/04 08:17:18	1.2
++++ src/gdb/common/linux-procfs.c	2012/02/27 16:22:14	1.3
+@@ -53,3 +53,34 @@
+ 
+   return tgid;
+ }
++
++/* Detect `T (stopped)' in `/proc/PID/status'.
++   Other states including `T (tracing stop)' are reported as false.  */
++
++int
++linux_proc_pid_is_stopped (pid_t pid)
++{
++  FILE *status_file;
++  char buf[100];
++  int retval = 0;
++
++  snprintf (buf, sizeof (buf), "/proc/%d/status", (int) pid);
++  status_file = fopen (buf, "r");
++  if (status_file != NULL)
++    {
++      int have_state = 0;
++
++      while (fgets (buf, sizeof (buf), status_file))
++	{
++	  if (strncmp (buf, "State:", 6) == 0)
++	    {
++	      have_state = 1;
++	      break;
++	    }
++	}
++      if (have_state && strstr (buf, "T (stopped)") != NULL)
++	retval = 1;
++      fclose (status_file);
++    }
++  return retval;
++}
+--- src/gdb/common/linux-procfs.h	2012/01/04 08:17:18	1.2
++++ src/gdb/common/linux-procfs.h	2012/02/27 16:22:15	1.3
+@@ -26,4 +26,9 @@
+ 
+ extern int linux_proc_get_tgid (int lwpid);
+ 
++/* Detect `T (stopped)' in `/proc/PID/status'.
++   Other states including `T (tracing stop)' are reported as false.  */
++
++extern int linux_proc_pid_is_stopped (pid_t pid);
++
+ #endif /* COMMON_LINUX_PROCFS_H */
+### src/gdb/gdbserver/ChangeLog	2012/02/27 16:19:19	1.557
+### src/gdb/gdbserver/ChangeLog	2012/02/27 16:22:15	1.558
+## -1,5 +1,10 @@
+ 2012-02-27  Pedro Alves  <palves@redhat.com>
+ 
++	* linux-low.c (pid_is_stopped): Delete, moved to common/.
++	(linux_attach_lwp_1): Adjust to use linux_proc_pid_is_stopped.
++
++2012-02-27  Pedro Alves  <palves@redhat.com>
++
+ 	PR server/9684
+ 	* linux-low.c (pid_is_stopped): New.
+ 	(linux_attach_lwp_1): Handle attaching to 'T (stopped)' processes.
+--- src/gdb/gdbserver/linux-low.c	2012/02/27 16:19:19	1.194
++++ src/gdb/gdbserver/linux-low.c	2012/02/27 16:22:16	1.195
+@@ -598,37 +598,6 @@
+   return pid;
+ }
+ 
+-/* Detect `T (stopped)' in `/proc/PID/status'.
+-   Other states including `T (tracing stop)' are reported as false.  */
+-
+-static int
+-pid_is_stopped (pid_t pid)
+-{
+-  FILE *status_file;
+-  char buf[100];
+-  int retval = 0;
+-
+-  snprintf (buf, sizeof (buf), "/proc/%d/status", (int) pid);
+-  status_file = fopen (buf, "r");
+-  if (status_file != NULL)
+-    {
+-      int have_state = 0;
+-
+-      while (fgets (buf, sizeof (buf), status_file))
+-	{
+-	  if (strncmp (buf, "State:", 6) == 0)
+-	    {
+-	      have_state = 1;
+-	      break;
+-	    }
+-	}
+-      if (have_state && strstr (buf, "T (stopped)") != NULL)
+-	retval = 1;
+-      fclose (status_file);
+-    }
+-  return retval;
+-}
+-
+ /* Attach to an inferior process.  */
+ 
+ static void
+@@ -674,7 +643,7 @@
+      ptrace call on this LWP.  */
+   new_lwp->must_set_ptrace_flags = 1;
+ 
+-  if (pid_is_stopped (lwpid))
++  if (linux_proc_pid_is_stopped (lwpid))
+     {
+       if (debug_threads)
+ 	fprintf (stderr,

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

@@ -0,0 +1,583 @@
+http://sourceware.org/ml/gdb-patches/2012-03/msg00169.html
+Subject: [patch 1/3] attach-fail-reasons: Reshuffle code
+
+Hi,
+
+this patch does not make sense on its own but it contains all the
+uninteresting code moves / reconfigurations.
+
+
+Thanks,
+Jan
+
+
+gdb/
+2012-03-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* Makefile.in (linux-ptrace.o): New.
+	* common/linux-procfs.c (linux_proc_pid_is_zombie): New,
+	from linux-nat.c.
+	* common/linux-procfs.h (linux_proc_pid_is_zombie): New declaration.
+	* common/linux-ptrace.c: New file.
+	* config/alpha/alpha-linux.mh (NATDEPFILES): Add linux-ptrace.o.
+	* config/arm/linux.mh: Likewise.
+	* config/i386/linux.mh: Likewise.
+	* config/i386/linux64.mh: Likewise.
+	* config/ia64/linux.mh: Likewise.
+	* config/m32r/linux.mh: Likewise.
+	* config/m68k/linux.mh: Likewise.
+	* config/mips/linux.mh: Likewise.
+	* config/pa/linux.mh: Likewise.
+	* config/powerpc/linux.mh: Likewise.
+	* config/powerpc/ppc64-linux.mh: Likewise.
+	* config/powerpc/spu-linux.mh: Likewise.
+	* config/s390/s390.mh: Likewise.
+	* config/sparc/linux.mh: Likewise.
+	* config/sparc/linux64.mh: Likewise.
+	* config/xtensa/linux.mh: Likewise.
+	* linux-nat.c (linux_lwp_is_zombie): Remove, move it to
+	common/linux-procfs.c.
+	(wait_lwp): Rename linux_lwp_is_zombie to linux_proc_pid_is_zombie.
+
+gdb/gdbserver/
+2012-03-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* Makefile.in (linux-ptrace.o): New.
+	* configure.srv (arm*-*-linux*, bfin-*-*linux*, crisv32-*-linux*)
+	(cris-*-linux*, i[34567]86-*-linux*, ia64-*-linux*, m32r*-*-linux*)
+	(m68*-*-linux*, m68*-*-uclinux*, mips*-*-linux*, powerpc*-*-linux*)
+	(s390*-*-linux*, sh*-*-linux*, sparc*-*-linux*, tic6x-*-uclinux)
+	(x86_64-*-linux*, xtensa*-*-linux*): Add linux-ptrace.o to SRV_TGTOBJ
+	of these targets.
+	* linux-low.c (linux_attach_lwp_1): Remove redundent else clause.
+
+Index: gdb-7.4.50.20120120/gdb/Makefile.in
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/Makefile.in	2012-03-06 07:39:41.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/Makefile.in	2012-03-06 07:39:50.771713128 +0100
+@@ -1968,6 +1968,10 @@ linux-procfs.o: $(srcdir)/common/linux-p
+ 	$(COMPILE) $(srcdir)/common/linux-procfs.c
+ 	$(POSTCOMPILE)
+ 
++linux-ptrace.o: $(srcdir)/common/linux-ptrace.c
++	$(COMPILE) $(srcdir)/common/linux-ptrace.c
++	$(POSTCOMPILE)
++
+ #
+ # gdb/tui/ dependencies
+ #
+Index: gdb-7.4.50.20120120/gdb/common/linux-procfs.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/common/linux-procfs.c	2012-03-06 07:39:41.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/common/linux-procfs.c	2012-03-06 07:39:50.771713128 +0100
+@@ -84,3 +84,34 @@ linux_proc_pid_is_stopped (pid_t pid)
+     }
+   return retval;
+ }
++
++/* See linux-procfs.h declaration.  */
++
++int
++linux_proc_pid_is_zombie (pid_t pid)
++{
++  char buffer[100];
++  FILE *procfile;
++  int retval;
++  int have_state;
++
++  xsnprintf (buffer, sizeof (buffer), "/proc/%d/status", (int) pid);
++  procfile = fopen (buffer, "r");
++  if (procfile == NULL)
++    {
++      warning (_("unable to open /proc file '%s'"), buffer);
++      return 0;
++    }
++
++  have_state = 0;
++  while (fgets (buffer, sizeof (buffer), procfile) != NULL)
++    if (strncmp (buffer, "State:", 6) == 0)
++      {
++	have_state = 1;
++	break;
++      }
++  retval = (have_state
++	    && strcmp (buffer, "State:\tZ (zombie)\n") == 0);
++  fclose (procfile);
++  return retval;
++}
+Index: gdb-7.4.50.20120120/gdb/common/linux-procfs.h
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/common/linux-procfs.h	2012-03-06 07:39:41.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/common/linux-procfs.h	2012-03-06 07:39:50.771713128 +0100
+@@ -31,4 +31,8 @@ extern int linux_proc_get_tgid (int lwpi
+ 
+ extern int linux_proc_pid_is_stopped (pid_t pid);
+ 
++/* Return non-zero if PID is a zombie.  */
++
++extern int linux_proc_pid_is_zombie (pid_t pid);
++
+ #endif /* COMMON_LINUX_PROCFS_H */
+Index: gdb-7.4.50.20120120/gdb/common/linux-ptrace.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.4.50.20120120/gdb/common/linux-ptrace.c	2012-03-06 07:39:50.771713128 +0100
+@@ -0,0 +1,26 @@
++/* Linux-specific ptrace manipulation routines.
++   Copyright (C) 2012 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#ifdef GDBSERVER
++#include "server.h"
++#else
++#include "defs.h"
++#include "gdb_string.h"
++#endif
++
++#include "linux-ptrace.h"
+Index: gdb-7.4.50.20120120/gdb/config/alpha/alpha-linux.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/alpha/alpha-linux.mh	2012-01-10 17:30:44.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/config/alpha/alpha-linux.mh	2012-03-06 07:39:50.771713128 +0100
+@@ -2,7 +2,7 @@
+ NAT_FILE= config/nm-linux.h
+ NATDEPFILES= inf-ptrace.o alpha-linux-nat.o \
+ 	fork-child.o proc-service.o linux-thread-db.o \
+-	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o
++	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ 
+ # The dynamically loaded libthread_db needs access to symbols in the
+Index: gdb-7.4.50.20120120/gdb/config/arm/linux.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/arm/linux.mh	2011-08-24 14:07:25.000000000 +0200
++++ gdb-7.4.50.20120120/gdb/config/arm/linux.mh	2012-03-06 07:39:50.772713125 +0100
+@@ -3,7 +3,7 @@
+ NAT_FILE= config/nm-linux.h
+ NATDEPFILES= inf-ptrace.o fork-child.o arm-linux-nat.o \
+ 	proc-service.o linux-thread-db.o \
+-	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o
++	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ 
+ LOADLIBES= -ldl $(RDYNAMIC)
+Index: gdb-7.4.50.20120120/gdb/config/i386/linux.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/i386/linux.mh	2012-03-06 07:39:41.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/config/i386/linux.mh	2012-03-06 07:39:50.772713125 +0100
+@@ -4,7 +4,7 @@ NAT_FILE= nm-linux.h
+ NATDEPFILES= inf-ptrace.o fork-child.o \
+ 	i386-nat.o i386-linux-nat.o \
+ 	proc-service.o linux-thread-db.o \
+-	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o
++	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ 
+ # The dynamically loaded libthread_db needs access to symbols in the
+Index: gdb-7.4.50.20120120/gdb/config/i386/linux64.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/i386/linux64.mh	2012-03-06 07:39:41.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/config/i386/linux64.mh	2012-03-06 07:39:50.772713125 +0100
+@@ -3,7 +3,7 @@ NATDEPFILES= inf-ptrace.o fork-child.o \
+ 	i386-nat.o amd64-nat.o amd64-linux-nat.o \
+ 	linux-nat.o linux-osdata.o \
+ 	proc-service.o linux-thread-db.o linux-fork.o \
+-	linux-procfs.o
++	linux-procfs.o linux-ptrace.o
+ NAT_FILE= nm-linux64.h
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ 
+Index: gdb-7.4.50.20120120/gdb/config/ia64/linux.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/ia64/linux.mh	2012-01-10 17:30:44.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/config/ia64/linux.mh	2012-03-06 07:39:50.772713125 +0100
+@@ -5,7 +5,7 @@ NATDEPFILES= inf-ptrace.o fork-child.o \
+ 	core-regset.o ia64-linux-nat.o \
+ 	proc-service.o linux-thread-db.o \
+ 	linux-nat.o linux-osdata.o linux-fork.o \
+-	linux-procfs.o
++	linux-procfs.o linux-ptrace.o
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ 
+ LOADLIBES = -ldl $(RDYNAMIC)
+Index: gdb-7.4.50.20120120/gdb/config/m32r/linux.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/m32r/linux.mh	2012-01-10 17:30:44.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/config/m32r/linux.mh	2012-03-06 07:39:50.773713122 +0100
+@@ -3,7 +3,7 @@
+ NAT_FILE= config/nm-linux.h
+ NATDEPFILES= inf-ptrace.o fork-child.o				\
+ 	m32r-linux-nat.o proc-service.o linux-thread-db.o	\
+-	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o
++	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ 
+ LOADLIBES= -ldl $(RDYNAMIC)
+Index: gdb-7.4.50.20120120/gdb/config/m68k/linux.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/m68k/linux.mh	2012-01-10 17:30:45.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/config/m68k/linux.mh	2012-03-06 07:39:50.773713122 +0100
+@@ -4,7 +4,7 @@ NAT_FILE= config/nm-linux.h
+ NATDEPFILES= inf-ptrace.o fork-child.o \
+ 	m68klinux-nat.o \
+ 	proc-service.o linux-thread-db.o \
+-	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o
++	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ 
+ # The dynamically loaded libthread_db needs access to symbols in the
+Index: gdb-7.4.50.20120120/gdb/config/mips/linux.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/mips/linux.mh	2011-08-24 14:07:26.000000000 +0200
++++ gdb-7.4.50.20120120/gdb/config/mips/linux.mh	2012-03-06 07:39:50.773713122 +0100
+@@ -3,7 +3,7 @@ NAT_FILE= config/nm-linux.h
+ NATDEPFILES= inf-ptrace.o fork-child.o mips-linux-nat.o \
+ 	linux-thread-db.o proc-service.o \
+ 	linux-nat.o linux-osdata.o linux-fork.o \
+-	linux-procfs.o
++	linux-procfs.o linux-ptrace.o
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ 
+ LOADLIBES = -ldl $(RDYNAMIC)
+Index: gdb-7.4.50.20120120/gdb/config/pa/linux.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/pa/linux.mh	2012-01-10 17:30:45.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/config/pa/linux.mh	2012-03-06 07:39:50.773713122 +0100
+@@ -3,7 +3,7 @@ NAT_FILE= config/nm-linux.h
+ NATDEPFILES= inf-ptrace.o fork-child.o \
+ 	hppa-linux-nat.o proc-service.o linux-thread-db.o \
+ 	linux-nat.o linux-osdata.o linux-fork.o \
+-	linux-procfs.o
++	linux-procfs.o linux-ptrace.o
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ 
+ LOADLIBES = -ldl $(RDYNAMIC)
+Index: gdb-7.4.50.20120120/gdb/config/powerpc/linux.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/powerpc/linux.mh	2011-08-24 14:07:27.000000000 +0200
++++ gdb-7.4.50.20120120/gdb/config/powerpc/linux.mh	2012-03-06 07:39:50.773713122 +0100
+@@ -5,7 +5,7 @@ XM_CLIBS=
+ NAT_FILE= config/nm-linux.h
+ NATDEPFILES= inf-ptrace.o fork-child.o \
+ 	ppc-linux-nat.o proc-service.o linux-thread-db.o \
+-	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o
++	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ 
+ LOADLIBES = -ldl $(RDYNAMIC)
+Index: gdb-7.4.50.20120120/gdb/config/powerpc/ppc64-linux.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/powerpc/ppc64-linux.mh	2011-08-24 14:07:27.000000000 +0200
++++ gdb-7.4.50.20120120/gdb/config/powerpc/ppc64-linux.mh	2012-03-06 07:39:50.774713118 +0100
+@@ -5,7 +5,7 @@ XM_CLIBS=
+ NAT_FILE= config/nm-linux.h
+ NATDEPFILES= inf-ptrace.o fork-child.o \
+ 	ppc-linux-nat.o proc-service.o linux-thread-db.o \
+-	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o
++	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ 
+ # The PowerPC has severe limitations on TOC size, and uses them even
+Index: gdb-7.4.50.20120120/gdb/config/powerpc/spu-linux.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/powerpc/spu-linux.mh	2011-08-24 14:07:27.000000000 +0200
++++ gdb-7.4.50.20120120/gdb/config/powerpc/spu-linux.mh	2012-03-06 07:39:50.774713118 +0100
+@@ -4,5 +4,5 @@
+ # PPU side of the Cell BE and debugging the SPU side.
+ 
+ NATDEPFILES = spu-linux-nat.o fork-child.o inf-ptrace.o \
+-	      linux-procfs.o
++	      linux-procfs.o linux-ptrace.o
+ 
+Index: gdb-7.4.50.20120120/gdb/config/s390/s390.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/s390/s390.mh	2012-01-05 18:07:05.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/config/s390/s390.mh	2012-03-06 07:39:50.774713118 +0100
+@@ -2,6 +2,6 @@
+ NAT_FILE= config/nm-linux.h
+ NATDEPFILES= inf-ptrace.o fork-child.o s390-nat.o \
+ 	linux-thread-db.o proc-service.o \
+-	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o
++	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ LOADLIBES = -ldl $(RDYNAMIC)
+Index: gdb-7.4.50.20120120/gdb/config/sparc/linux.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/sparc/linux.mh	2012-01-10 17:30:49.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/config/sparc/linux.mh	2012-03-06 07:39:50.774713118 +0100
+@@ -4,7 +4,7 @@ NATDEPFILES= sparc-nat.o sparc-linux-nat
+ 	core-regset.o fork-child.o inf-ptrace.o \
+ 	proc-service.o linux-thread-db.o \
+ 	linux-nat.o linux-osdata.o linux-fork.o \
+-	linux-procfs.o
++	linux-procfs.o linux-ptrace.o
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ 
+ # The dynamically loaded libthread_db needs access to symbols in the
+Index: gdb-7.4.50.20120120/gdb/config/sparc/linux64.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/sparc/linux64.mh	2012-01-10 17:30:49.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/config/sparc/linux64.mh	2012-03-06 07:39:50.775713114 +0100
+@@ -5,7 +5,7 @@ NATDEPFILES= sparc-nat.o sparc64-nat.o s
+ 	fork-child.o inf-ptrace.o \
+ 	proc-service.o linux-thread-db.o \
+ 	linux-nat.o linux-osdata.o linux-fork.o \
+-	linux-procfs.o
++	linux-procfs.o linux-ptrace.o
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ 
+ # The dynamically loaded libthread_db needs access to symbols in the
+Index: gdb-7.4.50.20120120/gdb/config/xtensa/linux.mh
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/config/xtensa/linux.mh	2011-08-24 14:07:27.000000000 +0200
++++ gdb-7.4.50.20120120/gdb/config/xtensa/linux.mh	2012-03-06 07:39:50.775713114 +0100
+@@ -4,7 +4,7 @@ NAT_FILE= config/nm-linux.h
+ 
+ NATDEPFILES= inf-ptrace.o fork-child.o xtensa-linux-nat.o \
+ 	linux-thread-db.o proc-service.o \
+-	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o
++	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
+ NAT_CDEPS = $(srcdir)/proc-service.list
+ 
+ LOADLIBES = -ldl $(RDYNAMIC)
+Index: gdb-7.4.50.20120120/gdb/gdbserver/Makefile.in
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/gdbserver/Makefile.in	2012-01-04 09:17:23.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/gdbserver/Makefile.in	2012-03-06 07:39:50.775713114 +0100
+@@ -408,6 +408,9 @@ signals.o: ../common/signals.c $(server_
+ linux-procfs.o: ../common/linux-procfs.c $(server_h)
+ 	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+ 
++linux-ptrace.o: ../common/linux-ptrace.c $(server_h)
++	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
++
+ common-utils.o: ../common/common-utils.c $(server_h)
+ 	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
+ 
+Index: gdb-7.4.50.20120120/gdb/gdbserver/configure.srv
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/gdbserver/configure.srv	2011-12-06 15:14:49.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/gdbserver/configure.srv	2012-03-06 07:39:50.775713114 +0100
+@@ -47,6 +47,7 @@ case "${target}" in
+ 			srv_regobj="${srv_regobj} arm-with-vfpv3.o"
+ 			srv_regobj="${srv_regobj} arm-with-neon.o"
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-arm-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_xmlfiles="arm-with-iwmmxt.xml"
+ 			srv_xmlfiles="${srv_xmlfiles} arm-with-vfpv2.xml"
+ 			srv_xmlfiles="${srv_xmlfiles} arm-with-vfpv3.xml"
+@@ -69,16 +70,19 @@ case "${target}" in
+ 			;;
+   bfin-*-*linux*)	srv_regobj=reg-bfin.o
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-bfin-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_linux_usrregs=yes
+ 			srv_linux_thread_db=yes
+ 			;;
+   crisv32-*-linux*)	srv_regobj=reg-crisv32.o
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-crisv32-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_linux_regsets=yes
+ 			srv_linux_thread_db=yes
+ 			;;
+   cris-*-linux*)	srv_regobj=reg-cris.o
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-cris-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_linux_usrregs=yes
+ 			srv_linux_thread_db=yes
+ 			;;
+@@ -93,6 +97,7 @@ case "${target}" in
+ 			    srv_xmlfiles="${srv_xmlfiles} $srv_amd64_linux_xmlfiles"
+ 			fi
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-x86-low.o i386-low.o i387-fp.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_linux_usrregs=yes
+ 			srv_linux_regsets=yes
+ 			srv_linux_thread_db=yes
+@@ -124,10 +129,12 @@ case "${target}" in
+ 			;;
+   ia64-*-linux*)	srv_regobj=reg-ia64.o
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-ia64-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_linux_usrregs=yes
+ 			;;
+   m32r*-*-linux*)	srv_regobj=reg-m32r.o
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-m32r-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_linux_usrregs=yes
+  			srv_linux_thread_db=yes
+ 			;;
+@@ -137,6 +144,7 @@ case "${target}" in
+                           srv_regobj=reg-m68k.o
+                         fi
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-m68k-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_linux_usrregs=yes
+ 			srv_linux_regsets=yes
+ 			srv_linux_thread_db=yes
+@@ -147,12 +155,14 @@ case "${target}" in
+                           srv_regobj=reg-m68k.o
+                         fi
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-m68k-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_linux_usrregs=yes
+ 			srv_linux_regsets=yes
+ 			srv_linux_thread_db=yes
+ 			;;
+   mips*-*-linux*)	srv_regobj="mips-linux.o mips64-linux.o"
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-mips-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_xmlfiles="mips-linux.xml"
+ 			srv_xmlfiles="${srv_xmlfiles} mips-cpu.xml"
+ 			srv_xmlfiles="${srv_xmlfiles} mips-cp0.xml"
+@@ -181,6 +191,7 @@ case "${target}" in
+ 			srv_regobj="${srv_regobj} powerpc-isa205-altivec64l.o"
+ 			srv_regobj="${srv_regobj} powerpc-isa205-vsx64l.o"
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-ppc-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_xmlfiles="rs6000/powerpc-32l.xml"
+ 			srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-altivec32l.xml"
+ 			srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-cell32l.xml"
+@@ -223,6 +234,7 @@ case "${target}" in
+ 			srv_regobj="${srv_regobj} s390x-linux64v1.o"
+ 			srv_regobj="${srv_regobj} s390x-linux64v2.o"
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-s390-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_xmlfiles="s390-linux32.xml"
+ 			srv_xmlfiles="${srv_xmlfiles} s390-linux32v1.xml"
+ 			srv_xmlfiles="${srv_xmlfiles} s390-linux32v2.xml"
+@@ -243,12 +255,14 @@ case "${target}" in
+ 			;;
+   sh*-*-linux*)		srv_regobj=reg-sh.o
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-sh-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_linux_usrregs=yes
+ 			srv_linux_regsets=yes
+ 			srv_linux_thread_db=yes
+ 			;;
+   sparc*-*-linux*)	srv_regobj=reg-sparc64.o
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-sparc-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_linux_regsets=yes
+ 			srv_linux_thread_db=yes
+ 			;;
+@@ -265,12 +279,14 @@ case "${target}" in
+ 			srv_xmlfiles="${srv_xmlfiles} tic6x-gp.xml"
+ 			srv_xmlfiles="${srv_xmlfiles} tic6x-c6xp.xml"
+   			srv_tgtobj="linux-low.o linux-osdata.o linux-tic6x-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_linux_regsets=yes
+ 			srv_linux_usrregs=yes
+ 			srv_linux_thread_db=yes
+ 			;;
+   x86_64-*-linux*)	srv_regobj="$srv_amd64_linux_regobj $srv_i386_linux_regobj"
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-x86-low.o i386-low.o i387-fp.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_xmlfiles="$srv_i386_linux_xmlfiles $srv_amd64_linux_xmlfiles"
+ 			srv_linux_usrregs=yes # This is for i386 progs.
+ 			srv_linux_regsets=yes
+@@ -285,6 +301,7 @@ case "${target}" in
+ 
+   xtensa*-*-linux*)	srv_regobj=reg-xtensa.o
+ 			srv_tgtobj="linux-low.o linux-osdata.o linux-xtensa-low.o linux-procfs.o"
++			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+ 			srv_linux_regsets=yes
+ 			;;
+   *)			echo "Error: target not supported by gdbserver."
+Index: gdb-7.4.50.20120120/gdb/gdbserver/linux-low.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/gdbserver/linux-low.c	2012-03-06 07:39:41.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/gdbserver/linux-low.c	2012-03-06 07:39:50.776713111 +0100
+@@ -630,10 +630,10 @@ linux_attach_lwp_1 (unsigned long lwpid,
+ 	  fflush (stderr);
+ 	  return;
+ 	}
+-      else
+-	/* If we fail to attach to a process, report an error.  */
+-	error ("Cannot attach to lwp %ld: %s (%d)\n", lwpid,
+-	       strerror (errno), errno);
++
++      /* If we fail to attach to a process, report an error.  */
++      error ("Cannot attach to lwp %ld: %s (%d)\n", lwpid,
++	     strerror (errno), errno);
+     }
+ 
+   if (initial)
+Index: gdb-7.4.50.20120120/gdb/linux-nat.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/linux-nat.c	2012-03-06 07:39:41.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/linux-nat.c	2012-03-06 07:39:50.777713108 +0100
+@@ -2464,37 +2464,6 @@ linux_handle_extended_wait (struct lwp_i
+ 		  _("unknown ptrace event %d"), event);
+ }
+ 
+-/* Return non-zero if LWP is a zombie.  */
+-
+-static int
+-linux_lwp_is_zombie (long lwp)
+-{
+-  char buffer[MAXPATHLEN];
+-  FILE *procfile;
+-  int retval;
+-  int have_state;
+-
+-  xsnprintf (buffer, sizeof (buffer), "/proc/%ld/status", lwp);
+-  procfile = fopen (buffer, "r");
+-  if (procfile == NULL)
+-    {
+-      warning (_("unable to open /proc file '%s'"), buffer);
+-      return 0;
+-    }
+-
+-  have_state = 0;
+-  while (fgets (buffer, sizeof (buffer), procfile) != NULL)
+-    if (strncmp (buffer, "State:", 6) == 0)
+-      {
+-	have_state = 1;
+-	break;
+-      }
+-  retval = (have_state
+-	    && strcmp (buffer, "State:\tZ (zombie)\n") == 0);
+-  fclose (procfile);
+-  return retval;
+-}
+-
+ /* Wait for LP to stop.  Returns the wait status, or 0 if the LWP has
+    exited.  */
+ 
+@@ -2548,10 +2517,10 @@ wait_lwp (struct lwp_info *lp)
+ 
+ 	 This is racy, what if the tgl becomes a zombie right after we check?
+ 	 Therefore always use WNOHANG with sigsuspend - it is equivalent to
+-	 waiting waitpid but the linux_lwp_is_zombie is safe this way.  */
++	 waiting waitpid but linux_proc_pid_is_zombie is safe this way.  */
+ 
+       if (GET_PID (lp->ptid) == GET_LWP (lp->ptid)
+-	  && linux_lwp_is_zombie (GET_LWP (lp->ptid)))
++	  && linux_proc_pid_is_zombie (GET_LWP (lp->ptid)))
+ 	{
+ 	  thread_dead = 1;
+ 	  if (debug_linux_nat)
+@@ -3431,7 +3400,7 @@ check_zombie_leaders (void)
+ 	  /* Check if there are other threads in the group, as we may
+ 	     have raced with the inferior simply exiting.  */
+ 	  && num_lwps (inf->pid) > 1
+-	  && linux_lwp_is_zombie (inf->pid))
++	  && linux_proc_pid_is_zombie (inf->pid))
+ 	{
+ 	  if (debug_linux_nat)
+ 	    fprintf_unfiltered (gdb_stdlog,

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

@@ -0,0 +1,402 @@
+http://sourceware.org/ml/gdb-patches/2012-03/msg00170.html
+Subject: [patch 2/3] attach-fail-reasons: Say more than ptrace: Operation not permitted.
+
+Hi,
+
+There is a common question on #gdb and also already described:
+
+http://sourceware.org/gdb/wiki/FAQ
+16. Getting an internal error or other error while attaching to processes on
+    GNU/Linux
+->
+    Try setenforce 0 (SELinux) or echo 0 >/proc/sys/kernel/yama/ptrace_scope
+    (ptrace scope) to disable system security protections. 
+
+and here is a patch to give some explanations.
+
+More reasons can be given later, this is a container for them and it contains
+some useful ones already.
+
+No regressions on {x86_64,x86_64-m32,i686}-fedora17-linux-gnu and with
+non-extended gdbserver.
+
+The testcase does not test gdbserver, somehow it is a bit difficult without
+having shell on target.
+
+Attaching to process 27480
+ptrace: Operation not permitted.
+(gdb) _
+->
+Attaching to process 27480
+warning: process 27480 is already traced by process 29011
+ptrace: Operation not permitted.
+(gdb) _
+
+
+Thanks,
+Jan
+
+
+gdb/
+2012-03-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* common/linux-procfs.c (linux_proc_get_int): New, from
+	linux_proc_get_tgid.
+	(linux_proc_get_tgid): Only call linux_proc_get_int.
+	(linux_proc_get_tracerpid): New.
+	(linux_proc_pid_has_state): New, from linux_proc_pid_is_zombie.
+	(linux_proc_pid_is_stopped, linux_proc_pid_is_zombie): Only call
+	linux_proc_pid_has_state.
+	* common/linux-procfs.h (linux_proc_get_tracerpid): New declaration.
+	* common/linux-ptrace.c: Include linux-procfs.h.
+	(linux_ptrace_attach_warnings): New.
+	* common/linux-ptrace.h (linux_ptrace_attach_warnings): New declaration.
+	* linux-nat.c: Include exceptions.h and linux-ptrace.h.
+	(linux_nat_attach): New variable ex.  Wrap to_attach by TRY_CATCH and
+	call linux_ptrace_attach_warnings.
+
+gdb/gdbserver/
+2012-03-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* linux-low.c (linux_attach_lwp_1): Call linux_ptrace_attach_warnings.
+
+gdb/testsuite/
+2012-03-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.base/attach-twice.c: New files.
+	* gdb.base/attach-twice.exp: New files.
+
+Index: gdb-7.4.50.20120120/gdb/common/linux-procfs.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/common/linux-procfs.c	2012-03-06 07:34:00.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/common/linux-procfs.c	2012-03-06 07:34:17.586816449 +0100
+@@ -28,67 +28,54 @@
+ /* Return the TGID of LWPID from /proc/pid/status.  Returns -1 if not
+    found.  */
+ 
+-int
+-linux_proc_get_tgid (int lwpid)
++static int
++linux_proc_get_int (int lwpid, const char *field)
+ {
++  size_t field_len = strlen (field);
+   FILE *status_file;
+   char buf[100];
+-  int tgid = -1;
++  int retval = -1;
+ 
+   snprintf (buf, sizeof (buf), "/proc/%d/status", (int) lwpid);
+   status_file = fopen (buf, "r");
+-  if (status_file != NULL)
++  if (status_file == NULL)
+     {
+-      while (fgets (buf, sizeof (buf), status_file))
+-	{
+-	  if (strncmp (buf, "Tgid:", 5) == 0)
+-	    {
+-	      tgid = strtoul (buf + strlen ("Tgid:"), NULL, 10);
+-	      break;
+-	    }
+-	}
+-
+-      fclose (status_file);
++      warning (_("unable to open /proc file '%s'"), buf);
++      return -1;
+     }
+ 
+-  return tgid;
++  while (fgets (buf, sizeof (buf), status_file))
++    if (strncmp (buf, field, field_len) == 0 && buf[field_len] == ':')
++      {
++	retval = strtol (&buf[field_len + 1], NULL, 10);
++	break;
++      }
++
++  fclose (status_file);
++  return retval;
+ }
+ 
+-/* Detect `T (stopped)' in `/proc/PID/status'.
+-   Other states including `T (tracing stop)' are reported as false.  */
++/* Return the TGID of LWPID from /proc/pid/status.  Returns -1 if not
++   found.  */
+ 
+ int
+-linux_proc_pid_is_stopped (pid_t pid)
++linux_proc_get_tgid (int lwpid)
+ {
+-  FILE *status_file;
+-  char buf[100];
+-  int retval = 0;
++  return linux_proc_get_int (lwpid, "Tgid");
++}
+ 
+-  snprintf (buf, sizeof (buf), "/proc/%d/status", (int) pid);
+-  status_file = fopen (buf, "r");
+-  if (status_file != NULL)
+-    {
+-      int have_state = 0;
++/* See linux-procfs.h.  */
+ 
+-      while (fgets (buf, sizeof (buf), status_file))
+-	{
+-	  if (strncmp (buf, "State:", 6) == 0)
+-	    {
+-	      have_state = 1;
+-	      break;
+-	    }
+-	}
+-      if (have_state && strstr (buf, "T (stopped)") != NULL)
+-	retval = 1;
+-      fclose (status_file);
+-    }
+-  return retval;
++pid_t
++linux_proc_get_tracerpid (int lwpid)
++{
++  return linux_proc_get_int (lwpid, "TracerPid");
+ }
+ 
+-/* See linux-procfs.h declaration.  */
++/* Return non-zero if 'State' of /proc/PID/status contains STATE.  */
+ 
+-int
+-linux_proc_pid_is_zombie (pid_t pid)
++static int
++linux_proc_pid_has_state (pid_t pid, const char *state)
+ {
+   char buffer[100];
+   FILE *procfile;
+@@ -110,8 +97,24 @@ linux_proc_pid_is_zombie (pid_t pid)
+ 	have_state = 1;
+ 	break;
+       }
+-  retval = (have_state
+-	    && strcmp (buffer, "State:\tZ (zombie)\n") == 0);
++  retval = (have_state && strstr (buffer, state) != NULL);
+   fclose (procfile);
+   return retval;
+ }
++
++/* Detect `T (stopped)' in `/proc/PID/status'.
++   Other states including `T (tracing stop)' are reported as false.  */
++
++int
++linux_proc_pid_is_stopped (pid_t pid)
++{
++  return linux_proc_pid_has_state (pid, "T (stopped)");
++}
++
++/* See linux-procfs.h declaration.  */
++
++int
++linux_proc_pid_is_zombie (pid_t pid)
++{
++  return linux_proc_pid_has_state (pid, "Z (zombie)");
++}
+Index: gdb-7.4.50.20120120/gdb/common/linux-procfs.h
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/common/linux-procfs.h	2012-03-06 07:34:00.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/common/linux-procfs.h	2012-03-06 07:34:17.586816449 +0100
+@@ -26,6 +26,11 @@
+ 
+ extern int linux_proc_get_tgid (int lwpid);
+ 
++/* Return the TracerPid of LWPID from /proc/pid/status.  Returns -1 if not
++   found.  */
++
++extern pid_t linux_proc_get_tracerpid (int lwpid);
++
+ /* Detect `T (stopped)' in `/proc/PID/status'.
+    Other states including `T (tracing stop)' are reported as false.  */
+ 
+Index: gdb-7.4.50.20120120/gdb/common/linux-ptrace.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/common/linux-ptrace.c	2012-03-06 07:34:00.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/common/linux-ptrace.c	2012-03-06 07:34:17.586816449 +0100
+@@ -24,3 +24,21 @@
+ #endif
+ 
+ #include "linux-ptrace.h"
++#include "linux-procfs.h"
++
++/* Print all possible reasons we could fail to attach PID.  */
++
++void
++linux_ptrace_attach_warnings (pid_t pid)
++{
++  pid_t tracerpid;
++
++  tracerpid = linux_proc_get_tracerpid (pid);
++  if (tracerpid > 0)
++    warning (_("process %d is already traced by process %d"), (int) pid,
++	     (int) tracerpid);
++
++  if (linux_proc_pid_is_zombie (pid))
++    warning (_("process %d is a zombie - the process has already terminated"),
++	     (int) pid);
++}
+Index: gdb-7.4.50.20120120/gdb/common/linux-ptrace.h
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/common/linux-ptrace.h	2012-01-04 09:17:18.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/common/linux-ptrace.h	2012-03-06 07:34:17.586816449 +0100
+@@ -65,4 +65,6 @@
+ #define __WALL          0x40000000 /* Wait for any child.  */
+ #endif
+ 
++extern void linux_ptrace_attach_warnings (pid_t pid);
++
+ #endif /* COMMON_LINUX_PTRACE_H */
+Index: gdb-7.4.50.20120120/gdb/gdbserver/linux-low.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/gdbserver/linux-low.c	2012-03-06 07:34:00.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/gdbserver/linux-low.c	2012-03-06 07:34:17.587816446 +0100
+@@ -632,6 +632,7 @@ linux_attach_lwp_1 (unsigned long lwpid,
+ 	}
+ 
+       /* If we fail to attach to a process, report an error.  */
++      linux_ptrace_attach_warnings (lwpid);
+       error ("Cannot attach to lwp %ld: %s (%d)\n", lwpid,
+ 	     strerror (errno), errno);
+     }
+Index: gdb-7.4.50.20120120/gdb/linux-nat.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/linux-nat.c	2012-03-06 07:34:00.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/linux-nat.c	2012-03-06 07:34:29.860775803 +0100
+@@ -59,6 +59,8 @@
+ #include "solib.h"
+ #include "linux-osdata.h"
+ #include "cli/cli-utils.h"
++#include "exceptions.h"
++#include "linux-ptrace.h"
+ 
+ #ifndef SPUFS_MAGIC
+ #define SPUFS_MAGIC 0x23c9b64e
+@@ -1613,11 +1615,22 @@ linux_nat_attach (struct target_ops *ops
+   struct lwp_info *lp;
+   int status;
+   ptid_t ptid;
++  volatile struct gdb_exception ex;
+ 
+   /* Make sure we report all signals during attach.  */
+   linux_nat_pass_signals (0, NULL);
+ 
+-  linux_ops->to_attach (ops, args, from_tty);
++  TRY_CATCH (ex, RETURN_MASK_ERROR)
++    {
++      linux_ops->to_attach (ops, args, from_tty);
++    }
++  if (ex.reason < 0)
++    {
++      pid_t pid = parse_pid_to_attach (args);
++
++      linux_ptrace_attach_warnings (pid);
++      throw_exception (ex);
++    }
+ 
+   /* The ptrace base target adds the main thread with (pid,0,0)
+      format.  Decorate it with lwp info.  */
+Index: gdb-7.4.50.20120120/gdb/testsuite/gdb.base/attach-twice.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.4.50.20120120/gdb/testsuite/gdb.base/attach-twice.c	2012-03-06 07:34:17.589816440 +0100
+@@ -0,0 +1,42 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2011-2012 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/ptrace.h>
++#include <errno.h>
++
++int
++main (void)
++{
++  long l;
++
++  switch (fork ())
++  {
++    case -1:
++      perror ("fork");
++      exit (1);
++    case 0:
++      errno = 0;
++      ptrace (PTRACE_ATTACH, getppid (), NULL, NULL);
++      if (errno != 0)
++	perror ("PTRACE_ATTACH");
++      break;
++  }
++  sleep (600);
++  return 0;
++}
+Index: gdb-7.4.50.20120120/gdb/testsuite/gdb.base/attach-twice.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.4.50.20120120/gdb/testsuite/gdb.base/attach-twice.exp	2012-03-06 07:34:17.589816440 +0100
+@@ -0,0 +1,52 @@
++# Copyright (C) 2012 Free Software Foundation, Inc.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++# Manipulation with PID on target is not supported.
++if [is_remote target] then {
++    return 0
++}
++
++set testfile attach-twice
++set executable ${testfile}
++set binfile ${objdir}/${subdir}/${executable}
++
++if { [prepare_for_testing ${testfile}.exp $executable] } {
++    return -1
++}
++
++set testpid [eval exec $binfile &]
++exec sleep 2
++
++set parentpid 0
++
++set test "attach"
++gdb_test_multiple "attach $testpid" $test {
++    -re "Attaching to program: \[^\r\n\]*, process $testpid\r\n.*warning: process $testpid is already traced by process (\[0-9\]+)\r\n.*ptrace: Operation not permitted\\.\r\n$gdb_prompt $" {
++	set parentpid $expect_out(1,string)
++	pass $test
++    }
++    -re "Attaching to program: \[^\r\n\]*, process $testpid\r\n.*ptrace: Operation not permitted\\.\r\n$gdb_prompt $" {
++	fail $test
++    }
++    -re "\r\n$gdb_prompt $" {
++	xfail $test
++    }
++}
++
++eval exec ps xfw
++if {$parentpid != 0} {
++  eval exec kill -9 $parentpid
++}
++eval exec kill -9 $testpid

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

@@ -1,12 +1,5 @@
-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
+Subject: [patch 3/3] attach-fail-reasons: SELinux deny_ptrace
 
 Hi,
 
@@ -16,9 +9,11 @@ and here is the last bit for new SELinux 'deny_ptrace':
 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>
 
@@ -42,103 +37,55 @@ gdb/gdbserver/
 	(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
+--- a/gdb/common/linux-ptrace.c
++++ b/gdb/common/linux-ptrace.c
+@@ -26,6 +26,10 @@
+ #include "linux-ptrace.h"
+ #include "linux-procfs.h"
  
-+/* Define to 1 if you have the `selinux' library (-lselinux). */
-+#undef HAVE_LIBSELINUX
++#ifdef HAVE_SELINUX_SELINUX_H
++# include <selinux/selinux.h>
++#endif /* HAVE_SELINUX_SELINUX_H */
 +
- /* Define to 1 if you have the <libunwind-ia64.h> header file. */
- #undef HAVE_LIBUNWIND_IA64_H
+ /* Print all possible reasons we could fail to attach PID.  */
  
-@@ -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
+ void
+@@ -41,4 +45,21 @@ linux_ptrace_attach_warnings (pid_t pid)
+   if (linux_proc_pid_is_zombie (pid))
+     warning (_("process %d is a zombie - the process has already terminated"),
+ 	     (int) pid);
 +
- /* 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;
++  linux_ptrace_create_warnings ();
 +}
-+_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
 +
++/* Print all possible reasons we could fail to create a traced process.  */
 +
++void
++linux_ptrace_create_warnings (void)
++{
++#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)
++    warning (_("the SELinux boolean 'deny_ptrace' is enabled, "
++	       "you can disable this process attach protection by: "
++	       "(gdb) shell sudo setsebool deny_ptrace=0"));
++#endif /* HAVE_LIBSELINUX */
+ }
+--- a/gdb/common/linux-ptrace.h
++++ b/gdb/common/linux-ptrace.h
+@@ -66,5 +66,6 @@
+ #endif
  
- # 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
+ extern void linux_ptrace_attach_warnings (pid_t pid);
++extern void linux_ptrace_create_warnings (void);
+ 
+ #endif /* COMMON_LINUX_PTRACE_H */
 --- 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.])
+@@ -1748,6 +1748,10 @@ then
+ 	      [Define if you support the personality syscall.])
+ fi
  
 +dnl Check security_get_boolean_active availability.
 +AC_CHECK_HEADERS(selinux/selinux.h)
@@ -147,182 +94,9 @@ diff --git a/gdb/configure.ac b/gdb/configure.ac
  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
+--- a/gdb/gdbserver/configure.ac
++++ b/gdb/gdbserver/configure.ac
+@@ -411,6 +411,10 @@ if $want_ipa ; then
     fi
  fi
  
@@ -332,25 +106,104 @@ diff --git a/gdbserver/configure.ac b/gdbserver/configure.ac
 +
  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 ()
+ AC_SUBST(USE_THREAD_DB)
+--- a/gdb/gdbserver/linux-low.c
++++ b/gdb/gdbserver/linux-low.c
+@@ -550,6 +550,25 @@ add_lwp (ptid_t ptid)
+   return lwp;
+ }
+ 
++/* Execute PTRACE_TRACEME with error checking.  */
++
++static void
++linux_traceme (const char *program)
++{
++  int save_errno;
++
++  errno = 0;
++  if (ptrace (PTRACE_TRACEME, 0, NULL, NULL) == 0)
++    return;
++
++  save_errno = errno;
++  linux_ptrace_create_warnings ();
++  fprintf (stderr, _("Cannot trace created process %s: %s.\n"), program,
++	   strerror (save_errno));
++  fflush (stderr);
++  _exit (0177);
++}
++
+ /* Start an inferior process and returns its pid.
+    ALLARGS is a vector of program-name and args. */
+ 
+@@ -590,7 +609,7 @@ linux_create_inferior (char *program, char **allargs)
+ 
+   if (pid == 0)
+     {
+-      ptrace (PTRACE_TRACEME, 0, 0, 0);
++      linux_traceme (program);
+ 
+ #ifndef __ANDROID__ /* Bionic doesn't use SIGRTMIN the way glibc does.  */
+       signal (__SIGRTMIN + 1, SIG_DFL);
+@@ -4386,7 +4405,7 @@ linux_tracefork_grandchild (void *arg)
+ static int
+ linux_tracefork_child (void *arg)
  {
-   if (ptrace (PTRACE_TRACEME, 0, (PTRACE_TYPE_ARG3) 0,
- 	      (PTRACE_TYPE_ARG4) 0) < 0)
--    trace_start_error_with_name ("ptrace");
+-  ptrace (PTRACE_TRACEME, 0, 0, 0);
++  linux_traceme ("PTRACE_O_TRACEFORK test");
+   kill (getpid (), SIGSTOP);
+ 
+ #if !(defined(__UCLIBC__) && defined(HAS_NOMMU))
+--- a/gdb/inf-ptrace.c
++++ b/gdb/inf-ptrace.c
+@@ -105,7 +105,15 @@ static void
+ inf_ptrace_me (void)
+ {
+   /* "Trace me, Dr. Memory!"  */
++  errno = 0;
+   ptrace (PT_TRACE_ME, 0, (PTRACE_TYPE_ARG3)0, 0);
++  if (errno != 0)
 +    {
-+      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 ());
++      fprintf_unfiltered (gdb_stderr, _("Cannot create process: %s\n"),
++			  safe_strerror (errno));
++      gdb_flush (gdb_stderr);
++      _exit (0177);
++    }
+ }
+ 
+ /* Start a new inferior Unix child process.  EXEC_FILE is the file to
+--- a/gdb/linux-nat.c
++++ b/gdb/linux-nat.c
+@@ -1570,6 +1570,7 @@ linux_nat_create_inferior (struct target_ops *ops,
+ #ifdef HAVE_PERSONALITY
+   int personality_orig = 0, personality_set = 0;
+ #endif /* HAVE_PERSONALITY */
++  volatile struct gdb_exception ex;
+ 
+   /* The fork_child mechanism is synchronous and calls target_wait, so
+      we have to mask the async mode.  */
+@@ -1594,7 +1595,10 @@ linux_nat_create_inferior (struct target_ops *ops,
+   /* Make sure we report all signals during startup.  */
+   linux_nat_pass_signals (0, NULL);
+ 
+-  linux_ops->to_create_inferior (ops, exec_file, allargs, env, from_tty);
++  TRY_CATCH (ex, RETURN_MASK_ERROR)
++    {
++      linux_ops->to_create_inferior (ops, exec_file, allargs, env, from_tty);
 +    }
  
-   if (setpgid (0, 0) < 0)
-     trace_start_error_with_name ("setpgid");
+ #ifdef HAVE_PERSONALITY
+   if (personality_set)
+@@ -1606,6 +1610,12 @@ linux_nat_create_inferior (struct target_ops *ops,
+ 		 safe_strerror (errno));
+     }
+ #endif /* HAVE_PERSONALITY */
++
++  if (ex.reason < 0)
++    {
++      linux_ptrace_create_warnings ();
++      throw_exception (ex);
++    }
+ }
+ 
+ static void
+

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

@@ -0,0 +1,89 @@
+--- 1/gdb/config.in	2012-03-09 18:40:28.001871023 +0100
++++ ./gdb/config.in	2012-03-09 18:41:46.552621113 +0100
+@@ -245,6 +245,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 if libunwind library is being used. */
+ #undef HAVE_LIBUNWIND
+ 
+@@ -483,6 +486,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 `setlocale' function. */
+ #undef HAVE_SETLOCALE
+ 
+--- 1/gdb/configure	2012-03-09 18:40:28.183870443 +0100
++++ ./gdb/configure	2012-03-09 18:41:45.783623559 +0100
+@@ -15557,6 +15557,64 @@ $as_echo "#define HAVE_PERSONALITY 1" >>
+ 
+ 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
++
++
+ 
+ # Support for --with-sysroot is a copy of GDB_AC_WITH_DIR,
+ # except that the argument to --with-sysroot is optional.

gdb-autoload-01of28.patch

@@ -0,0 +1,65 @@
+http://sourceware.org/ml/gdb-cvs/2012-01/msg00202.html
+
+### src/gdb/ChangeLog	2012/01/24 19:12:31	1.13771
+### src/gdb/ChangeLog	2012/01/24 20:56:33	1.13772
+## -1,3 +1,12 @@
++2012-01-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
++
++	Code cleanup.
++	* cli/cli-cmds.c (source_script_from_stream): Never fclose STREAM.
++	Update the function comment for it.
++	(source_script_with_search): Call make_cleanup_fclose for STREAM.
++	* cli/cli-script.c (script_from_file): Do not call make_cleanup_fclose
++	for STREAM.
++
+ 2012-01-24  Pedro Alves  <palves@redhat.com>
+ 
+ 	* breakpoint.c (bpstat_stop_status): Moving clearing print_it
+--- src/gdb/cli/cli-cmds.c	2012/01/23 16:37:03	1.123
++++ src/gdb/cli/cli-cmds.c	2012/01/24 20:56:33	1.124
+@@ -527,8 +527,7 @@
+   return 1;
+ }
+ 
+-/* Load script FILE, which has already been opened as STREAM.
+-   STREAM is closed before we return.  */
++/* Load script FILE, which has already been opened as STREAM.  */
+ 
+ static void
+ source_script_from_stream (FILE *stream, const char *file)
+@@ -556,12 +555,9 @@
+ 	  else
+ 	    {
+ 	      /* Nope, just punt.  */
+-	      fclose (stream);
+ 	      throw_exception (e);
+ 	    }
+ 	}
+-      else
+-	fclose (stream);
+     }
+   else
+     script_from_file (stream, file);
+@@ -595,6 +591,7 @@
+     }
+ 
+   old_cleanups = make_cleanup (xfree, full_path);
++  make_cleanup_fclose (stream);
+   /* The python support reopens the file, so we need to pass full_path here
+      in case the file was found on the search path.  It's useful to do this
+      anyway so that error messages show the actual file used.  But only do
+--- src/gdb/cli/cli-script.c	2012/01/04 08:17:17	1.73
++++ src/gdb/cli/cli-script.c	2012/01/24 20:56:33	1.74
+@@ -1614,11 +1614,9 @@
+   if (stream == NULL)
+     internal_error (__FILE__, __LINE__, _("called with NULL file pointer!"));
+ 
+-  old_cleanups = make_cleanup_fclose (stream);
+-
+   old_lines.old_line = source_line_number;
+   old_lines.old_file = source_file_name;
+-  make_cleanup (source_cleanup_lines, &old_lines);
++  old_cleanups = make_cleanup (source_cleanup_lines, &old_lines);
+   source_line_number = 0;
+   source_file_name = file;
+   /* This will get set every time we read a line.  So it won't stay ""

gdb-autoload-02of28.patch

@@ -0,0 +1,103 @@
+http://sourceware.org/ml/gdb-cvs/2012-01/msg00205.html
+
+--- src/gdb/gdb_vecs.h
++++ src/gdb/gdb_vecs.h	2012-04-17 22:04:23.818666000 +0000
+@@ -0,0 +1,28 @@
++/* Some commonly-used VEC types.
++
++   Copyright (C) 2012 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++
++#ifndef GDB_VECS_H
++#define GDB_VECS_H
++
++#include "vec.h"
++
++DEF_VEC_P (char_ptr);
++
++#endif /* GDB_VECS_H */
+### src/gdb/ChangeLog	2012/01/24 21:32:56	1.13774
+### src/gdb/ChangeLog	2012/01/24 21:36:37	1.13775
+## -1,3 +1,10 @@
++2012-01-24  Tom Tromey  <tromey@redhat.com>
++
++	* ada-lang.c: Include gdb_vecs.h.
++	* charset.c: Include gdb_vecs.h.
++	* tracepoint.h: Include gdb_vecs.h.
++	* gdb_vecs.h: New file.
++
+ 2012-01-24  Pedro Alves  <pedro@codesourcery.com>
+ 
+ 	* breakpoint.c (breakpoint_hit_catch_fork)
+--- src/gdb/ada-lang.c	2012/01/06 03:34:45	1.330
++++ src/gdb/ada-lang.c	2012/01/24 21:36:37	1.331
+@@ -57,6 +57,7 @@
+ #include "observer.h"
+ #include "vec.h"
+ #include "stack.h"
++#include "gdb_vecs.h"
+ 
+ #include "psymtab.h"
+ #include "value.h"
+@@ -5628,8 +5629,6 @@
+   return sym_name;
+ }
+ 
+-DEF_VEC_P (char_ptr);
+-
+ /* A companion function to ada_make_symbol_completion_list().
+    Check if SYM_NAME represents a symbol which name would be suitable
+    to complete TEXT (TEXT_LEN is the length of TEXT), in which case
+--- src/gdb/charset.c	2012/01/04 08:17:00	1.46
++++ src/gdb/charset.c	2012/01/24 21:36:37	1.47
+@@ -27,6 +27,7 @@
+ #include "vec.h"
+ #include "environ.h"
+ #include "arch-utils.h"
++#include "gdb_vecs.h"
+ 
+ #include <stddef.h>
+ #include "gdb_string.h"
+@@ -717,8 +718,6 @@
+ 
+ extern initialize_file_ftype _initialize_charset; /* -Wmissing-prototype */
+ 
+-DEF_VEC_P (char_ptr);
+-
+ static VEC (char_ptr) *charsets;
+ 
+ #ifdef PHONY_ICONV
+--- src/gdb/tracepoint.h	2012/01/04 08:27:57	1.46
++++ src/gdb/tracepoint.h	2012/01/24 21:36:37	1.47
+@@ -22,6 +22,7 @@
+ #include "breakpoint.h"
+ #include "target.h"
+ #include "memrange.h"
++#include "gdb_vecs.h"
+ 
+ /* A trace state variable is a value managed by a target being
+    traced.  A trace state variable (or tsv for short) can be accessed
+@@ -143,8 +144,6 @@
+ 
+ /* Struct to collect random info about tracepoints on the target.  */
+ 
+-DEF_VEC_P (char_ptr);
+-
+ struct uploaded_tp
+ {
+   int number;

gdb-autoload-03of28.patch

@@ -0,0 +1,215 @@
+http://sourceware.org/ml/gdb-cvs/2012-01/msg00219.html
+
+### src/gdb/ChangeLog	2012/01/26 16:44:29	1.13780
+### src/gdb/ChangeLog	2012/01/26 21:54:42	1.13781
+## -1,3 +1,22 @@
++2012-01-26  Jan Kratochvil  <jan.kratochvil@redhat.com>
++
++	Do not open script filenames twice.
++	* cli/cli-cmds.c (source_script_from_stream): Pass to
++	source_python_script also STREAM.
++	* python/py-auto-load.c (source_section_scripts): Pass to
++	source_python_script_for_objfile also STREAM.
++	(auto_load_objfile_script): Pass to source_python_script_for_objfile
++	also INPUT.
++	* python/python-internal.h (source_python_script_for_objfile): New
++	parameter file, rename parameter file to filename.
++	* python/python.c (python_run_simple_file): Call PyRun_SimpleFile
++	instead if !_WIN32.  Update the function comment.
++	(source_python_script, source_python_script_for_objfile)
++	(source_python_script): New parameter file, rename parameter file to
++	filename.  Pass FILENAME to python_run_simple_file.
++	* python/python.h (source_python_script): New parameter file, rename
++	parameter file to filename.
++
+ 2012-01-26  Pedro Alves  <palves@redhat.com>
+ 
+ 	* corelow.c (core_has_fake_pid): Delete.
+Index: gdb-7.4.50.20120120/gdb/cli/cli-cmds.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/cli/cli-cmds.c	2012-01-04 09:17:16.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/cli/cli-cmds.c	2012-04-18 00:41:42.696855430 +0200
+@@ -529,9 +529,7 @@ source_script_from_stream (FILE *stream,
+ 
+       TRY_CATCH (e, RETURN_MASK_ERROR)
+ 	{
+-          /* The python support reopens the file using python functions,
+-             so there's no point in passing STREAM here.  */
+-	  source_python_script (file);
++	  source_python_script (stream, file);
+ 	}
+       if (e.reason < 0)
+ 	{
+Index: gdb-7.4.50.20120120/gdb/python/py-auto-load.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/python/py-auto-load.c	2012-01-04 09:17:25.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/python/py-auto-load.c	2012-04-18 00:41:42.696855430 +0200
+@@ -312,7 +312,7 @@ Use `info auto-load-scripts [REGEXP]' to
+ 	{
+ 	  /* If this file is not currently loaded, load it.  */
+ 	  if (! in_hash_table)
+-	    source_python_script_for_objfile (objfile, full_path);
++	    source_python_script_for_objfile (objfile, stream, full_path);
+ 	  fclose (stream);
+ 	  xfree (full_path);
+ 	}
+@@ -431,7 +431,7 @@ auto_load_objfile_script (struct objfile
+ 	 It's highly unlikely that we'd ever load it twice,
+ 	 and these scripts are required to be idempotent under multiple
+ 	 loads anyway.  */
+-      source_python_script_for_objfile (objfile, debugfile);
++      source_python_script_for_objfile (objfile, input, debugfile);
+       fclose (input);
+     }
+ 
+Index: gdb-7.4.50.20120120/gdb/python/python-internal.h
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/python/python-internal.h	2012-01-04 09:17:25.000000000 +0100
++++ gdb-7.4.50.20120120/gdb/python/python-internal.h	2012-04-18 00:41:42.696855430 +0200
+@@ -289,8 +289,8 @@ extern const struct language_defn *pytho
+ 
+ void gdbpy_print_stack (void);
+ 
+-void source_python_script_for_objfile (struct objfile *objfile,
+-				       const char *file);
++void source_python_script_for_objfile (struct objfile *objfile, FILE *file,
++				       const char *filename);
+ 
+ PyObject *python_string_to_unicode (PyObject *obj);
+ char *unicode_to_target_string (PyObject *unicode_str);
+Index: gdb-7.4.50.20120120/gdb/python/python.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/python/python.c	2012-04-18 00:41:30.000000000 +0200
++++ gdb-7.4.50.20120120/gdb/python/python.c	2012-04-18 00:41:42.696855430 +0200
+@@ -154,34 +154,31 @@ ensure_python_env (struct gdbarch *gdbar
+   return make_cleanup (restore_python_env, env);
+ }
+ 
+-/* A wrapper around PyRun_SimpleFile.  FILENAME is the name of
+-   the Python script to run.
++/* A wrapper around PyRun_SimpleFile.  FILE is the Python script to run
++   named FILENAME.
+ 
+-   One of the parameters of PyRun_SimpleFile is a FILE *.
+-   The problem is that type FILE is extremely system and compiler
+-   dependent.  So, unless the Python library has been compiled using
+-   the same build environment as GDB, we run the risk of getting
+-   a crash due to inconsistencies between the definition used by GDB,
+-   and the definition used by Python.  A mismatch can very likely
+-   lead to a crash.
+-
+-   There is also the situation where the Python library and GDB
+-   are using two different versions of the C runtime library.
+-   This is particularly visible on Windows, where few users would
+-   build Python themselves (this is no trivial task on this platform),
+-   and thus use binaries built by someone else instead. Python,
+-   being built with VC, would use one version of the msvcr DLL
+-   (Eg. msvcr100.dll), while MinGW uses msvcrt.dll.  A FILE *
+-   from one runtime does not necessarily operate correctly in
++   On Windows hosts few users would build Python themselves (this is no
++   trivial task on this platform), and thus use binaries built by
++   someone else instead.  There may happen situation where the Python
++   library and GDB are using two different versions of the C runtime
++   library.  Python, being built with VC, would use one version of the
++   msvcr DLL (Eg. msvcr100.dll), while MinGW uses msvcrt.dll.
++   A FILE * from one runtime does not necessarily operate correctly in
+    the other runtime.
+ 
+-   To work around this potential issue, we create the FILE object
+-   using Python routines, thus making sure that it is compatible
+-   with the Python library.  */
++   To work around this potential issue, we create on Windows hosts the
++   FILE object using Python routines, thus making sure that it is
++   compatible with the Python library.  */
+ 
+ static void
+-python_run_simple_file (const char *filename)
++python_run_simple_file (FILE *file, const char *filename)
+ {
++#ifndef _WIN32
++
++  PyRun_SimpleFile (file, filename);
++
++#else /* _WIN32 */
++
+   char *full_path;
+   PyObject *python_file;
+   struct cleanup *cleanup;
+@@ -201,6 +198,8 @@ python_run_simple_file (const char *file
+   make_cleanup_py_decref (python_file);
+   PyRun_SimpleFile (PyFile_AsFile (python_file), filename);
+   do_cleanups (cleanup);
++
++#endif /* _WIN32 */
+ }
+ 
+ /* Given a command_line, return a command string suitable for passing
+@@ -623,17 +622,17 @@ gdbpy_parse_and_eval (PyObject *self, Py
+ }
+ 
+ /* Read a file as Python code.
+-   FILE is the name of the file.
++   FILE is the file to run.  FILENAME is name of the file FILE.
+    This does not throw any errors.  If an exception occurs python will print
+    the traceback and clear the error indicator.  */
+ 
+ void
+-source_python_script (const char *file)
++source_python_script (FILE *file, const char *filename)
+ {
+   struct cleanup *cleanup;
+ 
+   cleanup = ensure_python_env (get_current_arch (), current_language);
+-  python_run_simple_file (file);
++  python_run_simple_file (file, filename);
+   do_cleanups (cleanup);
+ }
+ 
+@@ -1041,19 +1040,20 @@ gdbpy_progspaces (PyObject *unused1, PyO
+    source_python_script_for_objfile; it is NULL at other times.  */
+ static struct objfile *gdbpy_current_objfile;
+ 
+-/* Set the current objfile to OBJFILE and then read FILE as Python code.
+-   This does not throw any errors.  If an exception occurs python will print
+-   the traceback and clear the error indicator.  */
++/* Set the current objfile to OBJFILE and then read FILE named FILENAME
++   as Python code.  This does not throw any errors.  If an exception
++   occurs python will print the traceback and clear the error indicator.  */
+ 
+ void
+-source_python_script_for_objfile (struct objfile *objfile, const char *file)
++source_python_script_for_objfile (struct objfile *objfile, FILE *file,
++                                  const char *filename)
+ {
+   struct cleanup *cleanups;
+ 
+   cleanups = ensure_python_env (get_objfile_arch (objfile), current_language);
+   gdbpy_current_objfile = objfile;
+ 
+-  python_run_simple_file (file);
++  python_run_simple_file (file, filename);
+ 
+   do_cleanups (cleanups);
+   gdbpy_current_objfile = NULL;
+@@ -1129,7 +1129,7 @@ eval_python_from_control_command (struct
+ }
+ 
+ void
+-source_python_script (const char *file)
++source_python_script (FILE *file, const char *filename)
+ {
+   throw_error (UNSUPPORTED_ERROR,
+ 	       _("Python scripting is not supported in this copy of GDB."));
+Index: gdb-7.4.50.20120120/gdb/python/python.h
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/python/python.h	2012-04-18 00:41:30.000000000 +0200
++++ gdb-7.4.50.20120120/gdb/python/python.h	2012-04-18 00:41:42.697855427 +0200
+@@ -30,7 +30,7 @@ extern void finish_python_initialization
+ 
+ void eval_python_from_control_command (struct command_line *);
+ 
+-void source_python_script (const char *file);
++void source_python_script (FILE *file, const char *filename);
+ 
+ void run_python_script (int argc, char **argv);
+ 

gdb-autoload-04of28.patch

@@ -0,0 +1,141 @@
+http://sourceware.org/ml/gdb-cvs/2012-03/msg00234.html
+
+### src/gdb/ChangeLog	2012/03/19 18:13:39	1.14025
+### src/gdb/ChangeLog	2012/03/19 18:16:17	1.14026
+## -1,3 +1,14 @@
++2012-03-19  Jan Kratochvil  <jan.kratochvil@redhat.com>
++
++	Code cleanup.
++	* main.c (struct cmdarg): Move it here from main.  Add more comments.
++	(cmdarg_s, VEC (cmdarg_s)): New.
++	(main): Move struct cmdarg from here.  New variables cmdarg_vec and
++	cmdarg_p.  Remove variables cmdsize and ncmd and their initialization.
++	Install cleanup for cmdarg_vec.  Update filling for options 'x' and
++	'X'.  Replace cmdarg processing by cmdarg_vec processing.  Remove xfree
++	of CMDARG.
++
+ 2012-03-19  Tom Tromey  <tromey@redhat.com>
+ 
+ 	* gnu-v3-abi.c (gnuv3_print_vtable): Initialize 'result_vec'.
+Index: gdb-7.4.50.20120120/gdb/main.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/main.c	2012-04-18 00:41:31.000000000 +0200
++++ gdb-7.4.50.20120120/gdb/main.c	2012-04-18 00:42:15.354772337 +0200
+@@ -277,6 +277,25 @@ exec_or_core_file_attach (char *filename
+     }
+ }
+ 
++/* Arguments of --command option and its counterpart.  */
++typedef struct cmdarg {
++  /* Type of this option.  */
++  enum {
++    /* Option type -x.  */
++    CMDARG_FILE,
++
++    /* Option type -ex.  */
++    CMDARG_COMMAND
++  } type;
++
++  /* Value of this option - filename or the GDB command itself.  String memory
++     is not owned by this structure despite it is 'const'.  */
++  char *string;
++} cmdarg_s;
++
++/* Define type VEC (cmdarg_s).  */
++DEF_VEC_O (cmdarg_s);
++
+ static int
+ captured_main (void *data)
+ {
+@@ -303,17 +322,8 @@ captured_main (void *data)
+   static int print_version;
+ 
+   /* Pointers to all arguments of --command option.  */
+-  struct cmdarg {
+-    enum {
+-      CMDARG_FILE,
+-      CMDARG_COMMAND
+-    } type;
+-    char *string;
+-  } *cmdarg;
+-  /* Allocated size of cmdarg.  */
+-  int cmdsize;
+-  /* Number of elements of cmdarg used.  */
+-  int ncmd;
++  VEC (cmdarg_s) *cmdarg_vec = NULL;
++  struct cmdarg *cmdarg_p;
+ 
+   /* Indices of all arguments of --directory option.  */
+   char **dirarg;
+@@ -349,9 +359,7 @@ captured_main (void *data)
+   bindtextdomain (PACKAGE, LOCALEDIR);
+   textdomain (PACKAGE);
+ 
+-  cmdsize = 1;
+-  cmdarg = (struct cmdarg *) xmalloc (cmdsize * sizeof (*cmdarg));
+-  ncmd = 0;
++  make_cleanup (VEC_cleanup (cmdarg_s), &cmdarg_vec);
+   dirsize = 1;
+   dirarg = (char **) xmalloc (dirsize * sizeof (*dirarg));
+   ndir = 0;
+@@ -582,24 +590,19 @@ captured_main (void *data)
+ 	    pidarg = optarg;
+ 	    break;
+ 	  case 'x':
+-	    cmdarg[ncmd].type = CMDARG_FILE;
+-	    cmdarg[ncmd++].string = optarg;
+-	    if (ncmd >= cmdsize)
+-	      {
+-		cmdsize *= 2;
+-		cmdarg = xrealloc ((char *) cmdarg,
+-				   cmdsize * sizeof (*cmdarg));
+-	      }
++	    {
++	      struct cmdarg cmdarg = { CMDARG_FILE, optarg };
++
++	      VEC_safe_push (cmdarg_s, cmdarg_vec, &cmdarg);
++	    }
+ 	    break;
+ 	  case 'X':
+-	    cmdarg[ncmd].type = CMDARG_COMMAND;
+-	    cmdarg[ncmd++].string = optarg;
+-	    if (ncmd >= cmdsize)
+-	      {
+-		cmdsize *= 2;
+-		cmdarg = xrealloc ((char *) cmdarg,
+-				   cmdsize * sizeof (*cmdarg));
+-	      }
++	    {
++	      struct cmdarg cmdarg = { CMDARG_COMMAND, optarg };
++
++	      VEC_safe_push (cmdarg_s, cmdarg_vec, &cmdarg);
++	    }
++	    break;
+ 	    break;
+ 	  case 'B':
+ 	    batch_flag = batch_silent = 1;
+@@ -990,16 +993,18 @@ captured_main (void *data)
+   ALL_OBJFILES (objfile)
+     load_auto_scripts_for_objfile (objfile);
+ 
+-  for (i = 0; i < ncmd; i++)
++  for (i = 0; VEC_iterate (cmdarg_s, cmdarg_vec, i, cmdarg_p); i++)
++    switch (cmdarg_p->type)
+     {
+-      if (cmdarg[i].type == CMDARG_FILE)
+-        catch_command_errors (source_script, cmdarg[i].string,
++      case CMDARG_FILE:
++        catch_command_errors (source_script, cmdarg_p->string,
+ 			      !batch_flag, RETURN_MASK_ALL);
+-      else  /* cmdarg[i].type == CMDARG_COMMAND */
+-        catch_command_errors (execute_command, cmdarg[i].string,
++	break;
++      case CMDARG_COMMAND:
++        catch_command_errors (execute_command, cmdarg_p->string,
+ 			      !batch_flag, RETURN_MASK_ALL);
++	break;
+     }
+-  xfree (cmdarg);
+ 
+   /* Read in the old history after all the command files have been
+      read.  */

gdb-autoload-05of28.patch

@@ -0,0 +1,244 @@
+http://sourceware.org/ml/gdb-cvs/2012-03/msg00235.html
+
+### src/gdb/ChangeLog	2012/03/19 18:16:17	1.14026
+### src/gdb/ChangeLog	2012/03/19 18:19:23	1.14027
+## -1,5 +1,18 @@
+ 2012-03-19  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
++	* NEWS: Describe new options --init-command=FILE, -ix and
++	--init-eval-command=COMMAND, -iex.
++	* main.c (struct cmdarg): New enum items CMDARG_INIT_FILE and
++	CMDARG_INIT_COMMAND.
++	(captured_main): New enum items OPT_IX and OPT_IEX.  Add
++	"init-command", "init-eval-command", "ix" and "iex" to the variable
++	long_options.  Handle OPT_IX and OPT_IEX.  Process them from CMDARG_VEC.
++	New comment for CMDARG_FILE and CMDARG_COMMAND processing.
++	(print_gdb_help): Describe --init-command=FILE, -ix and
++	--init-eval-command=COMMAND, -iex.
++
++2012-03-19  Jan Kratochvil  <jan.kratochvil@redhat.com>
++
+ 	Code cleanup.
+ 	* main.c (struct cmdarg): Move it here from main.  Add more comments.
+ 	(cmdarg_s, VEC (cmdarg_s)): New.
+Index: gdb-7.4.50.20120120/gdb/NEWS
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/NEWS	2012-04-18 00:41:30.000000000 +0200
++++ gdb-7.4.50.20120120/gdb/NEWS	2012-04-18 00:42:51.226681068 +0200
+@@ -28,6 +28,13 @@
+   now set a breakpoint in build/gcc/expr.c, but not
+   build/libcpp/expr.c.
+ 
++* New command line options
++
++--init-command=FILE, -ix          Like --command, -x but execute it
++                                  before loading inferior.
++--init-eval-command=COMMAND, -iex Like --eval-command=COMMAND, -ex but
++                                  execute it before loading inferior.
++
+ *** Changes in GDB 7.4
+ 
+ * GDB now handles ambiguous linespecs more consistently; the existing
+Index: gdb-7.4.50.20120120/gdb/main.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/main.c	2012-04-18 00:42:15.000000000 +0200
++++ gdb-7.4.50.20120120/gdb/main.c	2012-04-18 00:42:51.226681068 +0200
+@@ -285,7 +285,13 @@ typedef struct cmdarg {
+     CMDARG_FILE,
+ 
+     /* Option type -ex.  */
+-    CMDARG_COMMAND
++    CMDARG_COMMAND,
++
++    /* Option type -ix.  */
++    CMDARG_INIT_FILE,
++    
++    /* Option type -iex.  */
++    CMDARG_INIT_COMMAND
+   } type;
+ 
+   /* Value of this option - filename or the GDB command itself.  String memory
+@@ -434,7 +440,9 @@ captured_main (void *data)
+       OPT_STATISTICS,
+       OPT_TUI,
+       OPT_NOWINDOWS,
+-      OPT_WINDOWS
++      OPT_WINDOWS,
++      OPT_IX,
++      OPT_IEX
+     };
+     static struct option long_options[] =
+     {
+@@ -475,6 +483,10 @@ captured_main (void *data)
+       {"version", no_argument, &print_version, 1},
+       {"x", required_argument, 0, 'x'},
+       {"ex", required_argument, 0, 'X'},
++      {"init-command", required_argument, 0, OPT_IX},
++      {"init-eval-command", required_argument, 0, OPT_IEX},
++      {"ix", required_argument, 0, OPT_IX},
++      {"iex", required_argument, 0, OPT_IEX},
+ #ifdef GDBTK
+       {"tclcommand", required_argument, 0, 'z'},
+       {"enable-external-editor", no_argument, 0, 'y'},
+@@ -603,6 +615,19 @@ captured_main (void *data)
+ 	      VEC_safe_push (cmdarg_s, cmdarg_vec, &cmdarg);
+ 	    }
+ 	    break;
++	  case OPT_IX:
++	    {
++	      struct cmdarg cmdarg = { CMDARG_INIT_FILE, optarg };
++
++	      VEC_safe_push (cmdarg_s, cmdarg_vec, &cmdarg);
++	    }
++	    break;
++	  case OPT_IEX:
++	    {
++	      struct cmdarg cmdarg = { CMDARG_INIT_COMMAND, optarg };
++
++	      VEC_safe_push (cmdarg_s, cmdarg_vec, &cmdarg);
++	    }
+ 	    break;
+ 	  case 'B':
+ 	    batch_flag = batch_silent = 1;
+@@ -877,6 +902,20 @@ captured_main (void *data)
+   quit_pre_print = error_pre_print;
+   warning_pre_print = _("\nwarning: ");
+ 
++  /* Process '-ix' and '-iex' options early.  */
++  for (i = 0; VEC_iterate (cmdarg_s, cmdarg_vec, i, cmdarg_p); i++)
++    switch (cmdarg_p->type)
++    {
++      case CMDARG_INIT_FILE:
++        catch_command_errors (source_script, cmdarg_p->string,
++			      !batch_flag, RETURN_MASK_ALL);
++	break;
++      case CMDARG_INIT_COMMAND:
++        catch_command_errors (execute_command, cmdarg_p->string,
++			      !batch_flag, RETURN_MASK_ALL);
++	break;
++    }
++
+   /* Read and execute the system-wide gdbinit file, if it exists.
+      This is done *before* all the command line arguments are
+      processed; it sets global parameters, which are independent of
+@@ -993,6 +1032,7 @@ captured_main (void *data)
+   ALL_OBJFILES (objfile)
+     load_auto_scripts_for_objfile (objfile);
+ 
++  /* Process '-x' and '-ex' options.  */
+   for (i = 0; VEC_iterate (cmdarg_s, cmdarg_vec, i, cmdarg_p); i++)
+     switch (cmdarg_p->type)
+     {
+@@ -1093,6 +1133,8 @@ Options:\n\n\
+                      Execute a single GDB command.\n\
+                      May be used multiple times and in conjunction\n\
+                      with --command.\n\
++  --init-command=FILE, -ix Like -x but execute it before loading inferior.\n\
++  --init-eval-command=COMMAND, -iex Like -ex but before loading inferior.\n\
+   --core=COREFILE    Analyze the core dump COREFILE.\n\
+   --pid=PID          Attach to running process PID.\n\
+ "), stream);
+Index: gdb-7.4.50.20120120/gdb/doc/gdb.texinfo
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/doc/gdb.texinfo	2012-04-18 00:41:31.000000000 +0200
++++ gdb-7.4.50.20120120/gdb/doc/gdb.texinfo	2012-04-18 00:42:51.232681052 +0200
+@@ -989,6 +989,22 @@ also be interleaved with @samp{-command}
+    -x setbreakpoints -ex 'run' a.out
+ @end smallexample
+ 
++@item -init-command @var{file}
++@itemx -ix @var{file}
++@cindex @code{--init-command}
++@cindex @code{-ix}
++Execute commands from file @var{file} before loading gdbinit files or the
++inferior.
++@xref{Startup}.
++
++@item -init-eval-command @var{command}
++@itemx -iex @var{command}
++@cindex @code{--init-eval-command}
++@cindex @code{-iex}
++Execute a single @value{GDBN} command before loading gdbinit files or the
++inferior.
++@xref{Startup}.
++
+ @item -directory @var{directory}
+ @itemx -d @var{directory}
+ @cindex @code{--directory}
+@@ -1250,6 +1266,13 @@ Sets up the command interpreter as speci
+ (@pxref{Mode Options, interpreter}).
+ 
+ @item
++Executes commands and command files specified by the @samp{-iex} and
++@samp{-ix} options in their specified order.  Usually you should use the
++@samp{-ex} and @samp{-x} options instead, but this way you can apply
++settings before @value{GDBN} init files get executed and before inferior
++gets loaded.
++
++@item
+ @cindex init file
+ Reads the system-wide @dfn{init file} (if @option{--with-system-gdbinit} was
+ used when building @value{GDBN}; @pxref{System-wide configuration,
+@@ -1283,14 +1306,11 @@ If you wish to disable the auto-loading
+ you must do something like the following:
+ 
+ @smallexample
+-$ gdb -ex "set auto-load-scripts off" -ex "file myprogram"
++$ gdb -iex "set auto-load-scripts off" myprogram
+ @end smallexample
+ 
+-The following does not work because the auto-loading is turned off too late:
+-
+-@smallexample
+-$ gdb -ex "set auto-load-scripts off" myprogram
+-@end smallexample
++Option @samp{-ex} does not work because the auto-loading is then turned
++off too late.
+ 
+ @item
+ Reads command files specified by the @samp{-x} option.  @xref{Command
+Index: gdb-7.4.50.20120120/gdb/testsuite/gdb.gdb/selftest.exp
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/testsuite/gdb.gdb/selftest.exp	2012-04-18 00:41:31.000000000 +0200
++++ gdb-7.4.50.20120120/gdb/testsuite/gdb.gdb/selftest.exp	2012-04-18 00:42:51.232681052 +0200
+@@ -92,6 +92,10 @@ proc do_steps_and_nexts {} {
+ 		set description "step over python_script initialization"
+ 		set command "step"
+ 	    }
++	    -re ".*cmdarg_vec = NULL.*$gdb_prompt $" {
++		set description "step over cmdarg_vec initialization"
++		set command "step"
++	    }
+ 	    -re ".*pre_stat_chain = make_command_stats_cleanup.*$gdb_prompt $" {
+ 		set description "next over make_command_stats_cleanup and everything it calls"
+ 		set command "next"
+@@ -128,18 +132,6 @@ proc do_steps_and_nexts {} {
+ 		set description "next over conditional stack alignment alloca"
+ 		set command "next"
+ 	    }
+-	    -re ".*cmdsize = 1.*$gdb_prompt $" {
+-		set description "step over cmdsize initialization"
+-		set command "next"
+-	    }
+-	    -re ".*cmdarg = .* xmalloc.*$gdb_prompt $" {
+-		set description "next over cmdarg initialization via xmalloc"
+-		set command "next"
+-	    }
+-	    -re ".*ncmd = 0.*$gdb_prompt $" {
+-		set description "next over ncmd initialization"
+-		set command "next"
+-	    }
+ 	    -re ".*dirsize = 1.*$gdb_prompt $" {
+ 		set description "next over dirsize initialization"
+ 		set command "next"
+@@ -163,6 +155,10 @@ proc do_steps_and_nexts {} {
+ 		set description "next over textdomain PACKAGE"
+ 		set command "next"
+ 	    }
++	    -re ".*VEC_cleanup .cmdarg_s.*$gdb_prompt $" {
++		set description "next over cmdarg_s VEC_cleanup"
++		set command "next"
++	    }
+ 	    -re "\[0-9\]+\[\t \]+\{\r\n$gdb_prompt $" {
+ 		set description "step over initial brace"
+ 		set command "step"

gdb-autoload-06of28.patch

@@ -0,0 +1,71 @@
+http://sourceware.org/ml/gdb-cvs/2012-03/msg00236.html
+
+### src/gdb/ChangeLog	2012/03/19 18:19:23	1.14027
+### src/gdb/ChangeLog	2012/03/19 18:23:51	1.14028
+## -1,5 +1,13 @@
+ 2012-03-19  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
++	Code cleanup.
++	* python/py-auto-load.c (source_section_scripts): New variable back_to.
++	Turn fclose and xfree calls into make_cleanup_fclose and make_cleanup
++	with xfree.
++	(auto_load_objfile_script): Turn fclose into make_cleanup_fclose.
++
++2012-03-19  Jan Kratochvil  <jan.kratochvil@redhat.com>
++
+ 	* NEWS: Describe new options --init-command=FILE, -ix and
+ 	--init-eval-command=COMMAND, -iex.
+ 	* main.c (struct cmdarg): New enum items CMDARG_INIT_FILE and
+--- src/gdb/python/py-auto-load.c	2012/01/26 21:54:45	1.18
++++ src/gdb/python/py-auto-load.c	2012/03/19 18:23:52	1.19
+@@ -254,6 +254,7 @@
+       FILE *stream;
+       char *full_path;
+       int opened, in_hash_table;
++      struct cleanup *back_to;
+ 
+       if (*p != 1)
+ 	{
+@@ -286,6 +287,13 @@
+       opened = find_and_open_script (file, 1 /*search_path*/,
+ 				     &stream, &full_path);
+ 
++      back_to = make_cleanup (null_cleanup, NULL);
++      if (opened)
++	{
++	  make_cleanup_fclose (stream);
++	  make_cleanup (xfree, full_path);
++	}
++
+       /* If one script isn't found it's not uncommon for more to not be
+ 	 found either.  We don't want to print an error message for each
+ 	 script, too much noise.  Instead, we print the warning once and tell
+@@ -313,9 +321,9 @@
+ 	  /* If this file is not currently loaded, load it.  */
+ 	  if (! in_hash_table)
+ 	    source_python_script_for_objfile (objfile, stream, full_path);
+-	  fclose (stream);
+-	  xfree (full_path);
+ 	}
++
++      do_cleanups (back_to);
+     }
+ }
+ 
+@@ -420,6 +428,8 @@
+     {
+       struct auto_load_pspace_info *pspace_info;
+ 
++      make_cleanup_fclose (input);
++
+       /* Add this script to the hash table too so "info auto-load-scripts"
+ 	 can print it.  */
+       pspace_info =
+@@ -432,7 +442,6 @@
+ 	 and these scripts are required to be idempotent under multiple
+ 	 loads anyway.  */
+       source_python_script_for_objfile (objfile, input, debugfile);
+-      fclose (input);
+     }
+ 
+   do_cleanups (cleanups);

gdb-autoload-07of28.patch

@@ -0,0 +1,57 @@
+http://sourceware.org/ml/gdb-cvs/2012-03/msg00296.html
+
+### src/gdb/doc/ChangeLog	2012/03/22 08:10:41	1.1289
+### src/gdb/doc/ChangeLog	2012/03/27 20:15:20	1.1290
+## -1,3 +1,12 @@
++2012-03-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
++
++	* gdb.texinfo (Auto-loading): Rename node reference
++	'.debug_gdb_scripts section' to 'dotdebug_gdb_scripts section'.
++	Twice.
++	(.debug_gdb_scripts section): Rename the node ...
++	(dotdebug_gdb_scripts section): ... here.
++	(Maintenance Commands): Also rename this node reference.
++
+ 2012-03-22  Siva Chandra Reddy  <sivachandra@google.com>
+ 
+ 	* gdb.texinfo (Python API/Values From Inferior): Add description
+--- src/gdb/doc/gdb.texinfo	2012/03/22 08:10:41	1.936
++++ src/gdb/doc/gdb.texinfo	2012/03/27 20:15:20	1.937
+@@ -24717,8 +24717,8 @@
+ @file{@var{objfile}-gdb.py} and @code{.debug_gdb_scripts} section.
+ 
+ @menu
+-* objfile-gdb.py file::         The @file{@var{objfile}-gdb.py} file
+-* .debug_gdb_scripts section::  The @code{.debug_gdb_scripts} section
++* objfile-gdb.py file::          The @file{@var{objfile}-gdb.py} file
++* dotdebug_gdb_scripts section:: The @code{.debug_gdb_scripts} section
+ * Which flavor to choose?::
+ @end menu
+ 
+@@ -24744,7 +24744,7 @@
+ 
+ Also printed is the list of scripts that were mentioned in
+ the @code{.debug_gdb_scripts} section and were not found
+-(@pxref{.debug_gdb_scripts section}).
++(@pxref{dotdebug_gdb_scripts section}).
+ This is useful because their names are not printed when @value{GDBN}
+ tries to load them and fails.  There may be many of them, and printing
+ an error message for each one is problematic.
+@@ -24795,7 +24795,7 @@
+ So your @file{-gdb.py} file should be careful to avoid errors if it
+ is evaluated more than once.
+ 
+-@node .debug_gdb_scripts section
++@node dotdebug_gdb_scripts section
+ @subsubsection The @code{.debug_gdb_scripts} section
+ @cindex @code{.debug_gdb_scripts} section
+ 
+@@ -33475,7 +33475,7 @@
+ matching @var{regexp}.
+ For each script, this command prints its name as specified in the objfile,
+ and the full path if known.
+-@xref{.debug_gdb_scripts section}.
++@xref{dotdebug_gdb_scripts section}.
+ 
+ @kindex maint print statistics
+ @cindex bcache statistics

gdb-autoload-08of28.patch

@@ -0,0 +1,171 @@
+[patch#4 2/8] Code cleanup: new path to VEC in utils.c
+http://sourceware.org/ml/gdb-patches/2012-04/msg00086.html
+http://sourceware.org/ml/gdb-cvs/2012-04/msg00111.html
+ - reduced for the backport
+
+### src/gdb/ChangeLog	2012/04/17 15:45:05	1.14110
+### src/gdb/ChangeLog	2012/04/17 15:47:08	1.14111
+## -1,6 +1,34 @@
+ 2012-04-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+ 	Code cleanup.
++	* charset.c (find_charset_names): Remove variables ix and elt.
++	Use free_char_ptr_vec.
++	* elfread.c (build_id_to_debug_filename): New variables debugdir_vec,
++	back_to and ix.  Use dirnames_to_char_ptr_vec.  Remove variable
++	debugdir_end.  New variable debugdir_len.
++	* gdb_vecs.h (free_char_ptr_vec, make_cleanup_free_char_ptr_vec)
++	(dirnames_to_char_ptr_vec_append, dirnames_to_char_ptr_vec): New
++	declarations.
++	* progspace.c (clear_program_space_solib_cache): Remove variables ix
++	and elt.  Use free_char_ptr_vec.
++	* source.c (add_path): Remove variables argv, arg and argv_index.
++	New variables dir_vec, back_to, ix and name.
++	Use dirnames_to_char_ptr_vec_append.  Use freeargv instead of
++	make_cleanup_freeargv.  Remove variable separator.  Simplify the code
++	no longer expecting DIRNAME_SEPARATOR.
++	(openp): Remove variable p, p1 and len.  New variables dir_vec,
++	back_to, ix and dir.  Use dirnames_to_char_ptr_vec.  Simplify the code
++	no longer expecting DIRNAME_SEPARATOR.
++	* symfile.c (find_separate_debug_file): New variables debugdir_vec,
++	back_to and ix.  Use dirnames_to_char_ptr_vec.  Remove variable
++	debugdir_end.
++	* utils.c (free_char_ptr_vec, do_free_char_ptr_vec)
++	(make_cleanup_free_char_ptr_vec, dirnames_to_char_ptr_vec_append)
++	(dirnames_to_char_ptr_vec): New functions.
++
++2012-04-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
++
++	Code cleanup.
+ 	* source.c (add_path): Remove always true conditional 'p == 0' and
+ 	unindent its code block.
+ 
+Index: gdb-7.4.50.20120120/gdb/gdb_vecs.h
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/gdb_vecs.h	2012-04-18 00:40:12.067086016 +0200
++++ gdb-7.4.50.20120120/gdb/gdb_vecs.h	2012-04-18 00:40:23.474056993 +0200
+@@ -25,4 +25,16 @@
+ 
+ DEF_VEC_P (char_ptr);
+ 
++/* From utils.c: */
++
++extern void free_char_ptr_vec (VEC (char_ptr) *char_ptr_vec);
++
++extern struct cleanup *
++  make_cleanup_free_char_ptr_vec (VEC (char_ptr) *char_ptr_vec);
++
++extern void dirnames_to_char_ptr_vec_append (VEC (char_ptr) **vecp,
++					     const char *dirnames);
++
++extern VEC (char_ptr) *dirnames_to_char_ptr_vec (const char *dirnames);
++
+ #endif /* GDB_VECS_H */
+Index: gdb-7.4.50.20120120/gdb/utils.c
+===================================================================
+--- gdb-7.4.50.20120120.orig/gdb/utils.c	2012-04-18 00:40:12.068086013 +0200
++++ gdb-7.4.50.20120120/gdb/utils.c	2012-04-18 00:40:49.862989855 +0200
+@@ -29,6 +29,7 @@
+ #ifdef HAVE_SYS_RESOURCE_H
+ #include <sys/resource.h>
+ #endif /* HAVE_SYS_RESOURCE_H */
++#include "gdb_vecs.h"
+ 
+ #ifdef TUI
+ #include "tui/tui.h"		/* For tui_get_command_dimension.   */
+@@ -3835,6 +3836,95 @@ producer_is_gcc_ge_4 (const char *produc
+   return minor;
+ }
+ 
++/* Call xfree for each element of CHAR_PTR_VEC and final VEC_free for
++   CHAR_PTR_VEC itself.
++
++   You must not modify CHAR_PTR_VEC after it got registered with this function
++   by make_cleanup as the CHAR_PTR_VEC base address may change on its updates.
++   Contrary to VEC_free this function does not (cannot) clear the pointer.  */
++
++void
++free_char_ptr_vec (VEC (char_ptr) *char_ptr_vec)
++{
++  int ix;
++  char *name;
++
++  for (ix = 0; VEC_iterate (char_ptr, char_ptr_vec, ix, name); ++ix)
++    xfree (name);
++  VEC_free (char_ptr, char_ptr_vec);
++}
++
++/* Helper for make_cleanup_free_char_ptr_vec.  */
++
++static void
++do_free_char_ptr_vec (void *arg)
++{
++  VEC (char_ptr) *char_ptr_vec = arg;
++
++  free_char_ptr_vec (char_ptr_vec);
++}
++
++/* Make cleanup handler calling xfree for each element of CHAR_PTR_VEC and
++   final VEC_free for CHAR_PTR_VEC itself.
++
++   You must not modify CHAR_PTR_VEC after this cleanup registration as the
++   CHAR_PTR_VEC base address may change on its updates.  Contrary to VEC_free
++   this function does not (cannot) clear the pointer.  */
++
++struct cleanup *
++make_cleanup_free_char_ptr_vec (VEC (char_ptr) *char_ptr_vec)
++{
++  return make_cleanup (do_free_char_ptr_vec, char_ptr_vec);
++}
++
++/* Extended version of dirnames_to_char_ptr_vec - additionally if *VECP is
++   non-NULL the new list elements from DIRNAMES are appended to the existing
++   *VECP list of entries.  *VECP address will be updated by this call.  */
++
++void
++dirnames_to_char_ptr_vec_append (VEC (char_ptr) **vecp, const char *dirnames)
++{
++  do
++    {
++      size_t this_len;
++      char *next_dir, *this_dir;
++
++      next_dir = strchr (dirnames, DIRNAME_SEPARATOR);
++      if (next_dir == NULL)
++	this_len = strlen (dirnames);
++      else
++	{
++	  this_len = next_dir - dirnames;
++	  next_dir++;
++	}
++
++      this_dir = xmalloc (this_len + 1);
++      memcpy (this_dir, dirnames, this_len);
++      this_dir[this_len] = '\0';
++      VEC_safe_push (char_ptr, *vecp, this_dir);
++
++      dirnames = next_dir;
++    }
++  while (dirnames != NULL);
++}
++
++/* Split DIRNAMES by DIRNAME_SEPARATOR delimiter and return a list of all the
++   elements in their original order.  For empty string ("") DIRNAMES return
++   list of one empty string ("") element.
++   
++   You may modify the returned strings.
++   Read free_char_ptr_vec for its cleanup.  */
++
++VEC (char_ptr) *
++dirnames_to_char_ptr_vec (const char *dirnames)
++{
++  VEC (char_ptr) *retval = NULL;
++  
++  dirnames_to_char_ptr_vec_append (&retval, dirnames);
++
++  return retval;
++}
++
+ #ifdef HAVE_WAITPID
+ 
+ #ifdef SIGALRM