dist-git conversion

559291).

.gitignore

@@ -1,4 +1 @@
-/binutils-gdb
-/gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz
-/v2.0.2.tar.gz
-/gdb-10.1.tar.xz
+gdb-6.8.50.20090302.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`

REGRESSIONS

@@ -0,0 +1,44 @@
+all:
+gdb.objc/objcdecode.exp: continue after break on multiply defined symbol (GDB internal error)
+64->32:
++FAIL: gdb.opt/inline-cmds.exp: enter noinline from outer_inline1
++FAIL: gdb.opt/inline-cmds.exp: backtrace at noinline from outer_inline1
++FAIL: gdb.opt/inline-cmds.exp: enter inlined_fn from noinline (the program is no longer running)
++FAIL: gdb.opt/inline-cmds.exp: backtrace at inlined_fn from noinline
++FAIL: gdb.opt/inline-cmds.exp: inlined_fn from noinline inlined
++FAIL: gdb.opt/inline-cmds.exp: up to noinline
++FAIL: gdb.opt/inline-cmds.exp: noinline from outer_inline1 not inlined
++FAIL: gdb.opt/inline-cmds.exp: up to outer_inline1
++FAIL: gdb.opt/inline-cmds.exp: outer_inline1 inlined
++FAIL: gdb.opt/inline-cmds.exp: up to outer_inline2
++FAIL: gdb.opt/inline-cmds.exp: outer_inline2 inlined
++FAIL: gdb.opt/inline-cmds.exp: up from outer_inline2
++FAIL: gdb.opt/inline-cmds.exp: main not inlined
+64pie:
+-PASS: gdb.opt/inline-locals.exp: info args above bar (2)
++FAIL: gdb.opt/inline-locals.exp: info args above bar (2)
+-PASS: gdb.opt/inline-locals.exp: info args above bar (3)
++FAIL: gdb.opt/inline-locals.exp: info args above bar (3)
+-PASS: gdb.threads/threadcrash.exp: core file: gdb output contained 12 "threadcrash.c:", not 12 as expected
++FAIL: gdb.threads/threadcrash.exp: core file: gdb output contained 10 "threadcrash.c:", not 12 as expected
+-PASS: gdb.threads/tls-nodebug.exp: thread local storage
++FAIL: gdb.threads/tls-nodebug.exp: thread local storage
+32:
+gdb.cp/constructortest.exp
++FAIL: gdb.opt/inline-cmds.exp: enter noinline from outer_inline1
++FAIL: gdb.opt/inline-cmds.exp: backtrace at noinline from outer_inline1
++FAIL: gdb.opt/inline-cmds.exp: enter inlined_fn from noinline (the program is no longer running)
++FAIL: gdb.opt/inline-cmds.exp: backtrace at inlined_fn from noinline
++FAIL: gdb.opt/inline-cmds.exp: inlined_fn from noinline inlined
++FAIL: gdb.opt/inline-cmds.exp: up to noinline
++FAIL: gdb.opt/inline-cmds.exp: noinline from outer_inline1 not inlined
++FAIL: gdb.opt/inline-cmds.exp: up to outer_inline1
++FAIL: gdb.opt/inline-cmds.exp: outer_inline1 inlined
++FAIL: gdb.opt/inline-cmds.exp: up to outer_inline2
++FAIL: gdb.opt/inline-cmds.exp: outer_inline2 inlined
++FAIL: gdb.opt/inline-cmds.exp: up from outer_inline2
++FAIL: gdb.opt/inline-cmds.exp: main not inlined
+-PASS: gdb.opt/inline-locals.exp: info args above bar (2)
++FAIL: gdb.opt/inline-locals.exp: info args above bar (2)
+-PASS: gdb.opt/inline-locals.exp: info args above bar (3)
++FAIL: gdb.opt/inline-locals.exp: info args above bar (3)

REMOVED

@@ -0,0 +1,77 @@
+# Recognize i386 signal trampolines before CFI.  Ensures that signal
+# frames are identified as signal frames.
+Patch101: gdb-6.3-sigx86-20040621.patch
+= Maybe - no longer needed as glibc has CFI now.
+= http://sourceware.org/ml/gdb-patches/2008-11/threads.html#00554
+= TODO: Check non-x86 arches
+
+# Fix to ensure types are visible
+Patch120: gdb-6.3-type-fix-20041213.patch
+= not aware why it was there
+
+# Tolerate DW_AT_type referencing <0>.
+Patch139: gdb-6.3-dwattype0-20050201.patch
+= not aware why it was there
+
+# Do not let errors related with debug registers break thread debugging.
+Patch178: gdb-6.3-catch-debug-registers-error-20060527.patch
+= i386 debug registers are always accessible by ptrace,
+= the ia64 bug is both gone and also RHEL-6 ia64 no longer supports i386
+
+# Cope with waitpid modifying status even when returning zero, as on
+# ia32el.
+Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch
+= broken i386 emulation on ia64, no longer supported
+
+# Fixed the kernel i386-on-x86_64 VDSO loading (producing `Lowest section in').
+Patch277: gdb-6.6-vdso-i386-on-amd64-warning.patch
+= IMO no longer needed on 4KB VDSO again
+
+
+upstreams:
+# Fix rereading of the main executable on its change.
+Patch283: gdb-6.7-reread-exec_bfd.patch
+= upstream
+
+# Backport fix of a segfault + PIE regression since 6.7.1 on PIE executables.
+Patch306: gdb-6.8-watchpoint-inaccessible-memory.patch
+= upstream
+
+# Enable program counter for processing PTID to PC (sparc/sparc64)
+Patch316: gdb-6.8-sparc-fix.patch
+= upstream
+
+# Protect development in the build tree by automatic Makefile dependencies.
+Patch321: gdb-6.8-auto-dependencies.patch
+= upstream
+
+# Disable randomization (such as by setarch -R), suggested by Jakub Jelinek.
+Patch323: gdb-6.8-disable-randomization.patch
+= upstream
+
+# Force build failure for missing libraries for --enable-tui.
+Patch325: gdb-6.8-forced-enable-tui.patch
+= upstream
+
+# Fix crash on DW_TAG_module for Fortran in recent Fedora/RH GCCs.
+Patch333: gdb-6.8-fortran-module-ignore.patch
+= upstream
+
+# Fix attaching to stopped processes and/or pending signals.
+Patch336: gdb-6.8-attach-signalled-upstream.patch
+= upstream
+
+# Fix occasional stepping lockup on many threads, seen on ia64.
+Patch342: gdb-6.8-ia64-breakpoint-restoration.patch
+= upstream
+
+# Fix occasional crash on a removed watchpoint.
+Patch338: gdb-6.8-breakpoint-gone.patch
+= upstream
+
+# Fix/implement the Fortran dynamic arrays support (BZ 377541).
+# Fix the variable-length-arrays support (BZ 468266, feature BZ 377541).
+Patch345: gdb-6.8-bz377541-vla-bound-undefined.patch
+= upstream
+Patch346: gdb-6.8-bz377541-vla-loc-kind.patch
+= upstream

_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,11 +26,9 @@ 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
-@@ -0,0 +1,72 @@
+--- /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,79 @@
 +# Copyright 2007
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -59,6 +47,13 @@ new file mode 100644
 +
 +# This file was created by Jan Kratochvil <jan.kratochvil@redhat.com>.
 +
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
 +# This test only works on Linux
 +if { ![istarget "*-*-linux-gnu*"] } {
 +    return 0
@@ -66,8 +61,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-bt-past-zero-20051201.patch

@@ -0,0 +1,88 @@
+2005-12-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* frame.c (backtrace_past_zero_pc): New static variable.
+	(get_prev_frame): Don't return NULL for zero pc value if
+	backtrace past-zero-frame option is turned on.
+	(_initialize_frame): Initialize new command to allow backtracing
+	past a zero pc value (set backtrace past-zero-pc).
+
+testsuite/gdb.base:
+2005-12-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* setshow.exp: Add testing of "set backtrace past-zero-pc" option.
+
+2007-10-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7.
+
+Index: gdb-6.7/gdb/testsuite/gdb.base/setshow.exp
+===================================================================
+--- gdb-6.7.orig/gdb/testsuite/gdb.base/setshow.exp	2007-08-23 20:14:17.000000000 +0200
++++ gdb-6.7/gdb/testsuite/gdb.base/setshow.exp	2007-10-15 21:34:52.000000000 +0200
+@@ -106,6 +106,16 @@ if { ![target_info exists use_gdb_stub] 
+     delete_breakpoints
+     gdb_test "run" "Starting program:.*foo bar blup baz bubble.*" "passing args"
+ }
++#test show backtrace past-zero-pc
++gdb_test "show backtrace past-zero-pc" "Whether backtraces should continue past a zero pc value is off." "default show backtrace past-zero-pc (off)"
++#test set backtrace past-zero-pc on
++gdb_test "set backtrace past-zero-pc on" "" "set backtrace past-zero-pc on"
++#test show backtrace past-zero-pc
++gdb_test "show backtrace past-zero-pc" "Whether backtraces should continue past a zero pc value is on." "show backtrace past-zero-pc (on)"
++#test set backtrace past-zero-pc off
++gdb_test "set backtrace past-zero-pc off" "" "set backtrace past-zero-pc off"
++#test show backtrace past-zero-pc
++gdb_test "show backtrace past-zero-pc" "Whether backtraces should continue past a zero pc value is off." "show backtrace past-zero-pc (off)"
+ #test set check range on
+ gdb_test "set check range on" "" "set check range on" 
+ #test show check range on
+Index: gdb-6.7/gdb/frame.c
+===================================================================
+--- gdb-6.7.orig/gdb/frame.c	2007-10-12 22:35:58.000000000 +0200
++++ gdb-6.7/gdb/frame.c	2007-10-15 21:34:52.000000000 +0200
+@@ -133,6 +133,16 @@ Whether backtraces should continue past 
+ 		    value);
+ }
+ 
++static int backtrace_past_zero_pc;
++static void
++show_backtrace_past_zero_pc (struct ui_file *file, int from_tty,
++			     struct cmd_list_element *c, const char *value)
++{
++  fprintf_filtered (file, _("\
++Whether backtraces should continue past a zero pc value is %s.\n"),
++		    value);
++}
++
+ static int backtrace_past_entry;
+ static void
+ show_backtrace_past_entry (struct ui_file *file, int from_tty,
+@@ -1483,9 +1493,7 @@ get_prev_frame (struct frame_info *this_
+     }
+ 
+   if (this_frame->level > 0
+-#if 0
+-      && backtrace_past_zero_pc
+-#endif
++      && !backtrace_past_zero_pc
+       && get_frame_type (this_frame) == NORMAL_FRAME
+       && get_frame_type (get_next_frame (this_frame)) == NORMAL_FRAME
+       && get_frame_pc (this_frame) == 0)
+@@ -1850,6 +1858,17 @@ the rest of the stack trace."),
+ 			   &set_backtrace_cmdlist,
+ 			   &show_backtrace_cmdlist);
+ 
++  add_setshow_boolean_cmd ("past-zero-pc", class_obscure,
++ 			   &backtrace_past_zero_pc, _("\
++Set whether backtraces should continue past a zero pc value."), _("\
++Show whether backtraces should continue past a zero pc value."), _("\
++Normally GDB stops backtracing when it finds a zero pc.\n\
++Set this variable if you need to see the rest of the stack trace."), 
++ 			   NULL,
++			   show_backtrace_past_zero_pc,
++			   &set_backtrace_cmdlist,
++ 			   &show_backtrace_cmdlist);
++
+   add_setshow_integer_cmd ("limit", class_obscure,
+ 			   &backtrace_limit, _("\
+ Set an upper bound on the number of backtrace levels."), _("\

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,11 +215,10 @@ 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
-@@ -0,0 +1,72 @@
+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,79 @@
 +#   Copyright 2006, 2007 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -250,6 +238,13 @@ new file mode 100644
 +# Test unwinding fixes of the PPC platform, specifically on the coping with BCL
 +# jump of the PIE code.
 +
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
 +if ![istarget "powerpc*-*-linux*"] then {
 +    verbose "Skipping powerpc-linux prologue tests."
 +    return
@@ -268,8 +263,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 +298,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-bz182116-exec-from-pthread.patch

@@ -0,0 +1,23 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182116
+
+
+Index: gdb-6.5/gdb/linux-thread-db.c
+===================================================================
+--- gdb-6.5.orig/gdb/linux-thread-db.c	2006-08-24 02:55:24.000000000 -0300
++++ gdb-6.5/gdb/linux-thread-db.c	2006-08-24 02:56:16.000000000 -0300
+@@ -939,6 +939,15 @@ thread_db_wait (ptid_t ptid, struct targ
+       || ourstatus->kind == TARGET_WAITKIND_SIGNALLED)
+     return pid_to_ptid (-1);
+ 
++  if (ourstatus->kind == TARGET_WAITKIND_EXECD)
++    {
++      remove_thread_event_breakpoints ();
++      unpush_target (&thread_db_ops);
++      using_thread_db = 0;
++
++      return pid_to_ptid (GET_PID (ptid));
++    }
++
+   if (ourstatus->kind == TARGET_WAITKIND_STOPPED
+       && (ourstatus->value.sig == TARGET_SIGNAL_TRAP
+           || ourstatus->value.sig == TARGET_SIGNAL_ILL))

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
@@ -103,7 +92,7 @@ new file mode 100644
 +gdb_run_cmd
 +
 +gdb_test_multiple {} "Program exited" {
-+   -re "\r\n\\\[Inferior .* exited normally\\\]\r\n$gdb_prompt $" {
++   -re "\r\nProgram exited normally.\r\n$gdb_prompt $" {
 +       pass "Program exited"
 +   }
 +}

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

@@ -0,0 +1,201 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=231832
+
+
+Index: gdb-6.8/gdb/symmisc.c
+===================================================================
+--- gdb-6.8.orig/gdb/symmisc.c	2008-03-17 16:06:24.000000000 +0100
++++ gdb-6.8/gdb/symmisc.c	2008-07-14 10:27:50.000000000 +0200
+@@ -230,8 +230,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 (objfile->psymbol_cache));
+     printf_filtered (_("  Total memory used for macro cache: %d\n"),
+Index: gdb-6.8/include/obstack.h
+===================================================================
+--- gdb-6.8.orig/include/obstack.h	2005-05-10 12:21:08.000000000 +0200
++++ gdb-6.8/include/obstack.h	2008-07-14 10:27:50.000000000 +0200
+@@ -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);					\
+@@ -532,7 +532,7 @@ __extension__								\
+ # define obstack_free(h,obj)						\
+ ( (h)->temp = (char *) (obj) - (char *) (h)->chunk,			\
+   (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\
+-   ? (int) ((h)->next_free = (h)->object_base				\
++   ? (PTR_INT_TYPE) ((h)->next_free = (h)->object_base			\
+ 	    = (h)->temp + (char *) (h)->chunk)				\
+    : (((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0), 0)))
+ 
+Index: gdb-6.8/libiberty/obstack.c
+===================================================================
+--- gdb-6.8.orig/libiberty/obstack.c	2005-05-10 17:33:33.000000000 +0200
++++ gdb-6.8/libiberty/obstack.c	2008-07-14 10:27:50.000000000 +0200
+@@ -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-dtorfix-20050121.patch

@@ -0,0 +1,52 @@
+2005-01-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* linespec.c (collect_methods): Don't do special processing for
+	destructors as this will be handled in find_methods.
+	(find_methods): Fix ctor check to also check for dtor.
+
+2007-10-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7.
+
+Index: gdb-6.7/gdb/linespec.c
+===================================================================
+--- gdb-6.7.orig/gdb/linespec.c	2007-10-13 05:26:33.000000000 +0200
++++ gdb-6.7/gdb/linespec.c	2007-10-14 23:31:03.000000000 +0200
+@@ -398,12 +398,14 @@ add_matching_methods (int method_counter
+ 
+       /* Check for special case of looking for member that
+ 	 doesn't have a mangled name provided.  This will happen
+-	 when we have in-charge and not-in-charge constructors.
++	 when we have in-charge and not-in-charge ctors/dtors.
+ 	 Since we don't have a mangled name to work with, if we
+-	 look for the symbol, we can only find the class itself.
++	 look for the symbol, we can at best find the class itself.
+ 	 We can find the information we need in the minimal symbol
+ 	 table which has the full member name information we need.  */
+-      if (strlen (phys_name) <= strlen (class_name))
++     if (strlen (phys_name) <= strlen (class_name)
++         || (strlen (phys_name) == strlen (class_name) + 1
++             && phys_name[0] == '~'))
+ 	return add_minsym_members (class_name, phys_name, msym_arr);
+ 
+       /* Destructor is handled by caller, don't add it to
+@@ -1731,6 +1733,11 @@ collect_methods (char *copy, struct type
+ {
+   int i1 = 0;	/*  Counter for the symbol array.  */
+ 
++#if 0
++  /* Ignore this special method for getting destructors because
++     find_methods is more robust and can handle multiple
++     destructors which is the case when gcc generates a not-in-charge
++     vs an in-charge destructor.  */
+   if (destructor_name_p (copy, t))
+     {
+       /* Destructors are a special case.  */
+@@ -1749,6 +1756,7 @@ collect_methods (char *copy, struct type
+ 	}
+     }
+   else
++#endif
+     i1 = find_methods (t, copy, SYMBOL_LANGUAGE (sym_class), sym_arr, msym_arr);
+ 
+   return i1;

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-framepczero-20040927.patch

@@ -0,0 +1,28 @@
+2004-09-27  Andrew Cagney  <cagney@gnu.org>
+
+	* frame.c (get_prev_frame): Stop backtrace when a zero PC and
+	successive normal frames.
+
+Index: gdb-6.8.50.20081128/gdb/frame.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/frame.c	2008-12-04 01:34:37.000000000 +0100
++++ gdb-6.8.50.20081128/gdb/frame.c	2008-12-04 01:35:47.000000000 +0100
+@@ -1566,6 +1566,18 @@ get_prev_frame (struct frame_info *this_
+       return NULL;
+     }
+ 
++  if (this_frame->level > 0
++#if 0
++      && backtrace_past_zero_pc
++#endif
++      && get_frame_type (this_frame) == NORMAL_FRAME
++      && get_frame_type (get_next_frame (this_frame)) == NORMAL_FRAME
++      && get_frame_pc (this_frame) == 0)
++    {
++      frame_debug_got_null_frame (this_frame, "zero PC");
++      return NULL;
++    }
++
+   return get_prev_frame_1 (this_frame);
+ }
+ 

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.20081209/gdb/linux-nat.c
+===================================================================
+--- gdb-6.8.50.20081209.orig/gdb/linux-nat.c	2008-12-10 01:22:23.000000000 +0100
++++ gdb-6.8.50.20081209/gdb/linux-nat.c	2008-12-10 01:25:26.000000000 +0100
+@@ -4123,10 +4123,15 @@ linux_xfer_partial (struct target_ops *o
+     return linux_nat_xfer_osdata (ops, object, annex, readbuf, writebuf,
+                                offset, len);
+ 
++#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,35 +1,26 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Andrew Cagney <cagney@gnu.org>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.3-gstack-20050411.patch
-
-;; Add a wrapper script to GDB that implements pstack using the
-;; --readnever option.
-;;=push
-
 2004-11-23  Andrew Cagney  <cagney@redhat.com>
 
 	* Makefile.in (uninstall-gstack, install-gstack): New rules, add
 	to install and uninstall.
 	* gstack.sh, gstack.1: New files.
 
-diff --git a/gdb/Makefile.in b/gdb/Makefile.in
---- a/gdb/Makefile.in
-+++ b/gdb/Makefile.in
-@@ -1726,7 +1726,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
- install: all
- 	@$(MAKE) $(FLAGS_TO_PASS) install-only
+Index: gdb-6.8.50.20090226/gdb/Makefile.in
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/Makefile.in	2009-02-26 22:09:59.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/Makefile.in	2009-02-26 22:10:22.000000000 +0100
+@@ -973,7 +973,7 @@ install: all install-only 
  
--install-only: $(CONFIG_INSTALL)
-+install-only: install-gstack $(CONFIG_INSTALL)
+ # The "install-only" target also installs the syscalls' XML files in
+ # the system.
+-install-only: $(CONFIG_INSTALL) xml-syscall-install
++install-only: install-gstack $(CONFIG_INSTALL) xml-syscall-install
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e "$$t"` ; \
  		if test "x$$transformed_name" = x; then \
-@@ -1775,7 +1775,25 @@ install-guile:
- install-python:
- 	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_DATADIR)/python/gdb
- 
--uninstall: force $(CONFIG_UNINSTALL)
+@@ -1005,9 +1005,26 @@ install-tui:
+ 			$(DESTDIR)$(man1dir) ; \
+ 		$(INSTALL_DATA) $(srcdir)/gdb.1 \
+ 			$(DESTDIR)$(man1dir)/$$transformed_name.1
 +GSTACK=gstack
 +.PHONY: install-gstack
 +install-gstack:
@@ -47,15 +38,17 @@ diff --git a/gdb/Makefile.in b/gdb/Makefile.in
 +			$(DESTDIR)$(man1dir) ; \
 +		: $(INSTALL_DATA) $(srcdir)/gstack.1 \
 +			$(DESTDIR)$(man1dir)/$$transformed_name.1
-+
+ 
+ 
+-uninstall: force $(CONFIG_UNINSTALL)
 +uninstall: force uninstall-gstack $(CONFIG_UNINSTALL)
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e $$t` ; \
  		if test "x$$transformed_name" = x; then \
-@@ -1798,6 +1816,18 @@ uninstall: force $(CONFIG_UNINSTALL)
- 	fi
- 	@$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
- 
+@@ -1029,6 +1046,17 @@ uninstall-tui:
+ 		fi ; \
+ 		rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \
+ 		      $(DESTDIR)$(man1dir)/$$transformed_name.1
 +.PHONY: uninstall-gstack
 +uninstall-gstack:
 +	transformed_name=`t='$(program_transform_name)'; \
@@ -67,15 +60,14 @@ diff --git a/gdb/Makefile.in b/gdb/Makefile.in
 +		fi ; \
 +		rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \
 +		      $(DESTDIR)$(man1dir)/$$transformed_name.1
-+ 
+ 
  # The C++ name parser can be built standalone for testing.
  test-cp-name-parser.o: cp-name-parser.c
- 	$(COMPILE) -DTEST_CPNAMES cp-name-parser.c
-diff --git a/gdb/gstack.sh b/gdb/gstack.sh
-new file mode 100644
---- /dev/null
-+++ b/gdb/gstack.sh
-@@ -0,0 +1,43 @@
+Index: gdb-6.8.50.20090226/gdb/gstack.sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090226/gdb/gstack.sh	2009-02-26 22:10:05.000000000 +0100
+@@ -0,0 +1,45 @@
 +#!/bin/sh
 +
 +if test $# -ne 1; then
@@ -95,164 +87,29 @@ new file mode 100644
 +backtrace="bt"
 +if test -d /proc/$1/task ; then
 +    # Newer kernel; has a task/ directory.
-+    if test `/bin/ls /proc/$1/task | /usr/bin/wc -l` -gt 1 2>/dev/null ; then
++    if test `ls /proc/$1/task | wc -l` -gt 1 2>/dev/null ; then
 +	backtrace="thread apply all bt"
 +    fi
 +elif test -f /proc/$1/maps ; then
 +    # Older kernel; go by it loading libpthread.
-+    if /bin/grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
++    if grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
 +	backtrace="thread apply all bt"
 +    fi
 +fi
 +
 +GDB=${GDB:-gdb}
 +
++if $GDB -nx --quiet --batch --readnever > /dev/null 2>&1; then
++    readnever=--readnever
++else
++    readnever=
++fi
++
 +# Run GDB, strip out unwanted noise.
-+# --readnever is no longer used since .gdb_index is now in use.
-+$GDB --quiet -nx $GDBARGS /proc/$1/exe $1 <<EOF 2>&1 | 
-+set width 0
-+set height 0
-+set pagination no
++$GDB --quiet $readnever -nx /proc/$1/exe $1 <<EOF 2>&1 | 
 +$backtrace
 +EOF
-+/bin/sed -n \
-+    -e 's/^\((gdb) \)*//' \
++sed -n \
++    -e 's/^(gdb) //' \
 +    -e '/^#/p' \
 +    -e '/^Thread/p'
-diff --git a/gdb/testsuite/gdb.base/gstack.c b/gdb/testsuite/gdb.base/gstack.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gstack.c
-@@ -0,0 +1,43 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <string.h>
-+
-+void
-+func (void)
-+{
-+  const char msg[] = "looping\n";
-+
-+  /* Use the most simple notification not to get caught by attach on exiting
-+     the function.  */
-+  write (1, msg, strlen (msg));
-+  
-+  for (;;);
-+}
-+
-+int
-+main (void)
-+{
-+  alarm (60);
-+  nice (100);
-+
-+  func ();
-+
-+  return 0;
-+}
-diff --git a/gdb/testsuite/gdb.base/gstack.exp b/gdb/testsuite/gdb.base/gstack.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gstack.exp
-@@ -0,0 +1,84 @@
-+# Copyright (C) 2012 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+set testfile gstack
-+set executable ${testfile}
-+set binfile [standard_output_file $executable]
-+if {[build_executable ${testfile} ${executable} "" {debug}] == -1} {
-+    return -1
-+}
-+
-+set test "spawn inferior"
-+set command "${binfile}"
-+set res [remote_spawn host $command];
-+if { $res < 0 || $res == "" } {
-+    perror "Spawning $command failed."
-+    fail $test
-+    return
-+}
-+
-+# The spawn id of the test inferior.
-+set test_spawn_id $res
-+
-+set use_gdb_stub 1
-+set pid [exp_pid -i $res]
-+gdb_expect {
-+    -re "looping\r\n" {
-+	pass $test
-+    }
-+    eof {
-+	fail "$test (eof)"
-+	return
-+    }
-+    timeout {
-+	fail "$test (timeout)"
-+	return
-+    }
-+}
-+
-+# Testcase uses the most simple notification not to get caught by attach on
-+# exiting the function.  Still we could retry the gstack command if we fail.
-+
-+set test "spawn gstack"
-+set command "sh -c GDB=$GDB\\ GDBARGS=-data-directory\\\\\\ $BUILD_DATA_DIRECTORY\\ sh\\ ${srcdir}/../gstack.sh\\ $pid\\;echo\\ GSTACK-END"
-+set res [remote_spawn host $command];
-+if { $res < 0 || $res == "" } {
-+    perror "Spawning $command failed."
-+    fail $test
-+}
-+
-+set gdb_spawn_id $res
-+
-+gdb_test_multiple "" $test {
-+    -re "^#0 +(0x\[0-9a-f\]+ in )?\\.?func \\(\\) at \[^\r\n\]*\r\n#1 +0x\[0-9a-f\]+ in \\.?main \\(\\) at \[^\r\n\]*\r\nGSTACK-END\r\n\$" {
-+	pass $test
-+    }
-+}
-+
-+gdb_test_multiple "" "gstack exits" {
-+    eof {
-+	set result [wait -i $gdb_spawn_id]
-+	verbose $result
-+
-+	gdb_assert { [lindex $result 2] == 0 } "gstack exits with no error"
-+	gdb_assert { [lindex $result 3] == 0 } "gstack's exit status is 0"
-+
-+	remote_close host
-+	clear_gdb_spawn_id
-+    }
-+}
-+
-+# Kill the test inferior.
-+kill_wait_spawned_process $test_spawn_id

gdb-6.3-gstack-without-path-20060414.patch

@@ -0,0 +1,34 @@
+Index: gdb-6.3/gdb/gstack.sh
+===================================================================
+--- gdb-6.3.orig/gdb/gstack.sh	2006-02-14 17:21:05.000000000 -0200
++++ gdb-6.3/gdb/gstack.sh	2006-04-14 03:17:12.000000000 -0300
+@@ -17,17 +17,17 @@ fi
+ backtrace="bt"
+ if test -d /proc/$1/task ; then
+     # Newer kernel; has a task/ directory.
+-    if test `ls /proc/$1/task | wc -l` -gt 1 2>/dev/null ; then
++    if test `/bin/ls /proc/$1/task | /usr/bin/wc -l` -gt 1 2>/dev/null ; then
+ 	backtrace="thread apply all bt"
+     fi
+ elif test -f /proc/$1/maps ; then
+     # Older kernel; go by it loading libpthread.
+-    if grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
++    if /bin/grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
+ 	backtrace="thread apply all bt"
+     fi
+ fi
+ 
+-GDB=${GDB:-gdb}
++GDB=${GDB:-/usr/bin/gdb}
+ 
+ if $GDB -nx --quiet --batch --readnever > /dev/null 2>&1; then
+     readnever=--readnever
+@@ -39,7 +39,7 @@ fi
+ $GDB --quiet $readnever -nx /proc/$1/exe $1 <<EOF 2>&1 | 
+ $backtrace
+ EOF
+-sed -n \
++/bin/sed -n \
+     -e 's/^(gdb) //' \
+     -e '/^#/p' \
+     -e '/^Thread/p'

gdb-6.3-ia64-corefile-fix-20050127.patch

@@ -0,0 +1,28 @@
+2005-01-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* ia64-tdep.c (getunwind_table): Call the low-level xfer
+	unwind table syscall to support backtracing from syscalls in
+	a corefile.
+
+Index: gdb-6.5/gdb/ia64-tdep.c
+===================================================================
+--- gdb-6.5.orig/gdb/ia64-tdep.c	2006-04-18 16:20:06.000000000 -0300
++++ gdb-6.5/gdb/ia64-tdep.c	2006-07-07 02:18:40.000000000 -0300
+@@ -2470,8 +2470,17 @@ getunwind_table (void *buf, size_t len)
+      we want to preserve fall back to the running kernel's table, then
+      we should find a way to override the corefile layer's
+      xfer_partial method.  */
++#if 0
+   x = target_read_partial (&current_target, TARGET_OBJECT_UNWIND_TABLE, NULL,
+ 			   buf, 0, len);
++#endif
++  /* FIXME: This is a temporary solution to backtracing syscalls in corefiles.
++            To do this properly, the AUXV section should be used.  This
++	    fix will work as long as the kernel used to generate the corefile
++	    is equivalent to the kernel used to debug the corefile.  */
++  x = ia64_linux_xfer_unwind_table (&current_target,
++		  		    TARGET_OBJECT_UNWIND_TABLE, NULL,
++			   	    buf, NULL, 0, len);
+ 
+   return (int)x;
+ }

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

@@ -0,0 +1,20 @@
+Index: gdb-6.8.50.20081128/gdb/gcore.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/gcore.c	2008-09-11 16:27:34.000000000 +0200
++++ gdb-6.8.50.20081128/gdb/gcore.c	2008-12-01 16:39:04.000000000 +0100
+@@ -475,8 +475,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 (current_gdbarch)->arch_name,
++		      "ia64")
++	      || bfd_section_vma (obfd, osec) != 0))
+ 	{
+ 	  warning (_("Memory read failed for corefile section, %s bytes at 0x%s."),
+ 		   plongest (size), paddr (bfd_section_vma (obfd, osec)));

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.20090226/gdb/linux-nat.c
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/linux-nat.c	2009-02-27 07:51:44.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/linux-nat.c	2009-02-28 07:19:05.000000000 +0100
+@@ -4386,15 +4386,38 @@ linux_xfer_partial (struct target_ops *o
+     return linux_nat_xfer_osdata (ops, object, annex, readbuf, writebuf,
+                                offset, len);
+ 
+-#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.20090226/gdb/ia64-linux-nat.c
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/ia64-linux-nat.c	2009-02-23 01:03:49.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/ia64-linux-nat.c	2009-02-28 07:18:10.000000000 +0100
+@@ -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,110 @@
+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,66 @@
++#   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 $tracelevel then {
++    strace $tracelevel
++}
++
++#
++# test running programs
++#
++set prms_id 0
++set bug_id 0
++
++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
++gdb_start
++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_test "info frame" "Stack level 1.*p63 at .*" "info sigtramp frame"
++ 

gdb-6.3-ia64-sigill-20051115.patch

@@ -0,0 +1,116 @@
+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-6.8.50.20081128/gdb/testsuite/gdb.arch/ia64-sigill.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.arch/ia64-sigill.exp	2008-12-02 21:10:57.000000000 +0100
+@@ -0,0 +1,59 @@
++#   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 $tracelevel then {
++    strace $tracelevel
++}
++
++#
++# test running programs
++#
++set prms_id 0
++set bug_id 0
++
++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-6.8.50.20081128/gdb/testsuite/gdb.arch/ia64-sigill.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.arch/ia64-sigill.c	2008-12-02 21:10:57.000000000 +0100
+@@ -0,0 +1,8 @@
++#include <stdio.h>
++
++int main()
++{
++  printf ("hello world\n");
++  return 0;
++}
++
+Index: gdb-6.8.50.20081128/gdb/linux-nat.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/linux-nat.c	2008-12-02 19:04:38.000000000 +0100
++++ gdb-6.8.50.20081128/gdb/linux-nat.c	2008-12-02 21:11:11.000000000 +0100
+@@ -2974,7 +2974,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))
+     {
+@@ -2992,7 +2993,9 @@ retry:
+ 	  && inf->stop_soon == NO_STOP_QUIETLY
+ 	  && signal_stop_state (signo) == 0
+ 	  && signal_print_state (signo) == 0
+-	  && signal_pass_state (signo) == 1)
++	  && signal_pass_state (signo) == 1
++	  && signo != TARGET_SIGNAL_ILL
++	  && signo != TARGET_SIGNAL_TRAP)
+ 	{
+ 	  /* FIMXE: kettenis/2001-06-06: Should we resume all threads
+ 	     here?  It is not clear we should.  GDB may not expect

gdb-6.3-ia64-sigtramp-fp-20050926.patch

@@ -0,0 +1,163 @@
+2005-09-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libunwind-frame.c (libunwind_frame_cache): Save the current
+	stack pointer in the cache.
+	(libunwind_sigtramp_frame_this_id): New function.
+	(libunwind_sigtramp_frame_unwind): New unwinder.
+	(libunwind_sigtramp_frame_sniffer): Return 
+	libunwind_sigtramp_frame_unwind address.
+	* libunwind-frame.h (libunwind_sigtramp_frame_this_id): New
+	prototype.
+	* ia64-tdep.c (ia64_libunwind_sigtramp_frame_this_id): Calculate
+	the base address using the current stack pointer plus a fixed
+	offset.
+
+2007-10-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7.
+
+2008-02-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.8pre.
+
+2008-04-16  Yi Zhan  <yi.zhan@intel.com>
+
+	Fix a compilation error on a typo.
+
+Index: gdb-6.8.50.20081128/gdb/libunwind-frame.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/libunwind-frame.c	2008-05-06 20:37:46.000000000 +0200
++++ gdb-6.8.50.20081128/gdb/libunwind-frame.c	2008-12-02 19:46:26.000000000 +0100
+@@ -61,6 +61,7 @@ static unw_word_t (*unw_find_dyn_list_p)
+ struct libunwind_frame_cache
+ {
+   CORE_ADDR base;
++  CORE_ADDR sp;
+   CORE_ADDR func_addr;
+   unw_cursor_t cursor;
+   unw_addr_space_t as;
+@@ -133,6 +134,7 @@ libunwind_frame_cache (struct frame_info
+   unw_accessors_t *acc;
+   unw_addr_space_t as;
+   unw_word_t fp;
++  unw_word_t sp;
+   unw_regnum_t uw_sp_regnum;
+   struct libunwind_frame_cache *cache;
+   struct libunwind_descr *descr;
+@@ -174,14 +176,30 @@ libunwind_frame_cache (struct frame_info
+ 				 : __LITTLE_ENDIAN);
+ 
+   unw_init_remote_p (&cache->cursor, as, this_frame);
++
++  /* For the base address, we have a small problem.  The majority
++     of the time, we can get the stack pointer of the previous
++     frame to use as a frame pointer.  In the case where we have
++     a signal trampoline, the stack may change due to a sigaltstack
++     being set up.  In that case, the normal mechanism will give us
++     an address in the regular stack which is not at the end of the
++     sigaltstack as we want.  To handle this, we record the stack
++     address so the caller may calculate a more correct base address
++     to use.  */
++  uw_sp_regnum = descr->gdb2uw (gdbarch_sp_regnum (gdbarch));
++  ret = unw_get_reg_p (&cache->cursor, uw_sp_regnum, &sp);
++  if (ret < 0)
++    {
++      unw_destroy_addr_space_p (as);
++      error (_("Can't get libunwind sp register."));
++    }
++
+   if (unw_step_p (&cache->cursor) < 0)
+     {
+       unw_destroy_addr_space_p (as);
+       return NULL;
+     }
+ 
+-  /* To get base address, get sp from previous frame.  */
+-  uw_sp_regnum = descr->gdb2uw (gdbarch_sp_regnum (gdbarch));
+   ret = unw_get_reg_p (&cache->cursor, uw_sp_regnum, &fp);
+   if (ret < 0)
+     {
+@@ -189,6 +207,7 @@ libunwind_frame_cache (struct frame_info
+       error (_("Can't get libunwind sp register."));
+     }
+ 
++  cache->sp = (CORE_ADDR)sp;
+   cache->base = (CORE_ADDR)fp;
+   cache->as = as;
+ 
+@@ -376,6 +395,31 @@ libunwind_search_unwind_table (void *as,
+ 				    di, pi, need_unwind_info, args);
+ }
+ 
++void
++libunwind_sigtramp_frame_this_id (struct frame_info *this_frame, 
++				  void **this_cache,
++		      		  struct frame_id *this_id)
++{
++  struct libunwind_frame_cache *cache =
++    libunwind_frame_cache (this_frame, this_cache);
++
++  /* Unlike a regular frame, we can't use the normal frame pointer
++     mechanism because a sigaltstack may have been used.  Instead,
++     we return the current stack pointer for the caller to use
++     to calculate the base address.  */
++  if (cache != NULL)
++    (*this_id) = frame_id_build (cache->sp, cache->func_addr);
++  else
++    (*this_id) = null_frame_id;
++}
++
++static const struct frame_unwind libunwind_sigtramp_frame_unwind =
++{
++  SIGTRAMP_FRAME,
++  libunwind_sigtramp_frame_this_id,
++  libunwind_frame_prev_register
++};
++
+ /* Verify if we are in a sigtramp frame and we can use libunwind to unwind.  */
+ int
+ libunwind_sigtramp_frame_sniffer (const struct frame_unwind *self,
+Index: gdb-6.8.50.20081128/gdb/libunwind-frame.h
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/libunwind-frame.h	2008-05-06 20:37:46.000000000 +0200
++++ gdb-6.8.50.20081128/gdb/libunwind-frame.h	2008-12-02 19:38:55.000000000 +0100
+@@ -52,6 +52,9 @@ void libunwind_frame_set_descr (struct g
+ 
+ void libunwind_frame_this_id (struct frame_info *this_frame, void **this_cache,
+ 			      struct frame_id *this_id);
++void libunwind_sigtramp_frame_this_id (struct frame_info *this_frame, 
++				       void **this_cache,
++			      	       struct frame_id *this_id);
+ struct value *libunwind_frame_prev_register (struct frame_info *this_frame,
+                                              void **this_cache, int regnum);
+ void libunwind_frame_dealloc_cache (struct frame_info *self, void *cache);
+Index: gdb-6.8.50.20081128/gdb/ia64-tdep.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/ia64-tdep.c	2008-12-02 19:04:32.000000000 +0100
++++ gdb-6.8.50.20081128/gdb/ia64-tdep.c	2008-12-02 21:09:46.000000000 +0100
+@@ -2964,7 +2964,7 @@ ia64_libunwind_sigtramp_frame_this_id (s
+   struct frame_id id;
+   CORE_ADDR prev_ip;
+ 
+-  libunwind_frame_this_id (this_frame, this_cache, &id);
++  libunwind_sigtramp_frame_this_id (this_frame, this_cache, &id);
+   if (frame_id_eq (id, null_frame_id))
+     {
+       (*this_id) = null_frame_id;
+@@ -2976,8 +2976,14 @@ ia64_libunwind_sigtramp_frame_this_id (s
+   get_frame_register (this_frame, IA64_BSP_REGNUM, buf);
+   bsp = extract_unsigned_integer (buf, 8);
+ 
+-  /* For a sigtramp frame, we don't make the check for previous ip being 0.  */
+-  (*this_id) = frame_id_build_special (id.stack_addr, id.code_addr, bsp);
++  /* For a sigtramp frame, we don't make the check for previous ip being 0.  
++     We also must calculate the frame pointer because libunwind will give
++     us back the current stack pointer instead of the frame pointer since
++     it cannot figure this out when in a sigaltstack.  We make a basic
++     assumption of 16 (default size) + 8 bytes for sigcontext address.
++     FIXME: if libunwind were to export the frame pointer address, we
++            could eliminate the assumption and get the actual value.  */
++  (*this_id) = frame_id_build_special (id.stack_addr + 24, id.code_addr, bsp);
+ 
+   if (gdbarch_debug >= 1)
+     fprintf_unfiltered (gdb_stdlog,

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 (current_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 (current_gdbarch, IA64_BSP_REGNUM));
++      read_memory (cache->saved_regs[IA64_CFM_REGNUM], (char *) &cfm,
++		   register_size (current_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 (current_gdbarch, IA64_RNAT_REGNUM));
++	    }
++	  else
++	    nat_collection = read_memory_integer (nat_addr, 8);
++	  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 (current_gdbarch, IA64_BSP_REGNUM));
++      read_memory (cache->saved_regs[IA64_CFM_REGNUM], (char *) &cfm,
++		   register_size (current_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 (current_gdbarch, IA64_PR_REGNUM));
++	  read_memory (cache->saved_regs[IA64_CFM_REGNUM], (char *) &cfm,
++		       register_size (current_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-6.8.50.20081128/gdb/testsuite/gdb.base/attach-32.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.base/attach-32.c	2008-12-07 10:06:03.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,11 +34,11 @@ 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
-@@ -0,0 +1,245 @@
+Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.base/attach-32.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.base/attach-32.exp	2008-12-07 10:08:52.000000000 +0100
+@@ -0,0 +1,252 @@
 +# Copyright 2005 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -65,6 +57,13 @@ new file mode 100644
 +#
 +# This test was based on attach.exp and modified for 32/64 bit Linux systems. */
 +
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
 +# On HP-UX 11.0, this test is causing a process running the program
 +# "attach" to be left around spinning.  Until we figure out why, I am
 +# commenting out the test to avoid polluting tiamat (our 11.0 nightly
@@ -85,9 +84,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}"
@@ -161,7 +160,7 @@ new file mode 100644
 +
 +    # Allow the test process to exit, to cleanup after ourselves.
 +
-+    gdb_test "continue" {\[Inferior .* exited normally\]} "after attach-32, exit"
++    gdb_test "continue" "Program exited normally." "after attach-32, exit"
 +
 +    # Make sure we don't leave a process around to confuse
 +    # the next test run (and prevent the compile by keeping
@@ -242,7 +241,7 @@ new file mode 100644
 +    # Get rid of the process
 +    
 +    gdb_test "p should_exit = 1"
-+    gdb_test "c" {\[Inferior .* exited normally\]}
++    gdb_test "c" "Program exited normally."
 +   
 +    # Be paranoid
 +   
@@ -262,7 +261,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 +283,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 +291,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-6.8.50.20081128/gdb/testsuite/gdb.base/attach-32b.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.base/attach-32b.c	2008-12-07 10:06:03.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-inheritance-20050324.patch

@@ -0,0 +1,26 @@
+2005-03-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* valops.c (check_field_in): Use check_typedef for base classes
+	to avoid problems with opaque type references.
+
+Index: gdb-6.8.50.20081128/gdb/valops.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/valops.c	2008-12-08 10:56:11.000000000 +0100
++++ gdb-6.8.50.20081128/gdb/valops.c	2008-12-08 10:59:14.000000000 +0100
+@@ -2484,8 +2484,14 @@ check_field (struct type *type, const ch
+     }
+ 
+   for (i = TYPE_N_BASECLASSES (type) - 1; i >= 0; i--)
+-    if (check_field (TYPE_BASECLASS (type, i), name))
+-      return 1;
++    {
++      /* Check the base classes.  Make sure we have the real type for
++         each base class as opposed to an opaque declaration.  */
++      struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
++
++      if (check_field (baseclass, name))
++	return 1;
++    }
+ 
+   return 0;
+ }

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,22 @@ 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
+--- gdb-6.3/gdb/testsuite/gdb.cp/b146835b.cc.fix3	2005-07-26 16:47:12.000000000 -0400
++++ gdb-6.3/gdb/testsuite/gdb.cp/b146835b.cc	2005-07-26 16:53:31.000000000 -0400
+@@ -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/gdb/testsuite/gdb.cp/b146835.cc.fix3	2005-07-26 16:47:20.000000000 -0400
++++ gdb-6.3/gdb/testsuite/gdb.cp/b146835.cc	2005-07-26 16:46:50.000000000 -0400
 @@ -0,0 +1,32 @@
 +#include "b146835.h"
 +#include <iostream>
@@ -50,11 +54,9 @@ 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
-@@ -0,0 +1,47 @@
+--- gdb-6.3/gdb/testsuite/gdb.cp/b146835.exp.fix3	2005-07-26 16:47:26.000000000 -0400
++++ gdb-6.3/gdb/testsuite/gdb.cp/b146835.exp	2005-07-26 16:46:50.000000000 -0400
+@@ -0,0 +1,55 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
 +# Copyright 2005 Free Software Foundation, Inc.
@@ -76,10 +78,17 @@ new file mode 100644
 +# Check that GDB can properly print an inherited member variable
 +# (Bugzilla 146835)
 +
++if $tracelevel {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
 +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
 +}
@@ -101,11 +110,10 @@ new file mode 100644
 +gdb_continue_to_breakpoint "First line foo"
 +
 +# Verify that we can access the inherited member d
-+gdb_test "p d" " = \\(D \\*\\) *0x0" "Verify inherited member d accessible"
-diff --git a/gdb/testsuite/gdb.cp/b146835.h b/gdb/testsuite/gdb.cp/b146835.h
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.cp/b146835.h
++gdb_test "p d" ".*(struct D \*.).*0x0" "Verify inherited member d accessible"
++
+--- gdb-6.3/gdb/testsuite/gdb.cp/b146835.h.fix3	2005-07-26 16:47:36.000000000 -0400
++++ gdb-6.3/gdb/testsuite/gdb.cp/b146835.h	2005-07-26 16:53:18.000000000 -0400
 @@ -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-large-core-20051206.patch

@@ -0,0 +1,316 @@
+2005-12-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* symfile-mem.c (read_memory): New static read callback function.
+	(symfile_add_from_memory): Pass read_memory to bfd instead of
+	target_read_memory.
+	* target.c (target_xfer_memory): Add support for LONGEST len and
+	change all callers.
+	(deprecated_debug_xfer_memory, target_read_memory): Ditto.
+	(target_write_memory, do_xfer_memory): Ditto.
+	(target_xfer_memory_partial, target_read_memory_partial): Ditto.
+	(target_write_memory_partial): Ditto.
+	* infptrace.c (child_xfer_memory): Ditto.
+	* linux-nat.c (linux_nat_xfer_memory): Ditto.
+	(linux_nat_proc_xfer_memory): Ditto.
+	* dcache.c (dcache_xfer_memory): Ditto.
+	* exec.c (xfer_memory): Ditto.
+	* remote.c (remote_xfer_memory): Ditto.
+	* remote-sim.c (gdbsim_xfer_interior_memory): Ditto.
+	* target.h: Change prototypes for functions changed above.
+	* linux-nat.h: Ditto.
+	* remote.h: Ditto.
+	* dcache.h: Ditto.
+
+2007-10-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7.
+
+Index: gdb-6.8.50.20090226/gdb/symfile-mem.c
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/symfile-mem.c	2009-02-21 17:14:49.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/symfile-mem.c	2009-02-28 07:22:09.000000000 +0100
+@@ -56,6 +56,14 @@
+ #include "elf/common.h"
+ 
+ 
++/* Local callback routine to pass to bfd to read from target memory,
++   using a len constrained to INT_MAX.  */
++static int
++read_target_memory (bfd_vma addr, bfd_byte *buf, int len)
++{
++  return target_read_memory (addr, buf, (LONGEST)len);
++}
++
+ /* Read inferior memory at ADDR to find the header of a loaded object file
+    and read its in-core symbols out of inferior memory.  TEMPL is a bfd
+    representing the target's format.  NAME is the name to use for this
+@@ -76,7 +84,7 @@ symbol_file_add_from_memory (struct bfd 
+     error (_("add-symbol-file-from-memory not supported for this target"));
+ 
+   nbfd = bfd_elf_bfd_from_remote_memory (templ, addr, &loadbase,
+-					 target_read_memory);
++					 read_target_memory);
+   if (nbfd == NULL)
+     error (_("Failed to read a valid object file image from memory."));
+ 
+Index: gdb-6.8.50.20090226/gdb/target.c
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/target.c	2009-02-27 00:04:32.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/target.c	2009-02-28 07:22:09.000000000 +0100
+@@ -57,7 +57,7 @@ static int nosymbol (char *, CORE_ADDR *
+ 
+ static void tcomplain (void) ATTR_NORETURN;
+ 
+-static int nomemory (CORE_ADDR, char *, int, int, struct target_ops *);
++static LONGEST nomemory (CORE_ADDR, char *, int, int, struct target_ops *);
+ 
+ static int return_zero (void);
+ 
+@@ -286,7 +286,7 @@ target_create_inferior (char *exec_file,
+ }
+ 
+ 
+-static int
++static LONGEST
+ nomemory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+ 	  struct target_ops *t)
+ {
+@@ -507,7 +507,7 @@ update_current_target (void)
+ 	    (void (*) (struct regcache *))
+ 	    noprocess);
+   de_fault (deprecated_xfer_memory,
+-	    (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *))
++	    (LONGEST (*) (CORE_ADDR, gdb_byte *, LONGEST, int, struct mem_attrib *, struct target_ops *))
+ 	    nomemory);
+   de_fault (to_files_info,
+ 	    (void (*) (struct target_ops *))
+@@ -1237,7 +1237,7 @@ target_xfer_partial (struct target_ops *
+    it makes no progress, and then return how much was transferred). */
+ 
+ int
+-target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len)
++target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len)
+ {
+   if (target_read (&current_target, TARGET_OBJECT_MEMORY, NULL,
+ 		   myaddr, memaddr, len) == len)
+@@ -1247,7 +1247,7 @@ target_read_memory (CORE_ADDR memaddr, g
+ }
+ 
+ int
+-target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, int len)
++target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, LONGEST len)
+ {
+   if (target_write (&current_target, TARGET_OBJECT_MEMORY, NULL,
+ 		    myaddr, memaddr, len) == len)
+@@ -2777,8 +2777,8 @@ debug_to_prepare_to_store (struct regcac
+   fprintf_unfiltered (gdb_stdlog, "target_prepare_to_store ()\n");
+ }
+ 
+-static int
+-deprecated_debug_xfer_memory (CORE_ADDR memaddr, bfd_byte *myaddr, int len,
++static LONGEST
++deprecated_debug_xfer_memory (CORE_ADDR memaddr, bfd_byte *myaddr, LONGEST len,
+ 			      int write, struct mem_attrib *attrib,
+ 			      struct target_ops *target)
+ {
+@@ -2788,8 +2788,8 @@ deprecated_debug_xfer_memory (CORE_ADDR 
+ 						attrib, target);
+ 
+   fprintf_unfiltered (gdb_stdlog,
+-		      "target_xfer_memory (%s, xxx, %d, %s, xxx) = %d",
+-		      paddress (memaddr), len, write ? "write" : "read",
++		      "target_xfer_memory (%s, xxx, %ld, %s, xxx) = %d",
++		      paddress (memaddr), (long) len, write ? "write" : "read",
+                       retval);
+ 
+   if (retval > 0)
+Index: gdb-6.8.50.20090226/gdb/target.h
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/target.h	2009-02-27 00:04:32.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/target.h	2009-02-28 07:22:09.000000000 +0100
+@@ -376,10 +376,10 @@ struct target_ops
+        NOTE: cagney/2004-10-01: This has been entirely superseeded by
+        to_xfer_partial and inferior inheritance.  */
+ 
+-    int (*deprecated_xfer_memory) (CORE_ADDR memaddr, gdb_byte *myaddr,
+-				   int len, int write,
+-				   struct mem_attrib *attrib,
+-				   struct target_ops *target);
++    LONGEST (*deprecated_xfer_memory) (CORE_ADDR memaddr, gdb_byte *myaddr,
++				       LONGEST len, int write,
++				       struct mem_attrib *attrib,
++				       struct target_ops *target);
+ 
+     void (*to_files_info) (struct target_ops *);
+     int (*to_insert_breakpoint) (struct bp_target_info *);
+@@ -679,13 +679,14 @@ extern DCACHE *target_dcache;
+ 
+ extern int target_read_string (CORE_ADDR, char **, int, int *);
+ 
+-extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len);
++extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr,
++			       LONGEST len);
+ 
+ extern int target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr,
+-				int len);
++				LONGEST len);
+ 
+-extern int xfer_memory (CORE_ADDR, gdb_byte *, int, int,
+-			struct mem_attrib *, struct target_ops *);
++extern LONGEST xfer_memory (CORE_ADDR, gdb_byte *, LONGEST, int,
++			    struct mem_attrib *, struct target_ops *);
+ 
+ /* Fetches the target's memory map.  If one is found it is sorted
+    and returned, after some consistency checking.  Otherwise, NULL
+Index: gdb-6.8.50.20090226/gdb/dcache.c
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/dcache.c	2009-01-03 06:57:51.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/dcache.c	2009-02-28 07:22:09.000000000 +0100
+@@ -524,9 +524,9 @@ dcache_free (DCACHE *dcache)
+ 
+    This routine is indended to be called by remote_xfer_ functions. */
+ 
+-int
++LONGEST
+ dcache_xfer_memory (DCACHE *dcache, CORE_ADDR memaddr, gdb_byte *myaddr,
+-		    int len, int should_write)
++		    LONGEST len, int should_write)
+ {
+   int i;
+   int (*xfunc) (DCACHE *dcache, CORE_ADDR addr, gdb_byte *ptr);
+Index: gdb-6.8.50.20090226/gdb/dcache.h
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/dcache.h	2009-01-03 06:57:51.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/dcache.h	2009-02-28 07:22:09.000000000 +0100
+@@ -35,7 +35,7 @@ void dcache_free (DCACHE *);
+ 
+ /* Simple to call from <remote>_xfer_memory */
+ 
+-int dcache_xfer_memory (DCACHE *cache, CORE_ADDR mem, gdb_byte *my,
+-			int len, int should_write);
++LONGEST dcache_xfer_memory (DCACHE *cache, CORE_ADDR mem, gdb_byte *my,
++			    LONGEST len, int should_write);
+ 
+ #endif /* DCACHE_H */
+Index: gdb-6.8.50.20090226/gdb/exec.c
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/exec.c	2009-02-22 20:35:47.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/exec.c	2009-02-28 07:22:09.000000000 +0100
+@@ -464,8 +464,8 @@ map_vmap (bfd *abfd, bfd *arch)
+    The same routine is used to handle both core and exec files;
+    we just tail-call it with more arguments to select between them.  */
+ 
+-int
+-xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write,
++LONGEST
++xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len, int write,
+ 	     struct mem_attrib *attrib, struct target_ops *target)
+ {
+   int res;
+Index: gdb-6.8.50.20090226/gdb/linux-nat.c
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/linux-nat.c	2009-02-28 07:22:02.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/linux-nat.c	2009-02-28 07:22:32.000000000 +0100
+@@ -4407,7 +4407,7 @@ linux_xfer_partial (struct target_ops *o
+ #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;
++	  LONGEST xxfer;
+ 
+ 	  /* Re-read register stack area.  */
+ 	  xxfer = super_xfer_partial (ops, object, annex,
+Index: gdb-6.8.50.20090226/gdb/remote.c
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/remote.c	2009-02-25 03:14:22.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/remote.c	2009-02-28 07:22:09.000000000 +0100
+@@ -25,6 +25,7 @@
+ #include "gdb_string.h"
+ #include <ctype.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include "inferior.h"
+ #include "bfd.h"
+ #include "symfile.h"
+@@ -5683,12 +5684,19 @@ handle_notification (char *buf, size_t l
+    if SHOULD_WRITE is nonzero.  Returns length of data written or
+    read; 0 for error.  TARGET is unused.  */
+ 
+-static int
+-remote_xfer_memory (CORE_ADDR mem_addr, gdb_byte *buffer, int mem_len,
++static LONGEST
++remote_xfer_memory (CORE_ADDR mem_addr, gdb_byte *buffer, LONGEST mem_len,
+ 		    int should_write, struct mem_attrib *attrib,
+ 		    struct target_ops *target)
+ {
+   int res;
++  int len;
++
++  /* This routine is not set up to handle > INT_MAX bytes.  */
++  if (mem_len >= (LONGEST)INT_MAX)
++    return 0;
++
++  len = (int)mem_len;
+ 
+   set_general_thread (inferior_ptid);
+ 
+@@ -5697,7 +5705,7 @@ remote_xfer_memory (CORE_ADDR mem_addr, 
+   else
+     res = remote_read_bytes (mem_addr, buffer, mem_len);
+ 
+-  return res;
++  return (LONGEST)res;
+ }
+ 
+ /* Sends a packet with content determined by the printf format string
+Index: gdb-6.8.50.20090226/gdb/remote-sim.c
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/remote-sim.c	2009-02-23 19:31:23.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/remote-sim.c	2009-02-28 07:22:09.000000000 +0100
+@@ -754,11 +754,14 @@ gdbsim_prepare_to_store (struct regcache
+ 
+    Returns the number of bytes transferred. */
+ 
+-static int
+-gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len,
++static LONGEST
++gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len,
+ 			     int write, struct mem_attrib *attrib,
+ 			     struct target_ops *target)
+ {
++  /* Convert to len type that sim_read and sim_write can handle.  */
++  int xfer_len = (int)len;
++
+   /* If no program is running yet, then ignore the simulator for
+      memory.  Pass the request down to the next target, hopefully
+      an exec file.  */
+@@ -774,22 +777,22 @@ gdbsim_xfer_inferior_memory (CORE_ADDR m
+       printf_filtered ("gdbsim_xfer_inferior_memory: myaddr 0x");
+       gdb_print_host_address (myaddr, gdb_stdout);
+       printf_filtered (", memaddr 0x%s, len %d, write %d\n",
+-		       paddr_nz (memaddr), len, write);
++		       paddr_nz (memaddr), xfer_len, write);
+       if (remote_debug && write)
+-	dump_mem (myaddr, len);
++	dump_mem (myaddr, xfer_len);
+     }
+ 
+   if (write)
+     {
+-      len = sim_write (gdbsim_desc, memaddr, myaddr, len);
++      xfer_len = sim_write (gdbsim_desc, memaddr, myaddr, xfer_len);
+     }
+   else
+     {
+-      len = sim_read (gdbsim_desc, memaddr, myaddr, len);
+-      if (remote_debug && len > 0)
+-	dump_mem (myaddr, len);
++      xfer_len = sim_read (gdbsim_desc, memaddr, myaddr, xfer_len);
++      if (remote_debug && xfer_len > 0)
++	dump_mem (myaddr, xfer_len);
+     }
+-  return len;
++  return (LONGEST)xfer_len;
+ }
+ 
+ static void

gdb-6.3-linespec-20041213.patch

@@ -0,0 +1,464 @@
+[base]
+
+2007-09-21  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* linespec.c (add_minsym_members): Support also the `$allocate' and
+	`$delete' variants.
+
+2007-10-05  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* linespec.c (add_minsym_members): Support also the `$allocate' and
+	`$delete' variants.
+	(decode_variable): Renamed to ...
+	(decode_variable_1) ... here, its parameter NOT_FOUND_PTR and its
+	exception throwing was moved to ...
+	(decode_variable_not_found): ... a new function here.
+	(decode_variable): New function.
+
+2007-10-31  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7.
+
+[ Remove decode_variable* for GDB-6.8+ as no longer needed.  ]
+
+Index: gdb-6.8.50.20081128/gdb/linespec.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/linespec.c	2008-09-05 13:37:17.000000000 +0200
++++ gdb-6.8.50.20081128/gdb/linespec.c	2008-12-04 01:43:36.000000000 +0100
+@@ -39,6 +39,7 @@
+ #include "interps.h"
+ #include "mi/mi-cmds.h"
+ #include "target.h"
++#include "gdb_assert.h"
+ 
+ /* We share this one with symtab.c, but it is not exported widely. */
+ 
+@@ -78,7 +79,8 @@ static struct symtabs_and_lines find_met
+ 
+ static int collect_methods (char *copy, struct type *t,
+ 			    struct symbol *sym_class,
+-			    struct symbol **sym_arr);
++			    struct symbol **sym_arr,
++			    struct minimal_symbol **msym_arr);
+ 
+ static NORETURN void cplusplus_error (const char *name,
+ 				      const char *fmt, ...)
+@@ -87,11 +89,13 @@ static NORETURN void cplusplus_error (co
+ static int total_number_of_methods (struct type *type);
+ 
+ static int find_methods (struct type *, char *,
+-			 enum language, struct symbol **);
++			 enum language, struct symbol **,
++			 struct minimal_symbol **);
+ 
+ static int add_matching_methods (int method_counter, struct type *t,
+ 				 enum language language,
+-				 struct symbol **sym_arr);
++				 struct symbol **sym_arr,
++				 struct minimal_symbol **msym_arr);
+ 
+ static int add_constructors (int method_counter, struct type *t,
+ 			     enum language language,
+@@ -107,6 +111,9 @@ static int is_objc_method_format (const 
+ static struct symtabs_and_lines decode_line_2 (struct symbol *[],
+ 					       int, int, char ***);
+ 
++static struct symtabs_and_lines decode_line_3 (struct minimal_symbol *[],
++					       int, int, char ***);
++
+ static struct symtab *symtab_from_filename (char **argptr,
+ 					    char *p, int is_quote_enclosed,
+ 					    int *not_found_ptr);
+@@ -196,13 +203,18 @@ total_number_of_methods (struct type *ty
+ /* Recursive helper function for decode_line_1.
+    Look for methods named NAME in type T.
+    Return number of matches.
+-   Put matches in SYM_ARR, which should have been allocated with
++   Put symbol matches in SYM_ARR, which should have been allocated with
+    a size of total_number_of_methods (T) * sizeof (struct symbol *).
++   In a special case where we are looking for constructors, we may
++   have to return minimal symbols in the array: MSYM_ARR.  This occurs
++   when the compiler does not generate mangled names for the constructor's
++   debug info because there are multiple versions of the constructor
++   (in-charge vs not-in-charge).
+    Note that this function is g++ specific.  */
+ 
+ static int
+ find_methods (struct type *t, char *name, enum language language,
+-	      struct symbol **sym_arr)
++	      struct symbol **sym_arr, struct minimal_symbol **msym_arr)
+ {
+   int i1 = 0;
+   int ibase;
+@@ -244,7 +256,7 @@ find_methods (struct type *t, char *name
+ 	  if (strcmp_iw (name, method_name) == 0)
+ 	    /* Find all the overloaded methods with that name.  */
+ 	    i1 += add_matching_methods (method_counter, t, language,
+-					sym_arr + i1);
++					sym_arr + i1, msym_arr);
+ 	  else if (strncmp (class_name, name, name_len) == 0
+ 		   && (class_name[name_len] == '\0'
+ 		       || class_name[name_len] == '<'))
+@@ -267,21 +279,100 @@ find_methods (struct type *t, char *name
+   if (i1 == 0)
+     for (ibase = 0; ibase < TYPE_N_BASECLASSES (t); ibase++)
+       i1 += find_methods (TYPE_BASECLASS (t, ibase), name,
+-			  language, sym_arr + i1);
++			  language, sym_arr + i1, msym_arr);
+ 
+   return i1;
+ }
+ 
++static int
++add_minsym_members (const char *class_name,
++		    const char *member_name,
++		    struct minimal_symbol **msym_arr)
++{
++  char *completion_name;
++  char **list;
++  int i;
++  int comp_len;
++  int counter = 0;
++
++  /* To find the member, we first cheat and use symbol completion.
++     This will give us a list of all the member names including
++     the function signature.  */
++  completion_name = xmalloc (strlen (class_name) +
++			     strlen (member_name) + 9);
++  completion_name[0] = '\'';
++  strcpy (completion_name+1, class_name);
++  /* FIXME: make this the language class separator.  */
++  strcat (completion_name, "::");
++  strcat (completion_name, member_name);
++  strcat (completion_name, "(");
++  list = make_symbol_completion_list (completion_name,
++				      completion_name+1);
++
++  /* Now that we have the list, we generate an array of their
++     corresponding minimal symbols.  */
++  counter = 0;
++  while (list && list[counter] != NULL)
++    {
++      msym_arr[counter] = lookup_minimal_symbol (list[counter], NULL, NULL);
++      ++counter;
++    }
++
++  xfree (list);
++
++  /* In the case of constructors, there may be in-charge vs not-in-charge
++     constructors.  Check for names with $base which indicates not-in-charge
++     constructors.  */
++  comp_len = strlen (completion_name);
++  strcpy (completion_name + comp_len - 1, "$base(");
++  list = make_symbol_completion_list (completion_name,
++				      completion_name+1);
++
++  /* Again we have a list.  Add their minimal symbols to the array.  */
++  i = 0;
++  while (list && list[i] != NULL)
++    {
++      msym_arr[counter] = lookup_minimal_symbol (list[i++], NULL, NULL);
++      ++counter;
++    }
++  xfree (list);
++
++  /* Target also the allocating/deleting variants.  */
++  if (member_name[0] == '~')
++    strcpy (completion_name + comp_len - 1, "$delete(");
++  else
++    strcpy (completion_name + comp_len - 1, "$allocate(");
++  list = make_symbol_completion_list (completion_name,
++				      completion_name+1);
++
++  /* Again we have a list.  Add their minimal symbols to the array.  */
++  i = 0;
++  while (list && list[i] != NULL)
++    {
++      msym_arr[counter] = lookup_minimal_symbol (list[i++], NULL, NULL);
++      ++counter;
++    }
++  xfree (list);
++
++  xfree (completion_name);
++
++  return counter;
++}
++
+ /* Add the symbols associated to methods of the class whose type is T
+    and whose name matches the method indexed by METHOD_COUNTER in the
+    array SYM_ARR.  Return the number of methods added.  */
+ 
+ static int
+ add_matching_methods (int method_counter, struct type *t,
+-		      enum language language, struct symbol **sym_arr)
++		      enum language language, struct symbol **sym_arr,
++		      struct minimal_symbol **msym_arr)
+ {
+   int field_counter;
+   int i1 = 0;
++  int cons_index = 0;
++  char *class_name = type_name_no_tag (t);
++  char **list = NULL;
+ 
+   for (field_counter = TYPE_FN_FIELDLIST_LENGTH (t, method_counter) - 1;
+        field_counter >= 0;
+@@ -306,6 +397,16 @@ add_matching_methods (int method_counter
+       else
+ 	phys_name = TYPE_FN_FIELD_PHYSNAME (f, field_counter);
+ 
++      /* Check for special case of looking for member that
++	 doesn't have a mangled name provided.  This will happen
++	 when we have in-charge and not-in-charge constructors.
++	 Since we don't have a mangled name to work with, if we
++	 look for the symbol, we can only find the class itself.
++	 We can find the information we need in the minimal symbol
++	 table which has the full member name information we need.  */
++      if (strlen (phys_name) <= strlen (class_name))
++	return add_minsym_members (class_name, phys_name, msym_arr);
++
+       /* Destructor is handled by caller, don't add it to
+ 	 the list.  */
+       if (is_destructor_name (phys_name) != 0)
+@@ -330,6 +431,9 @@ add_matching_methods (int method_counter
+ 	}
+     }
+ 
++  if (list)
++    xfree (list);
++
+   return i1;
+ }
+ 
+@@ -630,6 +734,146 @@ See set/show multiple-symbol."));
+   discard_cleanups (old_chain);
+   return return_values;
+ }
++
++/* Given a list of NELTS minimal symbols in MSYM_ARR, return a list of lines to
++   operate on (ask user if necessary).
++   If CANONICAL is non-NULL return a corresponding array of mangled names
++   as canonical line specs there.  */
++
++static struct symtabs_and_lines
++decode_line_3 (struct minimal_symbol *msym_arr[],
++	       int nelts, int funfirstline,
++	       char ***canonical)
++{
++  struct symtabs_and_lines values, return_values;
++  char *args, *arg1;
++  int i;
++  char *prompt;
++  char *symname;
++  struct cleanup *old_chain;
++  char **canonical_arr = (char **) NULL;
++
++  values.sals = (struct symtab_and_line *)
++    alloca (nelts * sizeof (struct symtab_and_line));
++  return_values.sals = (struct symtab_and_line *)
++    xmalloc (nelts * sizeof (struct symtab_and_line));
++  old_chain = make_cleanup (xfree, return_values.sals);
++
++  if (canonical)
++    {
++      canonical_arr = (char **) xmalloc (nelts * sizeof (char *));
++      make_cleanup (xfree, canonical_arr);
++      memset (canonical_arr, 0, nelts * sizeof (char *));
++      *canonical = canonical_arr;
++    }
++
++  i = 0;
++  printf_unfiltered ("[0] cancel\n[1] all\n");
++  while (i < nelts)
++    {
++      init_sal (&return_values.sals[i]);	/* Initialize to zeroes.  */
++      init_sal (&values.sals[i]);
++      if (msym_arr[i])
++	{
++	  struct symtabs_and_lines msal = minsym_found (funfirstline,
++						        msym_arr[i]);
++	  memcpy (&values.sals[i], &msal.sals[0],
++		  sizeof (struct symtab_and_line));
++	  if (values.sals[i].symtab)
++	    printf_unfiltered ("[%d] %s at %s:%d\n",
++			       (i + 2),
++			       SYMBOL_PRINT_NAME (msym_arr[i]),
++			       values.sals[i].symtab->filename,
++			       values.sals[i].line);
++	  else
++	    printf_unfiltered ("[%d] %s at ?FILE:%d [No symtab? Probably broken debug info...]\n",
++			       (i + 2),
++			       SYMBOL_PRINT_NAME (msym_arr[i]),
++			       values.sals[i].line);
++
++	}
++      else
++	printf_unfiltered ("?HERE\n");
++      i++;
++    }
++
++  prompt = getenv ("PS2");
++  if (prompt == NULL)
++    {
++      prompt = "> ";
++    }
++  args = command_line_input (prompt, 0, "overload-choice");
++
++  if (args == 0 || *args == 0)
++    error_no_arg ("one or more choice numbers");
++
++  i = 0;
++  while (*args)
++    {
++      int num;
++
++      arg1 = args;
++      while (*arg1 >= '0' && *arg1 <= '9')
++	arg1++;
++      if (*arg1 && *arg1 != ' ' && *arg1 != '\t')
++	error ("Arguments must be choice numbers.");
++
++      num = atoi (args);
++
++      if (num == 0)
++	error ("canceled");
++      else if (num == 1)
++	{
++	  if (canonical_arr)
++	    {
++	      for (i = 0; i < nelts; i++)
++		{
++		  if (canonical_arr[i] == NULL)
++		    {
++		      symname = SYMBOL_LINKAGE_NAME (msym_arr[i]);
++		      canonical_arr[i] = savestring (symname, strlen (symname));
++		    }
++		}
++	    }
++	  memcpy (return_values.sals, values.sals,
++		  (nelts * sizeof (struct symtab_and_line)));
++	  return_values.nelts = nelts;
++	  discard_cleanups (old_chain);
++	  return return_values;
++	}
++
++      if (num >= nelts + 2)
++	{
++	  printf_unfiltered ("No choice number %d.\n", num);
++	}
++      else
++	{
++	  num -= 2;
++	  if (values.sals[num].pc)
++	    {
++	      if (canonical_arr)
++		{
++		  symname = SYMBOL_LINKAGE_NAME (msym_arr[num]);
++		  make_cleanup (xfree, symname);
++		  canonical_arr[i] = savestring (symname, strlen (symname));
++		}
++	      return_values.sals[i++] = values.sals[num];
++	      values.sals[num].pc = 0;
++	    }
++	  else
++	    {
++	      printf_unfiltered ("duplicate request for %d ignored.\n", num);
++	    }
++	}
++
++      args = arg1;
++      while (*args == ' ' || *args == '\t')
++	args++;
++    }
++  return_values.nelts = i;
++  discard_cleanups (old_chain);
++  return return_values;
++}
+ 
+ /* The parser of linespec itself. */
+ 
+@@ -1438,35 +1682,47 @@ find_method (int funfirstline, char ***c
+   struct symbol **sym_arr =  alloca (total_number_of_methods (t)
+ 				     * sizeof (struct symbol *));
+ 
++  struct minimal_symbol **msym_arr =  alloca (total_number_of_methods (t)
++				     * sizeof (struct minimal_symbol *));
++
++  msym_arr[0] = NULL;
++
+   /* Find all methods with a matching name, and put them in
+      sym_arr.  */
+ 
+-  i1 = collect_methods (copy, t, sym_class, sym_arr);
++  i1 = collect_methods (copy, t, sym_class, sym_arr, msym_arr);
+ 
+   if (i1 == 1)
+     {
+       /* There is exactly one field with that name.  */
+-      sym = sym_arr[0];
+-
+-      if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
+-	{
+-	  values.sals = (struct symtab_and_line *)
+-	    xmalloc (sizeof (struct symtab_and_line));
+-	  values.nelts = 1;
+-	  values.sals[0] = find_function_start_sal (sym,
+-						    funfirstline);
+-	}
++      if (msym_arr[0] != NULL)
++	return minsym_found (funfirstline, msym_arr[0]);
+       else
+ 	{
+-	  values.sals = NULL;
+-	  values.nelts = 0;
++          sym = sym_arr[0];
++
++          if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
++	    {
++	      values.sals = (struct symtab_and_line *)
++	        xmalloc (sizeof (struct symtab_and_line));
++	      values.nelts = 1;
++	      values.sals[0] = find_function_start_sal (sym,
++						        funfirstline);
++   	    }
++          else
++	    {
++	      values.sals = NULL;
++	      values.nelts = 0;
++	    }
++          return values;
+ 	}
+-      return values;
+     }
+   if (i1 > 0)
+     {
+       /* There is more than one field with that name
+ 	 (overloaded).  Ask the user which one to use.  */
++      if (msym_arr[0] != NULL)
++	return decode_line_3 (msym_arr, i1, funfirstline, canonical);
+       return decode_line_2 (sym_arr, i1, funfirstline, canonical);
+     }
+   else
+@@ -1493,11 +1748,12 @@ find_method (int funfirstline, char ***c
+ }
+ 
+ /* Find all methods named COPY in the class whose type is T, and put
+-   them in SYM_ARR.  Return the number of methods found.  */
++   them in SYM_ARR or MSYM_ARR.  Return the number of methods found.  */
+ 
+ static int
+ collect_methods (char *copy, struct type *t,
+-		 struct symbol *sym_class, struct symbol **sym_arr)
++		 struct symbol *sym_class, struct symbol **sym_arr,
++		 struct minimal_symbol **msym_arr)
+ {
+   int i1 = 0;	/*  Counter for the symbol array.  */
+ 
+@@ -1518,7 +1774,7 @@ collect_methods (char *copy, struct type
+ 	}
+     }
+   else
+-    i1 = find_methods (t, copy, SYMBOL_LANGUAGE (sym_class), sym_arr);
++    i1 = find_methods (t, copy, SYMBOL_LANGUAGE (sym_class), sym_arr, msym_arr);
+ 
+   return i1;
+ }

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-nonthreaded-wp-20050117.patch

@@ -0,0 +1,119 @@
+[base]
+
+2007-10-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* linux-nat.c (iterate_over_lwps): Fixed missing LWP initialization for
+	current INFERIOR_PTID.
+
+2007-10-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.base/follow-child.exp, gdb.base/follow-child.c: New files.
+
+2007-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7.
+
+2008-02-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.8pre.
+
+2008-08-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Remove the fix as causing an assertion failure for
+	gdb.base/checkpoint.exp and it is no longer needed for
+	gdb.base/follow-child.exp .
+
+Index: gdb-6.8cvs20080219/gdb/testsuite/gdb.base/follow-child.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8cvs20080219/gdb/testsuite/gdb.base/follow-child.c	2008-02-22 08:14:04.000000000 +0100
+@@ -0,0 +1,29 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2007 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++   Please email any bugs, comments, and/or additions to this file to:
++   bug-gdb@prep.ai.mit.edu  */
++
++#include <unistd.h>
++
++int main()
++{
++  fork ();
++  sleep (60);
++  return 0;
++}
+Index: gdb-6.8cvs20080219/gdb/testsuite/gdb.base/follow-child.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8cvs20080219/gdb/testsuite/gdb.base/follow-child.exp	2008-02-22 08:14:17.000000000 +0100
+@@ -0,0 +1,55 @@
++# Copyright 2007 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++# 
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++# 
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
++set testfile follow-child
++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}
++
++# For C programs, "start" should stop in main().
++
++gdb_test "set follow-fork-mode child" ""
++set test "started"
++# GDB_RUN_CMD already checks for `Starting program:'.
++gdb_run_cmd
++sleep 5
++send_gdb "\003"
++set test "break"
++gdb_test_multiple "" $test {
++    -re "Program received signal SIGINT.*$gdb_prompt $" {
++	pass $test
++    }
++    -re "\\\[New process \[0-9\]+\\\]" {
++	fail $test
++    }
++}

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,110 @@
+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-6.8/gdb/rs6000-tdep.c
+===================================================================
+--- gdb-6.8.orig/gdb/rs6000-tdep.c	2008-02-20 15:34:43.000000000 +0100
++++ gdb-6.8/gdb/rs6000-tdep.c	2008-07-14 10:25:29.000000000 +0200
+@@ -124,6 +124,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 */
+@@ -1262,7 +1263,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];
+@@ -1280,11 +1280,13 @@ 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);
+ 
+   memset (fdata, 0, sizeof (struct rs6000_framedata));
++  fdata->func_start = pc;
+   fdata->saved_gpr = -1;
+   fdata->saved_fpr = -1;
+   fdata->saved_vr = -1;
+@@ -1313,6 +1315,55 @@ skip_prologue (struct gdbarch *gdbarch, 
+ 	break;
+       op = extract_unsigned_integer (buf, 4);
+ 
++      /* 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
+@@ -1486,9 +1537,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) || (prologue_sal.line != this_sal.line))

gdb-6.3-ppcdotsolib-20041022.patch

@@ -0,0 +1,31 @@
+2004-10-22  Andrew Cagney  <cagney@gnu.org>
+ 
+ 	* solib-svr4.c (enable_break): Convert a symbol descriptor into
+ 	the corresponding function entry point.
+ 	(solib_break_names): Delete "._dl_debug_state", no longer needed.
+
+2007-10-12  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7.
+ 	
+Index: gdb-6.7/gdb/solib-svr4.c
+===================================================================
+--- gdb-6.7.orig/gdb/solib-svr4.c	2007-10-09 20:03:30.000000000 +0200
++++ gdb-6.7/gdb/solib-svr4.c	2007-10-12 22:34:03.000000000 +0200
+@@ -1089,7 +1089,15 @@ enable_break (void)
+ 	{
+ 	  sym_addr = bfd_lookup_symbol (tmp_bfd, *bkpt_namep);
+ 	  if (sym_addr != 0)
+-	    break;
++	    {
++	      /* The symbol might be a descriptor, convert to into the
++		 corresponding code address.  */
++	      sym_addr = gdbarch_convert_from_func_ptr_addr (current_gdbarch,
++							     sym_addr,
++							     tmp_bfd_target);
++	      if (sym_addr != 0)
++		break;
++	    }
+ 	}
+ 
+       if (sym_addr != 0)

gdb-6.3-readnever-20050907.patch

@@ -0,0 +1,96 @@
+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-6.8.50.20090302/gdb/doc/gdb.texinfo
+===================================================================
+--- gdb-6.8.50.20090302.orig/gdb/doc/gdb.texinfo	2009-05-09 20:00:02.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/doc/gdb.texinfo	2009-05-09 20:00:06.000000000 +0200
+@@ -988,6 +988,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-6.8.50.20090302/gdb/main.c
+===================================================================
+--- gdb-6.8.50.20090302.orig/gdb/main.c	2009-05-09 20:00:03.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/main.c	2009-05-09 20:00:06.000000000 +0200
+@@ -427,6 +427,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},
+@@ -1070,6 +1071,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-6.8.50.20090302/gdb/symfile.c
+===================================================================
+--- gdb-6.8.50.20090302.orig/gdb/symfile.c	2009-05-09 20:00:03.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/symfile.c	2009-05-09 20:00:06.000000000 +0200
+@@ -77,6 +77,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-6.8.50.20090302/gdb/dwarf2read.c
+===================================================================
+--- gdb-6.8.50.20090302.orig/gdb/dwarf2read.c	2009-05-09 20:00:02.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/dwarf2read.c	2009-05-09 20:00:19.000000000 +0200
+@@ -50,6 +50,7 @@
+ #include "c-lang.h"
+ #include "typeprint.h"
+ #include "block.h"
++#include "top.h"
+ 
+ #include <fcntl.h>
+ #include "gdb_string.h"
+@@ -1187,7 +1188,8 @@ dwarf2_has_info (struct objfile *objfile
+   dwarf_aranges_section = 0;
+   
+   bfd_map_over_sections (objfile->obfd, dwarf2_locate_sections, &update_sizes);
+-  return (dwarf_info_section != NULL && dwarf_abbrev_section != NULL);
++  return !readnever_symbol_files
++	 && dwarf_info_section != NULL && dwarf_abbrev_section != NULL;
+ }
+ 
+ /* When loading sections, we can either look for ".<name>", or for
+Index: gdb-6.8.50.20090302/gdb/top.h
+===================================================================
+--- gdb-6.8.50.20090302.orig/gdb/top.h	2009-01-03 06:57:53.000000000 +0100
++++ gdb-6.8.50.20090302/gdb/top.h	2009-05-09 20:00:06.000000000 +0200
+@@ -59,6 +59,7 @@ extern void set_prompt (char *);
+ 
+ /* From random places.  */
+ extern int readnow_symbol_files;
++extern int readnever_symbol_files;
+ 
+ /* Perform _initialize initialization */
+ extern void gdb_init (char *);

gdb-6.3-removebp-20041130.patch

@@ -0,0 +1,29 @@
+2004-11-30  Jeff Johnston  <jjohnstn@redhat.com> 
+
+	* breakpoint.c (remove_breakpoints): Continue removing breakpoints
+	even if an error occurs.  Remove a failure code for the last failure
+	only.
+
+--- gdb+dejagnu-20040607/gdb/breakpoint.c.fix2	Tue Nov 30 18:01:33 2004
++++ gdb+dejagnu-20040607/gdb/breakpoint.c	Tue Nov 30 18:06:01 2004
+@@ -1297,6 +1297,7 @@ remove_breakpoints (void)
+ {
+   struct bp_location *b;
+   int val;
++  int return_val = 0;
+ 
+   ALL_BP_LOCATIONS (b)
+   {
+@@ -1304,10 +1305,10 @@ remove_breakpoints (void)
+       {
+ 	val = remove_breakpoint (b, mark_uninserted);
+ 	if (val != 0)
+-	  return val;
++	  return_val = val;
+       }
+   }
+-  return 0;
++  return return_val;
+ }
+ 
+ int

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,76 @@
+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.
+ 
+--- /dev/null	Thu Apr 11 10:25:15 2002
++++ gdb+dejagnu-20040223/gdb/testsuite/gdb.arch/ia64-libunwind.exp	Mon Nov 17 15:57:04 2003
+@@ -0,0 +1,55 @@
++#   Copyright 2003 Free Software Foundation, Inc.
++
++# This program is free software; you can 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 $tracelevel then {
++    strace $tracelevel
++}
++
++#
++# test running programs
++#
++set prms_id 0
++set bug_id 0
++
++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}
++send_gdb "set debug arch 1\n"
++send_gdb "break main\n"
++gdb_test "run" ".*acquire_unwind_info.*"
++ 
+--- /dev/null	Thu Apr 11 10:25:15 2002
++++ gdb+dejagnu-20040223/gdb/testsuite/gdb.arch/ia64-libunwind.c	Mon Nov 17 15:58:27 2003
+@@ -0,0 +1,9 @@
++#include <stdio.h>
++
++int main()
++{
++  printf ("hello world\n");
++ 
++  return 0;
++}
++

gdb-6.3-rh-testlibunwind1fix-20041202.patch

@@ -0,0 +1,14 @@
+2004-08-03  Jeff Johnston  <jjohnstn@redhat.com>
+   
+        * gdb.arch/ia64-libunwind.exp: Fix test string to match
+	current code base.
+
+--- gdb+dejagnu-20040607/gdb/testsuite/gdb.arch/ia64-libunwind.exp.fix	Tue Aug  3 18:29:22 2004
++++ gdb+dejagnu-20040607/gdb/testsuite/gdb.arch/ia64-libunwind.exp	Tue Aug  3 18:41:01 2004
+@@ -51,5 +51,5 @@ gdb_reinitialize_dir $srcdir/$subdir
+ gdb_load ${binfile}
+ send_gdb "set debug arch 1\n"
+ send_gdb "break main\n"
+-gdb_test "run" ".*acquire_unwind_info.*"
++gdb_test "run" ".*ia64_find_proc_info_x.*"
+  

gdb-6.3-rh-testversion-20041202.patch

@@ -1,38 +1,19 @@
-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-6.8/gdb/testsuite/gdb.gdb/selftest.exp
+===================================================================
+--- gdb-6.8.orig/gdb/testsuite/gdb.gdb/selftest.exp	2008-01-26 14:56:37.000000000 +0100
++++ gdb-6.8/gdb/testsuite/gdb.gdb/selftest.exp	2008-07-14 10:23:50.000000000 +0200
+@@ -354,6 +354,9 @@ proc test_with_self { executable } {
  	-re ".\[0-9\]+ = +.+ +0x.*\[0-9.\]+.*$gdb_prompt $" {
  	    pass "printed version with cast"
  	}
-+	-re ".\[0-9\]+ = .(Fedora|Red Hat Enterprise Linux) \[\\(\\)0-9.a-z\\-\]+.*$gdb_prompt $" {
-+	    pass "printed version Fedora or Red Hat Enterprise Linux only"
++	-re ".\[0-9\]+ = .Fedora \[\\(\\)0-9.a-z\\-\]+.*$gdb_prompt $" {
++	    pass "printed version Fedora only"
 +	}
+ 	-re ".*$gdb_prompt $"	{ fail "printed version" }
+ 	timeout		{ fail "(timeout) printed version" }
      }
- 
-     # 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));
- }

gdb-6.3-security-errata-20050610.patch

@@ -0,0 +1,211 @@
+http://sourceware.org/ml/gdb-patches/2005-05/threads.html#00637
+Proposed upstream but never committed upstream.
+
+2005-06-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+        * gdb.base/gdbinit.exp: New testcase.
+        * gdb.base/gdbinit.sample: Sample .gdbinit for gdbinit.exp.
+
+2005-06-08  Daniel Jacobowitz  <dan@codesourcery.com>
+            Jeff Johnston  <jjohnstn@redhat.com>
+
+        * Makefile.in (cli-cmds.o): Update.
+        * configure.in: Add check for getuid.
+        * configure: Regenerated.
+        * config.in: Ditto.
+        * main.c (captured_main): Pass -1 to source_command when loading
+        gdbinit files.
+        * cli/cli-cmds.c: Include "gdb_stat.h" and <fcntl.h>.
+        (source_command): Update documentation.  Check permissions if
+        FROM_TTY is -1.
+
+Index: gdb-6.8.50.20090226/gdb/cli/cli-cmds.c
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/cli/cli-cmds.c	2009-02-27 00:04:32.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/cli/cli-cmds.c	2009-02-28 07:17:49.000000000 +0100
+@@ -36,6 +36,7 @@
+ #include "objfiles.h"
+ #include "source.h"
+ #include "disasm.h"
++#include "gdb_stat.h"
+ 
+ #include "ui-out.h"
+ 
+@@ -466,7 +467,7 @@ source_script (char *file, int from_tty)
+ 
+   if (fd == -1)
+     {
+-      if (from_tty)
++      if (from_tty > 0)
+ 	perror_with_name (file);
+       else
+ 	{
+@@ -475,6 +476,29 @@ source_script (char *file, int from_tty)
+ 	}
+     }
+ 
++#ifdef HAVE_GETUID
++  if (from_tty == -1)
++    {
++      struct stat statbuf;
++
++      if (fstat (fd, &statbuf) < 0)
++	{
++	  close (fd);
++	  /* Do not do_cleanups (old_cleanups) as FILE is allocated there.
++	     perror_with_name calls error which should call the cleanups.  */
++	  perror_with_name (file);
++	}
++      if (statbuf.st_uid != getuid () || (statbuf.st_mode & S_IWOTH))
++	{
++	  /* FILE gets freed by do_cleanups (old_cleanups).  */
++	  warning (_("not using untrusted file \"%s\""), file);
++	  close (fd);
++	  do_cleanups (old_cleanups);
++	  return;
++	}
++    }
++#endif
++
+   is_python = source_python;
+   if (strlen (file) > 3 && !strcmp (&file[strlen (file) - 3], ".py"))
+     is_python = 1;
+@@ -486,6 +510,7 @@ source_script (char *file, int from_tty)
+   else
+     script_from_file (stream, file);
+ 
++  /* FILE gets freed by do_cleanups (old_cleanups).  */
+   do_cleanups (old_cleanups);
+ }
+ 
+Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.base/gdbinit.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.base/gdbinit.exp	2009-02-28 07:15:57.000000000 +0100
+@@ -0,0 +1,98 @@
++#   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 $tracelevel then {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
++# are we on a target board
++if [is_remote target] {
++    return
++}
++
++
++global verbose
++global GDB
++global GDBFLAGS
++global gdb_prompt
++global timeout
++global gdb_spawn_id;
++
++gdb_stop_suppressing_tests;
++
++verbose "Spawning $GDB -nw"
++
++if [info exists gdb_spawn_id] {
++    return 0;
++}
++
++if ![is_remote host] {
++   if { [which $GDB] == 0 } then {
++        perror "$GDB does not exist."
++        exit 1
++    }
++}
++
++set env(HOME) [pwd]
++remote_exec build "rm .gdbinit"
++remote_exec build "cp ${srcdir}/${subdir}/gdbinit.sample .gdbinit"
++remote_exec build "chmod 646 .gdbinit"
++
++set res [remote_spawn host "$GDB -nw [host_info gdb_opts]"];
++if { $res < 0 || $res == "" } {
++    perror "Spawning $GDB failed."
++    return 1;
++}
++gdb_expect 360 {
++    -re "warning: not using untrusted file.*\.gdbinit.*\[\r\n\]$gdb_prompt $" {
++        pass "untrusted .gdbinit caught."
++    }
++    -re "$gdb_prompt $"     {
++        fail "untrusted .gdbinit caught."
++    }
++    timeout {
++        fail "(timeout) untrusted .gdbinit caught."
++    }
++}
++
++remote_exec build "chmod 644 .gdbinit"
++set res [remote_spawn host "$GDB -nw [host_info gdb_opts]"];
++if { $res < 0 || $res == "" } {
++    perror "Spawning $GDB failed."
++    return 1;
++}
++gdb_expect 360 {
++    -re "warning: not using untrusted file.*\.gdbinit.*\[\r\n\]$gdb_prompt $" {
++        fail "trusted .gdbinit allowed."
++    }
++    -re "in gdbinit.*$gdb_prompt $"     {
++        pass "trusted .gdbinit allowed."
++    }
++    timeout {
++        fail "(timeout) trusted .gdbinit allowed."
++    }
++}
++
++remote_exec build "rm .gdbinit"
+Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.base/gdbinit.sample
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090226/gdb/testsuite/gdb.base/gdbinit.sample	2009-02-28 07:15:57.000000000 +0100
+@@ -0,0 +1 @@
++echo "\nin gdbinit"
+Index: gdb-6.8.50.20090226/gdb/main.c
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/main.c	2009-02-27 00:04:32.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/main.c	2009-02-28 07:15:57.000000000 +0100
+@@ -855,7 +855,7 @@ Excess command line arguments ignored. (
+      debugging or what directory you are in.  */
+ 
+   if (home_gdbinit && !inhibit_gdbinit)
+-    catch_command_errors (source_script, home_gdbinit, 0, RETURN_MASK_ALL);
++    catch_command_errors (source_script, home_gdbinit, -1, RETURN_MASK_ALL);
+ 
+   /* Now perform all the actions indicated by the arguments.  */
+   if (cdarg != NULL)
+@@ -924,7 +924,7 @@ Can't attach to process and specify a co
+   /* Read the .gdbinit file in the current directory, *if* it isn't
+      the same as the $HOME/.gdbinit file (it should exist, also).  */
+   if (local_gdbinit && !inhibit_gdbinit)
+-    catch_command_errors (source_script, local_gdbinit, 0, RETURN_MASK_ALL);
++    catch_command_errors (source_script, local_gdbinit, -1, RETURN_MASK_ALL);
+ 
+   for (i = 0; i < ncmd; i++)
+     {

gdb-6.3-sepcrc-20050402.patch

@@ -0,0 +1,82 @@
+2005-04-02  Andrew Cagney  <cagney@gnu.org>
+
+	* symfile.c (separate_debug_file_exists): When the CRCs mismatch
+	print a warning.
+	(find_separate_debug_file): Pass in the objfile's name.
+
+Index: gdb-6.8.50.20081128/gdb/symfile.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/symfile.c	2008-10-03 18:36:10.000000000 +0200
++++ gdb-6.8.50.20081128/gdb/symfile.c	2008-12-01 16:34:36.000000000 +0100
+@@ -1296,7 +1296,8 @@ get_debug_link_info (struct objfile *obj
+ }
+ 
+ static int
+-separate_debug_file_exists (const char *name, unsigned long crc)
++separate_debug_file_exists (const char *name, unsigned long crc,
++			    const char *parent_name)
+ {
+   unsigned long file_crc = 0;
+   bfd *abfd;
+@@ -1316,7 +1317,15 @@ separate_debug_file_exists (const char *
+ 
+   bfd_close (abfd);
+ 
+-  return crc == file_crc;
++  if (crc != file_crc)
++    {
++      warning (_("the debug information found in \"%s\""
++		 " does not match \"%s\" (CRC mismatch).\n"),
++	       name, parent_name);
++      return 0;
++    }
++
++  return 1;
+ }
+ 
+ char *debug_file_directory = NULL;
+@@ -1368,6 +1377,8 @@ find_separate_debug_file (struct objfile
+   basename = get_debug_link_info (objfile, &crc32);
+ 
+   if (basename == NULL)
++    /* There's no separate debug info, hence there's no way we could
++       load it => no warning.  */
+     return NULL;
+ 
+   dir = xstrdup (objfile->name);
+@@ -1395,7 +1406,7 @@ find_separate_debug_file (struct objfile
+   strcpy (debugfile, dir);
+   strcat (debugfile, basename);
+ 
+-  if (separate_debug_file_exists (debugfile, crc32))
++  if (separate_debug_file_exists (debugfile, crc32, objfile->name))
+     {
+       xfree (basename);
+       xfree (dir);
+@@ -1408,7 +1419,7 @@ find_separate_debug_file (struct objfile
+   strcat (debugfile, "/");
+   strcat (debugfile, basename);
+ 
+-  if (separate_debug_file_exists (debugfile, crc32))
++  if (separate_debug_file_exists (debugfile, crc32, objfile->name))
+     {
+       xfree (basename);
+       xfree (dir);
+@@ -1421,7 +1432,7 @@ find_separate_debug_file (struct objfile
+   strcat (debugfile, dir);
+   strcat (debugfile, basename);
+ 
+-  if (separate_debug_file_exists (debugfile, crc32))
++  if (separate_debug_file_exists (debugfile, crc32, objfile->name))
+     {
+       xfree (basename);
+       xfree (dir);
+@@ -1440,7 +1451,7 @@ find_separate_debug_file (struct objfile
+       strcat (debugfile, "/");
+       strcat (debugfile, basename);
+ 
+-      if (separate_debug_file_exists (debugfile, crc32))
++      if (separate_debug_file_exists (debugfile, crc32, objfile->name))
+ 	{
+ 	  xfree (canon_name);
+ 	  xfree (basename);

gdb-6.3-step-thread-exit-20050211-test.patch

@@ -0,0 +1,195 @@
+2005-02-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* testsuite/gdb.threads/step-thread-exit.c: New testcase.
+	* testsuite/gdb.threads/step-thread-exit.exp: Ditto.
+	
+Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/step-thread-exit.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/step-thread-exit.c	2008-12-08 22:21:26.000000000 +0100
+@@ -0,0 +1,50 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2005 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.  */
++
++#include <pthread.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++
++void *thread_function (void *ptr)
++{
++  int *x = (int *)ptr;
++  printf("In thread_function, *x is %d\n", *x);
++} /* thread_function_end */
++
++volatile int repeat = 0;
++
++main()
++{
++  int ret;
++  pthread_t th;
++  int i = 3;
++
++  ret = pthread_create (&th, NULL, thread_function, &i);
++  do
++    {
++      repeat = 0;
++      sleep (3);  /* sleep */
++    }
++  while (repeat);
++  pthread_join (th, NULL);
++  return 0;
++}
++
++
+Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/step-thread-exit.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/step-thread-exit.exp	2008-12-08 22:22:14.000000000 +0100
+@@ -0,0 +1,130 @@
++# This testcase is part of GDB, the GNU debugger.
++
++# Copyright 2005 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
++
++# Check that GDB can step over a thread exit.
++
++if $tracelevel {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
++set testfile "step-thread-exit"
++set srcfile ${testfile}.c
++set binfile ${objdir}/${subdir}/${testfile}
++if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++# Reset the debug file directory so we can't debug within the C library
++gdb_test "set debug-file-directory ." "" ""
++
++#
++# Run to `main' where we begin our tests.
++#
++
++if ![runto_main] then {
++    gdb_suppress_tests
++}
++
++# FIXME: Currently the main thread will escape/exit before our thread finishes
++# without this setting.
++gdb_test "set scheduler-locking step"
++gdb_test "show scheduler-locking" "Mode for locking scheduler during execution is \"step\"." "check scheduler-locking first"
++
++set sleep_line [expr [gdb_get_line_number "sleep"]]
++set end_line [expr [gdb_get_line_number "thread_function_end"]]
++
++gdb_breakpoint "$end_line"
++gdb_test "continue" "Break.*thread_function.*" "continue to thread_function 1"
++
++# Keep nexting until we cause the thread to exit.  We expect the main
++# thread to be stopped and a message printed to tell us we have stepped
++# over the thread exit.
++set test "step over thread exit 1"
++gdb_test_multiple "next" "$test" {
++  -re "\}.*$gdb_prompt $" {
++     send_gdb "next\n"
++     exp_continue
++  }
++  -re "\[Thread .* exited\].*Program received signal SIGSTOP.*$gdb_prompt $" {
++     pass "$test"
++  }
++  -re "start_thread.*$gdb_prompt $" {
++     send_gdb "next\n"
++     exp_continue
++  }
++}
++
++# Without this fixup we could end up in:
++# #0  0x00110416 in __kernel_vsyscall ()
++# #1  0x0011de26 in __lll_unlock_wake_private () from /lib/libpthread.so.0
++# #2  0x001179f4 in _L_unlock_3164 () from /lib/libpthread.so.0
++# #3  0x00116f01 in pthread_create@@GLIBC_2.1 () from /lib/libpthread.so.0
++# #4  0x08048531 in main () at ../.././gdb/testsuite/gdb.threads/step-thread-exit.c:39
++gdb_breakpoint "$sleep_line"
++gdb_test "set repeat=1" "" "Get to the sleep function prepare 1"
++gdb_test "continue" "Break.*$sleep_line.*" "Get to the sleep function 1"
++
++gdb_test "bt" "main.*$sleep_line.*" "backtrace after step 1"
++
++runto_main
++gdb_test "show scheduler-locking" "Mode for locking scheduler during execution is \"step\"." "check scheduler-locking second"
++
++gdb_breakpoint "$sleep_line"
++gdb_breakpoint "$end_line"
++set test "continue to thread_function 2"
++gdb_test_multiple "continue" "$test" {
++    -re "Break.*thread_function.*$gdb_prompt $" {
++	pass $test
++    }
++    -re "Break.*$sleep_line.*$gdb_prompt $" {
++	gdb_test "set repeat=1" "" ""
++	send_gdb "continue\n"
++	exp_continue
++    }
++}
++
++# Keep nexting until we cause the thread to exit.  In this case, we
++# expect the breakpoint in the main thread to have already triggered
++# and so we should stop there with a message that we stepped over
++# the thread exit.
++set test "step over thread exit 2"
++gdb_test_multiple "next" "$test" {
++  -re "\}.*$gdb_prompt $" {
++     send_gdb "next\n"
++     exp_continue
++  }
++  -re "\[Thread .* exited\].*Break.*$sleep_line.*$gdb_prompt $" {
++     pass "$test (breakpoint hit)"
++  }
++  -re "\[Thread .* exited\].*$gdb_prompt $" {
++     pass "$test (breakpoint not hit)"
++  }
++  -re "start_thread.*$gdb_prompt $" {
++     send_gdb "next\n"
++     exp_continue
++  }
++}
++

gdb-6.3-terminal-fix-20050214.patch

@@ -0,0 +1,28 @@
+2005-02-14  Jeff Johnston <jjohnstn@redhat.com>
+
+	* top.c (gdb_readline_wrapper): Ensure terminal is gdb's before calling
+	readline.
+
+2007-10-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7.
+
+Index: gdb-6.7/gdb/top.c
+===================================================================
+--- gdb-6.7.orig/gdb/top.c	2007-09-02 23:13:56.000000000 +0200
++++ gdb-6.7/gdb/top.c	2007-10-14 23:38:27.000000000 +0200
+@@ -795,6 +795,14 @@ gdb_readline_wrapper (char *prompt)
+ 
+   back_to = make_cleanup (gdb_readline_wrapper_cleanup, cleanup);
+ 
++  /* Before calling readline, ensure we have the terminal.  If we don't
++     have the terminal and call readline, we risk the possibility of
++     gdb being thrown into the background.  This problem occurs when
++     we attach to a background process on the same terminal the background
++     process was started from and then perform some action which requires
++     a page break prompt.  */
++  terminal_ours ();
++
+   /* Display our prompt and prevent double prompt display.  */
+   display_gdb_prompt (prompt);
+   rl_already_prompted = 1;

gdb-6.3-test-dtorfix-20050121.patch

@@ -1,15 +1,32 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.3-test-dtorfix-20050121.patch
+Index: gdb/testsuite/ChangeLog
+2005-01-21  Jeff Johnston  <jjohnstn@redhat.com>
 
-;; Test support of multiple destructors just like multiple constructors
-;;=fedoratest
+	* gdb.cp/constructortest.exp: New test.
+	* gdb.cp/constructortest.cc: Ditto.
+	* gdb.cp/templates.exp: Change break of dtor to	be fully quoted.
 
-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
+2007-09-22  Jan Kratochvil <jan.kratochvil@redhat.com>
+
+	* gdb.cp/constructortest.exp, gdb.cp/constructortest.cc: Test also the
+	`$delete' destructor variant.
+
+2007-09-25  Jan Kratochvil <jan.kratochvil@redhat.com>
+
+	* gdb.cp/constructortest.exp: Delete the FIXME workaround of restarting
+	the whole GDB.
+
+2007-10-05  Jan Kratochvil <jan.kratochvil@redhat.com>
+
+	* gdb.cp/constructortest.exp: Test BREAKPOINT_RE_SET for multiple PCs
+	by PIE.
+	* gdb.cp/constructortest.exp: Handle the change of settings breakpoints
+	always at all the ctor/dtor variants.
+
+[ Removed the `gdb.cp/templates.exp' patch.  ]
+[ Updated the patch for "(X location") of GDB-6.8+.  ]
+
+--- gdb-6.3/gdb/testsuite/gdb.cp/constructortest.cc.fix	Fri Jan 21 17:06:56 2005
++++ gdb-6.3/gdb/testsuite/gdb.cp/constructortest.cc	Fri Jan 21 17:05:18 2005
 @@ -0,0 +1,99 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -110,11 +127,9 @@ 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
-@@ -0,0 +1,130 @@
+--- gdb-6.3/gdb/testsuite/gdb.cp/constructortest.exp.fix	Fri Jan 21 17:07:02 2005
++++ gdb-6.3/gdb/testsuite/gdb.cp/constructortest.exp	Fri Jan 21 17:05:29 2005
+@@ -0,0 +1,131 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
 +# Copyright 2005, 2007 Free Software Foundation, Inc.
@@ -135,9 +150,16 @@ new file mode 100644
 +
 +# Check that GDB can break at multiple forms of constructors.
 +
++if $tracelevel {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
 +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"}] != "" } {
@@ -157,9 +179,8 @@ new file mode 100644
 +    gdb_suppress_tests
 +}
 +
-+# Break on the various forms of the A::A constructor.
-+# " (2 locations)" is displayed depending on G++ version.
-+gdb_test "break A\:\:A" "Breakpoint 2 at .*" "breaking on A::A"
++# Break on the various forms of the A::A constructor
++gdb_test "break A\:\:A" "Breakpoint 2 at .* \\(2 locations\\)" "breaking on A::A"
 +        
 +# Verify that we break for the A constructor two times
 +# Once for new A and once for new B
@@ -185,8 +206,7 @@ new file mode 100644
 +gdb_test "break 'A::A()'" "" "break in constructor A 2"
 +gdb_continue_to_breakpoint "First line A"
 +set second_line [gdb_get_line_number "Second line A"]
-+# " (2 locations)" is displayed depending on G++ version.
-+gdb_test "break $second_line" "Breakpoint .*, line $second_line\\..*" "break by line in constructor"
++gdb_test "break $second_line" "Breakpoint .*, line $second_line. \\(2 locations\\)" "break by line in constructor"
 +gdb_continue_to_breakpoint "Second line A"
 +gdb_test "bt" "#0.*A.*#1.*main.*" "Verify in in-charge A::A second line"
 +gdb_continue_to_breakpoint "Second line A"
@@ -197,8 +217,7 @@ new file mode 100644
 +gdb_test "break 'A::~A()'" "" "break in constructor ~A 2"
 +gdb_continue_to_breakpoint "First line ~A"
 +set second_line_dtor [gdb_get_line_number "Second line ~A"]
-+# " (2 locations)" is displayed depending on G++ version.
-+gdb_test "break $second_line_dtor" "Breakpoint .*, line $second_line_dtor\\..*" "break by line in destructor"
++gdb_test "break $second_line_dtor" "Breakpoint .*, line $second_line_dtor. \\(2 locations\\)" "break by line in destructor"
 +gdb_continue_to_breakpoint "Second line ~A"
 +gdb_test "bt" "#0.*A.*#1.*main.*" "Verify in in-charge A::~A second line"
 +# FIXME: Analyse this case better.
@@ -213,11 +232,8 @@ new file mode 100644
 +gdb_load ${binfile}
 +runto_main
 +
-+set first_line_dtor [gdb_get_line_number "First line ~C"]
-+set define_line_dtor [gdb_get_line_number "Destructor C"]
 +# Break on the various forms of the C::~C destructor
-+# " ([23] locations)" is displayed depending on G++ version.
-+gdb_test "break C\:\:~C" "Breakpoint .*: C::~C\\. \\(2 locations\\)" "breaking on C::~C"
++gdb_test "break C\:\:~C" "Breakpoint .* \\(3 locations\\)" "breaking on C::~C"
 +gdb_continue_to_breakpoint "First line ~C"
 +
 +# Verify that we can break by line number in a destructor and find
@@ -226,8 +242,8 @@ new file mode 100644
 +gdb_load ${binfile}
 +delete_breakpoints
 +
-+# " (3 locations)" is displayed depending on G++ version.
-+gdb_test "break $first_line_dtor" "Breakpoint .*, line $first_line_dtor\\..*" "break by line in destructor"
++set first_line_dtor [gdb_get_line_number "First line ~C"]
++gdb_test "break $first_line_dtor" "Breakpoint .*, line $first_line_dtor. \\(3 locations\\)" "break by line in destructor"
 +
 +# Run to `main' where we begin our tests.
 +# Set the breakpoints first to test PIE multiple-PC BREAKPOINT_RE_SET.

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,11 +19,11 @@ 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
-@@ -0,0 +1,57 @@
+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,67 @@
 +#   Copyright 2005
 +#   Free Software Foundation, Inc.
 +
@@ -49,20 +41,30 @@ new file mode 100644
 +# 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
++
++if $tracelevel then {
++        strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
 +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 +91,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-test-sepcrc-20050402.patch

@@ -0,0 +1,55 @@
+Index: gdb-6.8/gdb/testsuite/gdb.base/sepdebug.exp
+===================================================================
+--- gdb-6.8.orig/gdb/testsuite/gdb.base/sepdebug.exp	2008-02-26 09:14:11.000000000 +0100
++++ gdb-6.8/gdb/testsuite/gdb.base/sepdebug.exp	2008-07-14 10:26:19.000000000 +0200
+@@ -981,3 +981,40 @@ if ![string compare $build_id_debug_file
+     # Spare debug files may confuse testsuite runs in the future.
+     remote_exec build "rm -f ${objdir}/${subdir}/${build_id_debug_filename}"
+ }
++
++
++# Compile up a second, different, object file.  Copy its debug info
++# over the top of the new debug info.  Note that somewhere in the
++# above the "set debug-file-directory" variable is set to
++# ${objdir}/${subdir} so need to move things there.
++
++set existing_binfile $binfile
++set testfile "sepdebug2"
++set srcfile ${testfile}.c
++set binfile ${objdir}/${subdir}/${testfile}
++set corrupt_debug_file [separate_debug_filename $binfile]
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
++    return -1
++}
++if [gdb_gnu_strip_debug $binfile] {
++    # check that you have a recent version of strip and objcopy installed
++    unsupported "cannot produce separate debug info files"
++    return -1
++}
++remote_exec build "cp $corrupt_debug_file ${existing_binfile}.debug"
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++set test  "A corrupt debug file gets a warning"
++gdb_test_multiple "file $existing_binfile" "$test" {
++    -re "warning:.*mismatch.*" {
++	pass "$test"
++    }
++    -re ".y or n. " {
++	send_gdb "y\n"
++	exp_continue
++    }
++}
+Index: gdb-6.8/gdb/testsuite/gdb.base/sepdebug2.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8/gdb/testsuite/gdb.base/sepdebug2.c	2008-07-14 10:26:19.000000000 +0200
+@@ -0,0 +1,5 @@
++int
++main (int argc, char *argv[], char *envp[])
++{
++  return 0;
++}

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
@@ -40,20 +32,17 @@ Subject: gdb-6.3-threaded-watchpoints2-20050225.patch
 	(amd64_linux_hw_breakpoint, amd64_linux_remove_hw_breakpoint): Ditto.
 	(amd64_linux_new_thread): Ditto.
 	(_initialize_amd64_linux_nat): Register linux new thread observer.
-	* testsuite/gdb.threads/watchthreads-threaded.c: New test case.
-	* testsuite/gdb.threads/watchthreads-threaded.exp: Ditto.
+	* testsuite/gdb.threads/watchthreads2.c: New test case.
+	* testsuite/gdb.threads/watchthreads2.exp: Ditto.
 
 [ With recent upstream GDB (6.8) reduced only to the testcase.  ]
 
-[ It was called watchthreads2.{exp,c} before but it conflicted with FSF GDB new
-  testcase of the same name.  ]
-
 FIXME: The testcase does not expects multiple watchpoints hits per one stop.
 
-diff --git a/gdb/testsuite/gdb.threads/watchthreads-threaded.c b/gdb/testsuite/gdb.threads/watchthreads-threaded.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.threads/watchthreads-threaded.c
+Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c	2006-07-12 01:54:29.000000000 -0300
 @@ -0,0 +1,66 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -121,11 +110,11 @@ 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
-@@ -0,0 +1,126 @@
+Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp	2006-07-12 01:54:29.000000000 -0300
+@@ -0,0 +1,133 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
 +# Copyright 2005 Free Software Foundation, Inc.
@@ -146,15 +135,22 @@ new file mode 100644
 +
 +# Check that GDB can support multiple watchpoints across threads.
 +
++if $tracelevel {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
 +# This test verifies that a watchpoint is detected in the proper thread
 +# so the test is only meaningful on a system with hardware watchpoints.
 +if [target_info exists gdb,no_hardware_watchpoints] {
 +    return 0;
 +}
 +
-+set testfile "watchthreads-threaded"
++set testfile "watchthreads2"
 +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
 +}
@@ -209,13 +205,13 @@ new file mode 100644
 +for {set i 0} {$i < 30} {incr i} {
 +  set test_flag 0
 +  gdb_test_multiple "continue" "threaded watch loop" {
-+    -re "Hardware watchpoint 3: args\\\[2\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads-threaded.c:$init_line.*$gdb_prompt $"
++    -re "Hardware watchpoint 3: args\\\[2\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads2.c:$init_line.*$gdb_prompt $"
 +       { set args_2 1; set test_flag 1 }
-+    -re "Hardware watchpoint 4: args\\\[3\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads-threaded.c:$init_line.*$gdb_prompt $"
++    -re "Hardware watchpoint 4: args\\\[3\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads2.c:$init_line.*$gdb_prompt $"
 +       { set args_3 1; set test_flag 1 }
-+    -re "Hardware watchpoint 3: args\\\[2\\\].*Old value = $args_2.*New value = [expr $args_2+1].*in thread_function \\\(arg=0x2\\\) at .*watchthreads-threaded.c:$inc_line.*$gdb_prompt $"
++    -re "Hardware watchpoint 3: args\\\[2\\\].*Old value = $args_2.*New value = [expr $args_2+1].*in thread_function \\\(arg=0x2\\\) at .*watchthreads2.c:$inc_line.*$gdb_prompt $"
 +       { set args_2 [expr $args_2+1]; set test_flag 1 }
-+    -re "Hardware watchpoint 4: args\\\[3\\\].*Old value = $args_3.*New value = [expr $args_3+1].*in thread_function \\\(arg=0x3\\\) at .*watchthreads-threaded.c:$inc_line.*$gdb_prompt $"
++    -re "Hardware watchpoint 4: args\\\[3\\\].*Old value = $args_3.*New value = [expr $args_3+1].*in thread_function \\\(arg=0x3\\\) at .*watchthreads2.c:$inc_line.*$gdb_prompt $"
 +       { set args_3 [expr $args_3+1]; set test_flag 1 }
 +  }
 +  # If we fail above, don't bother continuing loop

gdb-6.3-watchpoint-cond-gone-test.patch

@@ -0,0 +1,128 @@
+--- /dev/null	2008-04-03 00:39:30.714021604 +0200
++++ gdb-6.3/gdb/testsuite/gdb.base/watchpoint-cond-gone-stripped.c	2008-04-05 20:26:29.000000000 +0200
+@@ -0,0 +1,23 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2008 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++ 
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++
++void
++jumper (void (*jumpto) (void))
++{
++  (*jumpto) ();
++}
+--- /dev/null	2008-04-03 00:39:30.714021604 +0200
++++ gdb-6.3/gdb/testsuite/gdb.base/watchpoint-cond-gone.c	2008-04-05 20:26:48.000000000 +0200
+@@ -0,0 +1,37 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2008 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++ 
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++
++extern void jumper (void (*jumpto) (void));
++
++void
++func ()
++{
++	int a, b, c;
++
++	a = b = c = 5;
++	a = b = c = 10;	/* watchpoint-here */
++	c = a + b;
++}
++
++int
++main ()
++{
++	jumper (func);
++
++	return 0;
++}
+--- /dev/null	2008-04-03 00:39:30.714021604 +0200
++++ gdb-6.3/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp	2008-04-05 20:33:19.000000000 +0200
+@@ -0,0 +1,59 @@
++# Copyright 2008 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set testfile "watchpoint-cond-gone"
++set srcfile ${testfile}.c
++set srcfilestripped ${testfile}-stripped.c
++set objfilestripped ${objdir}/${subdir}/${testfile}-stripped.o
++set binfile ${objdir}/${subdir}/${testfile}
++
++# We need to generate a function without DWARF to crash older GDB.
++# Stepping into a dynamic function trampoline or stepping out of MAIN may work
++# but it is not a reliable FAIL case.
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfilestripped}" "${objfilestripped}" object {}] != "" } {
++    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
++}
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${objfilestripped}" "${binfile}" executable {debug}] != "" } {
++    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++# Problem does not occur otherwise.
++gdb_test "set can-use-hw-watchpoints 0"
++
++runto_main
++gdb_breakpoint [gdb_get_line_number "watchpoint-here"]
++gdb_continue_to_breakpoint "Place to set the watchpoint"
++
++# The condition `c == 30' is the tested culprit.
++gdb_test "watch c if c == 30" "" "Place the watchpoint"
++
++# No functionality, just to check the state.
++gdb_test "backtrace"
++
++gdb_test "finish" \
++         "Watchpoint .* deleted because the program has left the block in.*which its expression is valid..*in (jumper|func).*" \
++         "Catch the no longer valid watchpoint"

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-bz181390-memory-address-width.patch

@@ -0,0 +1,197 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181390
+
+2006-09-28  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb/utils.c (paddress): Disable cutting of the printed addresses
+	to the target's address bit size; user wants to see everything.
+	* gdb/value.c (value_as_address1): Original `value_as_address'.
+	(value_as_address): New `value_as_address' wrapper - cut memory address
+	to the target's address bit size, bugreport by John Reiser.
+
+2008-03-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.8pre.
+	New testcase `gdb.arch/amd64-i386-address.exp'.
+
+Index: gdb-6.7.50.20080227/gdb/utils.c
+===================================================================
+--- gdb-6.7.50.20080227.orig/gdb/utils.c	2008-03-02 14:28:44.000000000 +0100
++++ gdb-6.7.50.20080227/gdb/utils.c	2008-03-02 14:35:09.000000000 +0100
+@@ -2540,6 +2540,14 @@ paddr_nz (CORE_ADDR addr)
+ const char *
+ paddress (CORE_ADDR addr)
+ {
++  /* Do not cut the address as the user should see all the information
++     available.  Otherwise 64-bit gdb debugging 32-bit inferior would
++     report for `x/x 0xffffffffffffce70' error
++     `Cannot access memory at 0xffffce70' while the error occured just
++     because of the higher order bits 0xffffffff00000000 there.
++     This specific error no longer occurs as the address is now cut
++     during execution by `value_as_address'.  */
++#if 0
+   /* Truncate address to the size of a target address, avoiding shifts
+      larger or equal than the width of a CORE_ADDR.  The local
+      variable ADDR_BIT stops the compiler reporting a shift overflow
+@@ -2553,6 +2561,8 @@ paddress (CORE_ADDR addr)
+ 
+   if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT))
+     addr &= ((CORE_ADDR) 1 << addr_bit) - 1;
++#endif
++
+   return hex_string (addr);
+ }
+ 
+Index: gdb-6.7.50.20080227/gdb/value.c
+===================================================================
+--- gdb-6.7.50.20080227.orig/gdb/value.c	2008-01-18 18:07:40.000000000 +0100
++++ gdb-6.7.50.20080227/gdb/value.c	2008-03-02 14:36:38.000000000 +0100
+@@ -983,11 +983,9 @@ value_as_double (struct value *val)
+   return foo;
+ }
+ 
+-/* Extract a value as a C pointer. Does not deallocate the value.  
+-   Note that val's type may not actually be a pointer; value_as_long
+-   handles all the cases.  */
+-CORE_ADDR
+-value_as_address (struct value *val)
++/* See `value_as_address' below - core of value to C pointer extraction.  */
++static CORE_ADDR
++value_as_address1 (struct value *val)
+ {
+   /* Assume a CORE_ADDR can fit in a LONGEST (for now).  Not sure
+      whether we want this to be true eventually.  */
+@@ -1087,6 +1085,34 @@ value_as_address (struct value *val)
+   return unpack_long (value_type (val), value_contents (val));
+ #endif
+ }
++
++/* Extract a value as a C pointer. Does not deallocate the value.  
++   Note that val's type may not actually be a pointer; value_as_long
++   handles all the cases.  */
++CORE_ADDR
++value_as_address (struct value *val)
++{
++  CORE_ADDR addr;
++  int addr_bit;
++
++  addr = value_as_address1 (val);
++
++  /* Truncate address to the size of a target address, avoiding shifts
++     larger or equal than the width of a CORE_ADDR.  The local
++     variable ADDR_BIT stops the compiler reporting a shift overflow
++     when it won't occur. */
++  /* NOTE: This assumes that the significant address information is
++     kept in the least significant bits of ADDR - the upper bits were
++     either zero or sign extended.  Should ADDRESS_TO_POINTER() or
++     some ADDRESS_TO_PRINTABLE() be used to do the conversion?  */
++
++  addr_bit = gdbarch_addr_bit (current_gdbarch);
++
++  if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT))
++    addr &= ((CORE_ADDR) 1 << addr_bit) - 1;
++
++  return addr;
++}
+ 
+ /* Unpack raw data (copied from debugee, target byte order) at VALADDR
+    as a long, or as a double, assuming the raw data is described
+--- /dev/null	2008-03-01 10:30:54.797374318 +0100
++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.arch/amd64-i386-address.S	2008-03-02 12:47:06.000000000 +0100
+@@ -0,0 +1,32 @@
++/* 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@gnu.org
++
++   This file is part of the gdb testsuite.
++
++   Test UNsigned extension of the 32-bit inferior address on a 64-bit host.
++   This file is based on the work by John Reiser.
++   This file was created by Jan Kratochvil <jan.kratochvil@redhat.com>.
++   https://bugzilla.redhat.com/show_bug.cgi?id=181390  */
++
++_start:	.globl	_start
++	nop
++	int3
++	movl	%esp,%ebx
++	int3	# examining memory from $ebx fails, from $esp succeeds
++	nop
++	nop
+--- /dev/null	2008-03-01 10:30:54.797374318 +0100
++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.arch/amd64-i386-address.exp	2008-03-02 12:57:11.000000000 +0100
+@@ -0,0 +1,62 @@
++# 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@gnu.org
++
++# This file is part of the gdb testsuite.
++
++# Test UNsigned extension of the 32-bit inferior address on a 64-bit host.
++# This file is based on the work by John Reiser.
++# This file was created by Jan Kratochvil <jan.kratochvil@redhat.com>.
++# https://bugzilla.redhat.com/show_bug.cgi?id=181390
++
++if {![istarget "x86_64-*-*"]} then {
++    verbose "Skipping amd64->i386 adress test."
++    return
++}
++
++set testfile "amd64-i386-address"
++set srcfile ${testfile}.S
++set binfile ${objdir}/${subdir}/${testfile}
++
++if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-m32 -nostdlib"]] != "" } {
++    untested amd64-i386-address.exp
++    return -1
++}
++
++# Get things started.
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++gdb_run_cmd
++
++set test "trap stop"
++gdb_test_multiple "" $test {
++    -re "Program received signal SIGTRAP,.*_start .*$gdb_prompt $" {
++	pass $test
++    }
++}
++
++gdb_test "stepi" ".*_start .*int3.*"
++
++gdb_test "x/x \$esp" "0x\[0-9a-f\]*:\t0x0*1"
++
++# Failure case would be:
++# 	0xff8d7f00:     Cannot access memory at address 0xff8d7f00
++gdb_test "x/x \$ebx" "0x\[0-9a-f\]*:\t0x0*1"

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>
@@ -27,10 +19,7 @@ will get:
 Attached suggestion patch how to deal with the most common "errno" symbol
 for the most common under-ggdb3 compiled programs.
 
-Original patch hooked into target_translate_tls_address.  But its inferior
-call invalidates `struct frame *' in the callers - RH BZ 690908.
 
-https://bugzilla.redhat.com/show_bug.cgi?id=1166549
 
 2007-11-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
@@ -41,24 +30,134 @@ 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)
+Index: gdb-6.8.50.20090228/gdb/gdbtypes.c
+===================================================================
+--- gdb-6.8.50.20090228.orig/gdb/gdbtypes.c	2009-03-02 01:01:15.000000000 +0100
++++ gdb-6.8.50.20090228/gdb/gdbtypes.c	2009-03-02 01:01:53.000000000 +0100
+@@ -3633,6 +3633,8 @@ gdbtypes_post_init (struct gdbarch *gdba
+     init_type (TYPE_CODE_INT, 
+ 	       gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT,
+ 	       0, "int", OBJFILE_INTERNAL);
++  builtin_type->builtin_int_ptr =
++    make_pointer_type (builtin_type->builtin_int, NULL);
+   builtin_type->builtin_unsigned_int =
+     init_type (TYPE_CODE_INT, 
+ 	       gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT,
+@@ -3742,6 +3744,12 @@ gdbtypes_post_init (struct gdbarch *gdba
+ 	       "<text variable, no debug info>", OBJFILE_INTERNAL);
+   TYPE_TARGET_TYPE (builtin_type->nodebug_text_symbol) =
+     builtin_type->builtin_int;
++  builtin_type->nodebug_text_symbol_errno_location =
++    init_type (TYPE_CODE_FUNC, 1, 0, 
++	       "<text variable for __errno_location, no debug info>",
++	       OBJFILE_INTERNAL);
++  TYPE_TARGET_TYPE (builtin_type->nodebug_text_symbol_errno_location) =
++    builtin_type->builtin_int_ptr;
+   builtin_type->nodebug_data_symbol =
+     init_type (TYPE_CODE_INT, 
+ 	       gdbarch_int_bit (gdbarch) / HOST_CHAR_BIT, 0,
+Index: gdb-6.8.50.20090228/gdb/gdbtypes.h
+===================================================================
+--- gdb-6.8.50.20090228.orig/gdb/gdbtypes.h	2009-03-02 01:01:15.000000000 +0100
++++ gdb-6.8.50.20090228/gdb/gdbtypes.h	2009-03-02 01:01:53.000000000 +0100
+@@ -1053,6 +1053,7 @@ struct builtin_type
  
-   if (exp != nullptr && *exp)
-     {
-+      /* '*((int *(*) (void)) __errno_location) ()' is incompatible with
-+	 function descriptors.  */
-+      if (target_has_execution && strcmp (exp, "errno") == 0)
-+	exp = "*(*(int *(*)(void)) __errno_location) ()";
-       expression_up expr = parse_expression (exp);
-       val = evaluate_expression (expr.get ());
-     }
-diff --git a/gdb/testsuite/gdb.dwarf2/dw2-errno.c b/gdb/testsuite/gdb.dwarf2/dw2-errno.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/dw2-errno.c
+   /* Types used for symbols with no debug information.  */
+   struct type *nodebug_text_symbol;
++  struct type *nodebug_text_symbol_errno_location;
+   struct type *nodebug_data_symbol;
+   struct type *nodebug_unknown_symbol;
+   struct type *nodebug_tls_symbol;
+@@ -1065,6 +1066,7 @@ struct builtin_type
+   struct type *builtin_char;
+   struct type *builtin_short;
+   struct type *builtin_int;
++  struct type *builtin_int_ptr;
+   struct type *builtin_long;
+   struct type *builtin_signed_char;
+   struct type *builtin_unsigned_char;
+Index: gdb-6.8.50.20090228/gdb/parse.c
+===================================================================
+--- gdb-6.8.50.20090228.orig/gdb/parse.c	2009-03-02 01:01:15.000000000 +0100
++++ gdb-6.8.50.20090228/gdb/parse.c	2009-03-02 01:01:53.000000000 +0100
+@@ -508,7 +508,12 @@ write_exp_msymbol (struct minimal_symbol
+     case mst_text:
+     case mst_file_text:
+     case mst_solib_trampoline:
+-      write_exp_elt_type (builtin_type (gdbarch)->nodebug_text_symbol);
++      if (builtin_type (gdbarch)->nodebug_text_symbol_errno_location != NULL
++          && strcmp (SYMBOL_LINKAGE_NAME (msymbol), "__errno_location") == 0)
++	write_exp_elt_type (builtin_type (gdbarch)
++					  ->nodebug_text_symbol_errno_location);
++      else
++	write_exp_elt_type (builtin_type (gdbarch)->nodebug_text_symbol);
+       break;
+ 
+     case mst_data:
+Index: gdb-6.8.50.20090228/gdb/target.c
+===================================================================
+--- gdb-6.8.50.20090228.orig/gdb/target.c	2009-03-02 01:01:44.000000000 +0100
++++ gdb-6.8.50.20090228/gdb/target.c	2009-03-02 01:01:53.000000000 +0100
+@@ -827,6 +827,25 @@ pop_all_targets (int quitting)
+   pop_all_targets_above (dummy_stratum, quitting);
+ }
+ 
++static int
++resolve_errno (void *arg)
++{
++  CORE_ADDR *arg_addr = arg;
++  struct expression *expr;
++  struct cleanup *old_chain = 0;
++  struct value *val;
++
++  expr = parse_expression ("__errno_location()");
++  old_chain = make_cleanup (free_current_contents, &expr);
++  val = evaluate_expression (expr);
++  *arg_addr = value_as_address (val);
++  release_value (val);
++  value_free (val);
++  do_cleanups (old_chain);
++
++  return 1;
++}
++
+ /* Using the objfile specified in OBJFILE, find the address for the
+    current thread's thread-local storage with offset OFFSET.  */
+ CORE_ADDR
+@@ -917,7 +936,28 @@ target_translate_tls_address (struct obj
+   /* It wouldn't be wrong here to try a gdbarch method, too; finding
+      TLS is an ABI-specific thing.  But we don't do that yet.  */
+   else
+-    error (_("Cannot find thread-local variables on this target"));
++    {
++      struct minimal_symbol *msymbol;
++
++      msymbol = lookup_minimal_symbol ("errno", NULL, NULL);
++      if (msymbol != NULL
++	  && SYMBOL_VALUE_ADDRESS (msymbol) == offset
++	  && (SYMBOL_OBJ_SECTION (msymbol)->objfile == objfile
++	      || (objfile->separate_debug_objfile != NULL
++	          && SYMBOL_OBJ_SECTION (msymbol)->objfile
++		     == objfile->separate_debug_objfile)
++	      || (objfile->separate_debug_objfile_backlink != NULL
++	          && SYMBOL_OBJ_SECTION (msymbol)->objfile
++		     == objfile->separate_debug_objfile_backlink)))
++	{
++	  if (!catch_errors (resolve_errno, (void *) &addr, "",
++	                     RETURN_MASK_ALL))
++	    error (_("TLS symbol `errno' not resolved for non-TLS program."
++		     "  You should compile the program with `gcc -pthread'."));
++	}
++      else
++	error (_("Cannot find thread-local variables on this target"));
++    }
+ 
+   return addr;
+ }
+Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.c	2009-03-02 01:01:53.000000000 +0100
 @@ -0,0 +1,28 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -88,11 +187,11 @@ 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
-@@ -0,0 +1,60 @@
+Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.exp	2009-03-02 01:01:53.000000000 +0100
+@@ -0,0 +1,67 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -108,9 +207,16 @@ new file mode 100644
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
 +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 +259,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,29 @@
+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.20081128/gdb/remote.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/remote.c	2008-12-09 16:59:51.000000000 +0100
++++ gdb-6.8.50.20081128/gdb/remote.c	2008-12-09 17:00:04.000000000 +0100
+@@ -4329,8 +4329,13 @@ Packet: '%s'\n"),
+ 		VEC_safe_push (cached_reg_t, event->regcache, &cached_reg);
+ 	      }
+ 
+-	    if (*p != ';')
+-	      error (_("Remote register badly formatted: %s\nhere: %s"),
++	    /* 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"
++		       "\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-6.5/gdb/symfile.c
+===================================================================
+--- gdb-6.5.orig/gdb/symfile.c	2006-08-24 02:56:02.000000000 -0300
++++ gdb-6.5/gdb/symfile.c	2006-08-24 02:56:36.000000000 -0300
+@@ -3739,6 +3739,12 @@ symfile_dummy_outputs (bfd *abfd, asecti
+ bfd_byte *
+ symfile_relocate_debug_section (bfd *abfd, asection *sectp, bfd_byte *buf)
+ {
++  /* 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 debugging sections with relocation
+      information.  */
+   if ((sectp->flags & SEC_RELOC) == 0)

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

@@ -0,0 +1,278 @@
+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-6.8.50.20081128/gdb/amd64-linux-tdep.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/amd64-linux-tdep.c	2008-12-08 10:56:17.000000000 +0100
++++ gdb-6.8.50.20081128/gdb/amd64-linux-tdep.c	2008-12-08 21:11:08.000000000 +0100
+@@ -234,6 +234,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)
+ {
+@@ -272,6 +346,8 @@ amd64_linux_init_abi (struct gdbarch_inf
+   tdep->sc_reg_offset = amd64_linux_sc_reg_offset;
+   tdep->sc_num_regs = ARRAY_SIZE (amd64_linux_sc_reg_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-6.8.50.20081128/gdb/amd64-tdep.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/amd64-tdep.c	2008-12-08 10:56:17.000000000 +0100
++++ gdb-6.8.50.20081128/gdb/amd64-tdep.c	2008-12-08 21:05:12.000000000 +0100
+@@ -1044,11 +1044,16 @@ 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));
+ 
+   /* This marks the outermost frame.  */
+   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-6.8.50.20081128/gdb/i386-tdep.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/i386-tdep.c	2008-12-08 10:56:17.000000000 +0100
++++ gdb-6.8.50.20081128/gdb/i386-tdep.c	2008-12-08 11:00:43.000000000 +0100
+@@ -2698,6 +2698,9 @@ i386_gdbarch_init (struct gdbarch_info i
+   tdep->sc_pc_offset = -1;
+   tdep->sc_sp_offset = -1;
+ 
++  /* Unwinding stops on i386 automatically.  */
++  tdep->outermost_frame_p = NULL;
++
+   /* The format used for `long double' on almost all i386 targets is
+      the i387 extended floating-point format.  In fact, of all targets
+      in the GCC 2.95 tree, only OSF/1 does it different, and insists
+Index: gdb-6.8.50.20081128/gdb/i386-tdep.h
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/i386-tdep.h	2008-12-08 10:56:17.000000000 +0100
++++ gdb-6.8.50.20081128/gdb/i386-tdep.h	2008-12-08 21:07:47.000000000 +0100
+@@ -106,6 +106,9 @@ struct gdbarch_tdep
+   /* ISA-specific data types.  */
+   struct type *i386_mmx_type;
+   struct type *i386_sse_type;
++
++  /* Detect OS dependent outermost frames; such as `clone'.  */
++  int (*outermost_frame_p) (struct frame_info *this_frame);
+ };
+ 
+ /* Floating-point registers.  */
+Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/bt-clone-stop.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/bt-clone-stop.c	2008-12-08 11:00:43.000000000 +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-6.8.50.20081128/gdb/testsuite/gdb.threads/bt-clone-stop.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/bt-clone-stop.exp	2008-12-08 11:00:43.000000000 +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-fix.patch

@@ -0,0 +1,19 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
+
+
+Index: gdb-6.8.50.20081128/gdb/minsyms.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/minsyms.c	2008-10-01 18:56:52.000000000 +0200
++++ gdb-6.8.50.20081128/gdb/minsyms.c	2008-12-02 23:24:27.000000000 +0100
+@@ -544,6 +544,11 @@ lookup_minimal_symbol_by_pc_section_1 (C
+ 			 don't fill the bfd_section member, so don't
+ 			 throw away symbols on those platforms.  */
+ 		      && SYMBOL_OBJ_SECTION (&msymbol[hi]) != NULL
++		      /* Don't ignore symbols for solib trampolines.
++			 Limit its sideeffects - only for non-0 sized trampolines.
++			 Red Hat Bug 200533 with its regression Bug 218379.  */
++		      && (MSYMBOL_TYPE (&msymbol[hi]) != mst_solib_trampoline
++		          || MSYMBOL_SIZE (&msymbol[hi]))
+ 		      && (!matching_obj_sections
+ 			  (SYMBOL_OBJ_SECTION (&msymbol[hi]), section)))
+ 		    {

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-6.8/gdb/symtab.c
+===================================================================
+--- gdb-6.8.orig/gdb/symtab.c	2008-02-05 23:17:40.000000000 +0100
++++ gdb-6.8/gdb/symtab.c	2008-07-14 10:27:32.000000000 +0200
+@@ -2132,6 +2132,13 @@ find_pc_sect_line (CORE_ADDR pc, struct 
+ 	  /* See above comment about why warning is commented out */
+ 	  /* warning ("In stub for %s; unable to find real function/line info", 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), paddr (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,16 +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.5-bz243845-stale-testing-zombie-test.patch
-
-;; Test leftover zombie process (BZ 243845).
-;;=fedoratest
-
-diff --git a/gdb/testsuite/gdb.base/tracefork-zombie.exp b/gdb/testsuite/gdb.base/tracefork-zombie.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/tracefork-zombie.exp
-@@ -0,0 +1,75 @@
+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,82 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -27,6 +18,13 @@ new file mode 100644
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 +
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
 +# are we on a target board
 +if [is_remote target] then {
 +    return 0

gdb-6.5-dwarf-stack-overflow.patch

@@ -0,0 +1,52 @@
+for gdb/ChangeLog:
+2006-08-22  Will Drewry <wad@google.com>
+	    Tavis Ormandy <taviso@google.com>
+
+	* dwarf2read.c (decode_locdesc): Enforce location description stack
+	boundaries.
+	* dwarfread.c (locval): Likewise.
+
+2007-10-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7.
+
+Index: gdb-6.7/gdb/dwarf2read.c
+===================================================================
+--- gdb-6.7.orig/gdb/dwarf2read.c	2007-10-15 00:08:30.000000000 +0200
++++ gdb-6.7/gdb/dwarf2read.c	2007-10-15 21:42:43.000000000 +0200
+@@ -9070,8 +9070,7 @@ dwarf2_fundamental_type (struct objfile 
+    callers will only want a very basic result and this can become a
+    complaint.
+ 
+-   Note that stack[0] is unused except as a default error return.
+-   Note that stack overflow is not yet handled.  */
++   Note that stack[0] is unused except as a default error return. */
+ 
+ static CORE_ADDR
+ decode_locdesc (struct dwarf_block *blk, struct dwarf2_cu *cu)
+@@ -9088,7 +9087,7 @@ decode_locdesc (struct dwarf_block *blk,
+ 
+   i = 0;
+   stacki = 0;
+-  stack[stacki] = 0;
++  stack[++stacki] = 0;
+ 
+   while (i < size)
+     {
+@@ -9270,6 +9269,16 @@ decode_locdesc (struct dwarf_block *blk,
+ 		     dwarf_stack_op_name (op));
+ 	  return (stack[stacki]);
+ 	}
++      /* Enforce maximum stack depth of size-1 to avoid ++stacki writing
++         outside of the allocated space. Also enforce minimum > 0.
++         -- wad@google.com 14 Aug 2006 */
++      if (stacki >= sizeof (stack) / sizeof (*stack) - 1)
++	internal_error (__FILE__, __LINE__,
++	                _("location description stack too deep: %d"),
++	                stacki);
++      if (stacki <= 0)
++	internal_error (__FILE__, __LINE__,
++	                _("location description stack too shallow"));
+     }
+   return (stack[stacki]);
+ }

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,11 +39,10 @@ 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
-@@ -0,0 +1,94 @@
+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,101 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -69,11 +59,18 @@ new file mode 100644
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
 +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-gcore-i386-on-amd64.patch

@@ -0,0 +1,847 @@
+2006-10-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
+	    Fujitsu
+
+	* amd64-linux-nat.c: Support new linux_elfcore_write_prpsinfo,
+	linux_elfcore_write_prstatus, linux_elfcore_write_prfpreg.
+	(i386_linux_gregset32_reg_offset): New mapping for i386 on amd64.
+	* gcore.c (gcore_create_callback): Comment vdso Linux kernel bug.
+	* configure.ac: Check for <sys/user32.h>, <sys/procfs32.h>.
+	* configure, config.in: Regenerated.
+	* gdb_user32.h, gdb_procfs32.h: Define 32-bit core files even for
+	64-bit gdb, provide fallbacks for <sys/user32.h> and <sys/procfs32.h>.
+	* linux-nat.c: Virtualize `elfcore_*' by (*`linux_elfcore_*').
+	(linux_nat_do_thread_registers): Likewise.
+	(linux_nat_make_corefile_notes): Likewise.
+	* linux-nat.h: Likewise.
+	* Makefile.in: Dependencies updated.
+
+2007-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7.
+
+2008-02-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.8pre.
+
+Index: gdb-6.8.50.20081214/gdb/amd64-linux-nat.c
+===================================================================
+--- gdb-6.8.50.20081214.orig/gdb/amd64-linux-nat.c	2008-12-14 21:17:01.000000000 +0100
++++ gdb-6.8.50.20081214/gdb/amd64-linux-nat.c	2008-12-14 21:24:19.000000000 +0100
+@@ -50,6 +50,9 @@
+ #include "amd64-tdep.h"
+ #include "i386-linux-tdep.h"
+ #include "amd64-nat.h"
++#include "i387-tdep.h"
++#include "elf-bfd.h"
++#include "gdb_procfs32.h"
+ 
+ /* Mapping between the general-purpose registers in GNU/Linux x86-64
+    `struct user' format and GDB's register cache layout.  */
+@@ -84,6 +87,35 @@ static int amd64_linux_gregset64_reg_off
+    GNU/Linux i386 registers are all 32-bit, but since we're
+    little-endian we get away with that.  */
+ 
++/* This info is not reusable from "i386-linux-nat.c" as gdb itself runs in
++   64-bit mode and so ptrace(2) has 64-bit structure layout.
++   Just the corefile being generated has 32-bit layout so we need to do
++   a conversion specific to the i386-on-amd64 compatibility mode.  */
++static int i386_linux_gregset32_reg_offset[] =
++{
++  6 * 4,			/* %eax */
++  1 * 4,			/* %ecx */
++  2 * 4,			/* %edx */
++  0 * 4,			/* %ebx */
++  15 * 4,			/* %esp */
++  5 * 4,			/* %ebp */
++  3 * 4,			/* %esi */
++  4 * 4,			/* %edi */
++  12 * 4,			/* %eip */
++  14 * 4,			/* %eflags */
++  13 * 4,			/* %cs */
++  16 * 4,			/* %ss */
++  7 * 4,			/* %ds */
++  8 * 4,			/* %es */
++  9 * 4,			/* %fs */
++  10 * 4,			/* %gs */
++  -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1,
++  -1, -1, -1, -1, -1, -1, -1, -1,
++  -1,
++  11 * 4			/* "orig_eax" */
++};
++
+ /* From <sys/reg.h> on GNU/Linux i386.  */
+ static int amd64_linux_gregset32_reg_offset[] =
+ {
+@@ -102,6 +134,96 @@ static int amd64_linux_gregset32_reg_off
+ };
+ 
+ 
++/* This functions make ELF32 32-bit elfcore note sections
++   on amd64 environment. */
++
++static char *
++amd64_linux_elfcore_write_prpsinfo (bfd *abfd, char *buf, int *bufsiz,
++				    const char *fname, const char *psargs)
++{
++  if (gdbarch_ptr_bit(current_gdbarch) == 32)
++    {
++      int note_type;
++      char *note_name = "CORE";
++      struct elf_prpsinfo32 data;
++      note_type = NT_PRPSINFO;
++
++      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));
++    }
++  else
++    return elfcore_write_prpsinfo (abfd, buf, bufsiz, fname, psargs);
++}
++
++static void
++amd64_linux_set_registers (const gdb_byte *gregs, gdb_byte *buf)
++{
++  int i;
++  /* Copy the i386 registers in the amd64 layout into i386 layout.  */
++  for (i = 0; i < I386_NUM_GREGS; i++)
++    memcpy(buf + i386_linux_gregset32_reg_offset[i],
++	   gregs + amd64_linux_gregset32_reg_offset[i], 4);
++  for (i = I386_CS_REGNUM; i <= I386_GS_REGNUM; i++)
++    memcpy(buf + i386_linux_gregset32_reg_offset[i],
++	   gregs + amd64_linux_gregset32_reg_offset[i], 4);
++}
++
++static char *
++amd64_linux_elfcore_write_prstatus (bfd *abfd, char *buf, int *bufsiz,
++			      long pid, int cursig, const void *gregs)
++{
++  if (gdbarch_ptr_bit(current_gdbarch) == 32)
++    {
++      char *note_name = "CORE";
++      struct elf_prstatus32 prstat;
++      memset (&prstat, 0, sizeof (prstat));
++      prstat.pr_pid = pid;
++      prstat.pr_cursig = cursig;
++      amd64_linux_set_registers (gregs, (gdb_byte *) &prstat.pr_reg);
++      return elfcore_write_note (abfd, buf, bufsiz, note_name,
++				 NT_PRSTATUS, &prstat, sizeof (prstat));
++    }
++  else
++    return elfcore_write_prstatus (abfd, buf, bufsiz, pid, cursig, gregs);
++}
++
++static char *
++amd64_elfcore_write_prxfpreg32 (bfd *abfd, char *buf, int *bufsiz,
++				struct regcache *regcache)
++{
++  char *note_name = "LINUX";
++  elf_fpxregset32_t fpxregs32;
++
++  i387_collect_fxsave (regcache, -1, &fpxregs32);
++  return elfcore_write_note(abfd, buf, bufsiz,
++				     note_name, NT_PRXFPREG, &fpxregs32,
++				     sizeof(fpxregs32));
++}
++
++static char *
++amd64_linux_elfcore_write_prfpreg (bfd *abfd, char *buf,
++				   int *bufsiz, const void *fpregs, int size,
++				   struct regcache *regcache)
++{
++  if (gdbarch_ptr_bit(current_gdbarch) == 32)
++    {
++      char *note_name = "CORE";
++      elf_fpregset32_t fpregs32;
++  
++      i387_collect_fsave (regcache, -1, &fpregs32);
++      buf = elfcore_write_note(abfd, buf, bufsiz, note_name,
++			       NT_FPREGSET, &fpregs32, sizeof(fpregs32));
++
++      return amd64_elfcore_write_prxfpreg32 (abfd, buf, bufsiz, regcache);
++    }
++  else
++    return elfcore_write_prfpreg (abfd, buf, bufsiz, fpregs, size);
++}
++
++
+ /* Transfering the general-purpose registers between GDB, inferiors
+    and core files.  */
+ 
+@@ -431,6 +553,11 @@ _initialize_amd64_linux_nat (void)
+   t->to_fetch_registers = amd64_linux_fetch_inferior_registers;
+   t->to_store_registers = amd64_linux_store_inferior_registers;
+ 
++  /* This functions make elfcore note sections. */
++  linux_elfcore_write_prpsinfo = amd64_linux_elfcore_write_prpsinfo;
++  linux_elfcore_write_prstatus = amd64_linux_elfcore_write_prstatus;
++  linux_elfcore_write_prfpreg = amd64_linux_elfcore_write_prfpreg;
++
+   /* Register the target.  */
+   linux_nat_add_target (t);
+   linux_nat_set_new_thread (t, amd64_linux_new_thread);
+Index: gdb-6.8.50.20081214/gdb/config.in
+===================================================================
+--- gdb-6.8.50.20081214.orig/gdb/config.in	2008-12-14 21:17:01.000000000 +0100
++++ gdb-6.8.50.20081214/gdb/config.in	2008-12-14 21:34:50.000000000 +0100
+@@ -136,6 +136,9 @@
+ /* Define to 1 if you have the <elf_hp.h> header file. */
+ #undef HAVE_ELF_HP_H
+ 
++/* Define if struct elf_prstatus32 is available. */
++#undef HAVE_ELF_PRSTATUS32
++
+ /* Define to 1 if your system has the etext variable. */
+ #undef HAVE_ETEXT
+ 
+@@ -465,6 +468,9 @@
+ /* Define to 1 if you have the <sys/poll.h> header file. */
+ #undef HAVE_SYS_POLL_H
+ 
++/* Define to 1 if you have the <sys/procfs32.h> header file. */
++#undef HAVE_SYS_PROCFS32_H
++
+ /* Define to 1 if you have the <sys/procfs.h> header file. */
+ #undef HAVE_SYS_PROCFS_H
+ 
+@@ -492,6 +498,9 @@
+ /* Define to 1 if you have the <sys/types.h> header file. */
+ #undef HAVE_SYS_TYPES_H
+ 
++/* Define to 1 if you have the <sys/user32.h> header file. */
++#undef HAVE_SYS_USER32_H
++
+ /* Define to 1 if you have the <sys/user.h> header file. */
+ #undef HAVE_SYS_USER_H
+ 
+Index: gdb-6.8.50.20081214/gdb/configure
+===================================================================
+--- gdb-6.8.50.20081214.orig/gdb/configure	2008-12-14 21:17:01.000000000 +0100
++++ gdb-6.8.50.20081214/gdb/configure	2008-12-14 21:33:30.000000000 +0100
+@@ -12026,6 +12026,268 @@ _ACEOF
+ 
+ fi
+ 
++
++
++for ac_header in sys/user32.h sys/procfs32.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists.  ##
++## ------------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++echo "$as_me:$LINENO: checking for struct elf_prstatus32.pr_reg" >&5
++echo $ECHO_N "checking for struct elf_prstatus32.pr_reg... $ECHO_C" >&6
++if test "${ac_cv_member_struct_elf_prstatus32_pr_reg+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/procfs.h>
++
++int
++main ()
++{
++static struct elf_prstatus32 ac_aggr;
++if (ac_aggr.pr_reg)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_member_struct_elf_prstatus32_pr_reg=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/procfs.h>
++
++int
++main ()
++{
++static struct elf_prstatus32 ac_aggr;
++if (sizeof ac_aggr.pr_reg)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_member_struct_elf_prstatus32_pr_reg=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_member_struct_elf_prstatus32_pr_reg=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_member_struct_elf_prstatus32_pr_reg" >&5
++echo "${ECHO_T}$ac_cv_member_struct_elf_prstatus32_pr_reg" >&6
++if test $ac_cv_member_struct_elf_prstatus32_pr_reg = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_ELF_PRSTATUS32 1
++_ACEOF
++
++fi
++
+ # elf_hp.h is for HP/UX 64-bit shared library support.
+ # FIXME: kettenis/20030102: In most cases we include these (ctype.h, time.h)
+ # unconditionally, so what's the point in checking these?
+Index: gdb-6.8.50.20081214/gdb/configure.ac
+===================================================================
+--- gdb-6.8.50.20081214.orig/gdb/configure.ac	2008-12-14 21:17:01.000000000 +0100
++++ gdb-6.8.50.20081214/gdb/configure.ac	2008-12-14 21:32:35.000000000 +0100
+@@ -686,6 +686,11 @@ AC_SUBST(PYTHON_CFLAGS)
+ AC_HEADER_DIRENT
+ AC_HEADER_STAT
+ AC_HEADER_STDC
++AC_CHECK_HEADERS([sys/user32.h sys/procfs32.h])
++AC_CHECK_MEMBER([struct elf_prstatus32.pr_reg],
++		[AC_DEFINE(HAVE_ELF_PRSTATUS32, 1,
++			   [Define if struct elf_prstatus32 is available. ])],
++		[], [#include <sys/procfs.h>])
+ # elf_hp.h is for HP/UX 64-bit shared library support.
+ # FIXME: kettenis/20030102: In most cases we include these (ctype.h, time.h)
+ # unconditionally, so what's the point in checking these?
+Index: gdb-6.8.50.20081214/gdb/gcore.c
+===================================================================
+--- gdb-6.8.50.20081214.orig/gdb/gcore.c	2008-12-14 21:17:01.000000000 +0100
++++ gdb-6.8.50.20081214/gdb/gcore.c	2008-12-14 21:17:10.000000000 +0100
+@@ -320,6 +320,11 @@ gcore_create_callback (CORE_ADDR vaddr, 
+   asection *osec;
+   flagword flags = SEC_ALLOC | SEC_HAS_CONTENTS | SEC_LOAD;
+ 
++  /* Some Linux kernel versions around 2.6.17 have for i386 inferiors running
++     in compatibility mode on amd64 kernel their VSYSCALL page (at 0xffffe000)
++     protected as RWX==000 by default and gdb fails to read the library header
++     upon loading the core.  This is a Linux kernel bug being fixed.  */
++
+   /* If the memory segment has no permissions set, ignore it, otherwise
+      when we later try to access it for read/write, we'll get an error
+      or jam the kernel.  */
+Index: gdb-6.8.50.20081214/gdb/gdb_procfs32.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081214/gdb/gdb_procfs32.h	2008-12-14 21:32:56.000000000 +0100
+@@ -0,0 +1,128 @@
++#ifdef HAVE_SYS_PROCFS32_H
++#include <sys/procfs32.h>
++#elif !defined HAVE_ELF_PRSTATUS32
++
++/* Copyright (C) 2006 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#ifndef _SYS_PROCFS32_H
++#define _SYS_PROCFS32_H	1
++
++/* This is somewhat modelled after the file of the same name on SVR4
++   systems.  It provides a definition of the core file format for ELF
++   used on Linux.  It doesn't have anything to do with the /proc file
++   system, even though Linux has one.
++
++   Anyway, the whole purpose of this file is for GDB and GDB only.
++   Don't read too much into it.  Don't use it for anything other than
++   GDB unless you know what you are doing.  */
++
++#include <features.h>
++#include <sys/time.h>
++#include <sys/types.h>
++#include "gdb_user32.h"
++
++/* We define here only the symbols differing from their 64-bit variant.  */
++#include <sys/procfs.h>
++
++__BEGIN_DECLS
++
++/* Type for a general-purpose register.  */
++typedef unsigned int elf_greg32_t;
++
++/* And the whole bunch of them.  We could have used `struct
++   user_regs_struct' directly in the typedef, but tradition says that
++   the register set is an array, which does have some peculiar
++   semantics, so leave it that way.  */
++#define ELF_NGREG32 (sizeof (struct user_regs32_struct) / sizeof(elf_greg32_t))
++typedef elf_greg32_t elf_gregset32_t[ELF_NGREG32];
++
++/* Register set for the floating-point registers.  */
++typedef struct user_fpregs32_struct elf_fpregset32_t;
++
++/* Register set for the extended floating-point registers.  Includes
++   the Pentium III SSE registers in addition to the classic
++   floating-point stuff.  */
++typedef struct user_fpxregs32_struct elf_fpxregset32_t;
++
++
++/* Definitions to generate Intel SVR4-like core files.  These mostly
++   have the same names as the SVR4 types with "elf_" tacked on the
++   front to prevent clashes with Linux definitions, and the typedef
++   forms have been avoided.  This is mostly like the SVR4 structure,
++   but more Linuxy, with things that Linux does not support and which
++   GDB doesn't really use excluded.  */
++
++struct prstatus32_timeval
++  {
++    int tv_sec;
++    int tv_usec;
++  };
++
++struct elf_prstatus32
++  {
++    struct elf_siginfo pr_info;		/* Info associated with signal.  */
++    short int pr_cursig;		/* Current signal.  */
++    unsigned int pr_sigpend;		/* Set of pending signals.  */
++    unsigned int pr_sighold;		/* Set of held signals.  */
++    __pid_t pr_pid;
++    __pid_t pr_ppid;
++    __pid_t pr_pgrp;
++    __pid_t pr_sid;
++    struct prstatus32_timeval pr_utime;		/* User time.  */
++    struct prstatus32_timeval pr_stime;		/* System time.  */
++    struct prstatus32_timeval pr_cutime;	/* Cumulative user time.  */
++    struct prstatus32_timeval pr_cstime;	/* Cumulative system time.  */
++    elf_gregset32_t pr_reg;		/* GP registers.  */
++    int pr_fpvalid;			/* True if math copro being used.  */
++  };
++
++
++struct elf_prpsinfo32
++  {
++    char pr_state;			/* Numeric process state.  */
++    char pr_sname;			/* Char for pr_state.  */
++    char pr_zomb;			/* Zombie.  */
++    char pr_nice;			/* Nice val.  */
++    unsigned int pr_flag;		/* Flags.  */
++    unsigned short int pr_uid;
++    unsigned short int pr_gid;
++    int pr_pid, pr_ppid, pr_pgrp, pr_sid;
++    /* Lots missing */
++    char pr_fname[16];			/* Filename of executable.  */
++    char pr_psargs[ELF_PRARGSZ];	/* Initial part of arg list.  */
++  };
++
++
++/* The rest of this file provides the types for emulation of the
++   Solaris <proc_service.h> interfaces that should be implemented by
++   users of libthread_db.  */
++
++/* Register sets.  Linux has different names.  */
++typedef elf_gregset_t prgregset32_t;
++typedef elf_fpregset_t prfpregset32_t;
++
++/* Process status and info.  In the end we do provide typedefs for them.  */
++typedef struct elf_prstatus32 prstatus32_t;
++typedef struct elf_prpsinfo32 prpsinfo32_t;
++
++__END_DECLS
++
++#endif	/* _SYS_PROCFS32_H */
++
++#endif /* HAVE_SYS_PROCFS32_H */
+Index: gdb-6.8.50.20081214/gdb/gdb_user32.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20081214/gdb/gdb_user32.h	2008-12-14 21:17:10.000000000 +0100
+@@ -0,0 +1,108 @@
++#ifdef HAVE_SYS_USER32_H
++#include <sys/user32.h>
++#else
++
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++typedef  int32_t  gdb_int32_t;
++typedef uint32_t gdb_uint32_t;
++#else
++typedef   signed int gdb_uint32_t;
++typedef unsigned int gdb_uint32_t;
++#endif
++
++/* Copyright (C) 2006 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#ifndef _SYS_USER32_H
++#define _SYS_USER32_H	1
++
++/* These are the 32-bit x86 structures.  */
++
++struct user_fpregs32_struct
++{
++  int32_t cwd;
++  int32_t swd;
++  int32_t twd;
++  int32_t fip;
++  int32_t fcs;
++  int32_t foo;
++  int32_t fos;
++  int32_t st_space [20];
++};
++
++struct user_fpxregs32_struct
++{
++  unsigned short int cwd;
++  unsigned short int swd;
++  unsigned short int twd;
++  unsigned short int fop;
++  int32_t fip;
++  int32_t fcs;
++  int32_t foo;
++  int32_t fos;
++  int32_t mxcsr;
++  int32_t reserved;
++  int32_t st_space[32];   /* 8*16 bytes for each FP-reg = 128 bytes */
++  int32_t xmm_space[32];  /* 8*16 bytes for each XMM-reg = 128 bytes */
++  int32_t padding[56];
++};
++
++struct user_regs32_struct
++{
++  int32_t ebx;
++  int32_t ecx;
++  int32_t edx;
++  int32_t esi;
++  int32_t edi;
++  int32_t ebp;
++  int32_t eax;
++  int32_t xds;
++  int32_t xes;
++  int32_t xfs;
++  int32_t xgs;
++  int32_t orig_eax;
++  int32_t eip;
++  int32_t xcs;
++  int32_t eflags;
++  int32_t esp;
++  int32_t xss;
++};
++
++struct user32
++{
++  struct user_regs32_struct	regs;
++  int				u_fpvalid;
++  struct user_fpregs32_struct	i387;
++  uint32_t			u_tsize;
++  uint32_t			u_dsize;
++  uint32_t			u_ssize;
++  uint32_t			start_code;
++  uint32_t			start_stack;
++  int32_t			signal;
++  int				reserved;
++  struct user_regs32_struct*	u_ar0;
++  struct user_fpregs32_struct*	u_fpstate;
++  uint32_t			magic;
++  char				u_comm [32];
++  int				u_debugreg [8];
++};
++
++#endif	/* _SYS_USER32_H */
++
++#endif /* HAVE_SYS_USER32_H */
+Index: gdb-6.8.50.20081214/gdb/linux-nat.c
+===================================================================
+--- gdb-6.8.50.20081214.orig/gdb/linux-nat.c	2008-12-14 21:17:01.000000000 +0100
++++ gdb-6.8.50.20081214/gdb/linux-nat.c	2008-12-14 21:24:20.000000000 +0100
+@@ -213,6 +213,21 @@ static LONGEST (*super_xfer_partial) (st
+ 				      const gdb_byte *,
+ 				      ULONGEST, LONGEST);
+ 
++/* This functions make elfcore note sections.
++   They may get overriden by code adjusting data for multi-target builds.  */
++char *(*linux_elfcore_write_prpsinfo)
++  (bfd *, char *, int *, const char *, const char *) = elfcore_write_prpsinfo;
++char *(*linux_elfcore_write_prstatus)
++  (bfd *, char *, int *, long, int, const void *) = elfcore_write_prstatus;
++static char *
++linux_elfcore_write_prfpreg_bfd (bfd *abfd, char *buf, int *bufsiz,
++				 const void *fpregs, int size, struct regcache *regcache)
++{
++  return elfcore_write_prfpreg (abfd, buf, bufsiz, fpregs, size);
++}
++char *(*linux_elfcore_write_prfpreg) (bfd *, char *, int *, const void *, int,
++			   struct regcache *) = linux_elfcore_write_prfpreg_bfd;
++
+ static int debug_linux_nat;
+ static void
+ show_debug_linux_nat (struct ui_file *file, int from_tty,
+@@ -3473,7 +3488,7 @@ linux_nat_do_thread_registers (bfd *obfd
+   else
+     fill_gregset (regcache, &gregs, -1);
+ 
+-  note_data = (char *) elfcore_write_prstatus (obfd,
++  note_data = (char *) linux_elfcore_write_prstatus (obfd,
+ 					       note_data,
+ 					       note_size,
+ 					       lwp,
+@@ -3523,10 +3538,10 @@ linux_nat_do_thread_registers (bfd *obfd
+       else
+ 	fill_fpregset (regcache, &fpregs, -1);
+ 
+-      note_data = (char *) elfcore_write_prfpreg (obfd,
++      note_data = (char *) linux_elfcore_write_prfpreg (obfd,
+ 						  note_data,
+ 						  note_size,
+-						  &fpregs, sizeof (fpregs));
++						  &fpregs, sizeof (fpregs), regcache);
+     }
+ 
+   return note_data;
+@@ -3595,9 +3610,9 @@ linux_nat_make_corefile_notes (bfd *obfd
+ 		       psargs_end - string_end);
+ 	    }
+ 	}
+-      note_data = (char *) elfcore_write_prpsinfo (obfd,
+-						   note_data,
+-						   note_size, fname, psargs);
++      note_data = (char *) linux_elfcore_write_prpsinfo (obfd, note_data,
++							 note_size, fname,
++							 psargs);
+     }
+ 
+   /* Dump information for threads.  */
+Index: gdb-6.8.50.20081214/gdb/linux-nat.h
+===================================================================
+--- gdb-6.8.50.20081214.orig/gdb/linux-nat.h	2008-12-14 21:17:01.000000000 +0100
++++ gdb-6.8.50.20081214/gdb/linux-nat.h	2008-12-14 21:24:11.000000000 +0100
+@@ -134,3 +134,12 @@ void linux_nat_switch_fork (ptid_t new_p
+ 
+ /* Return the saved siginfo associated with PTID.  */
+ struct siginfo *linux_nat_get_siginfo (ptid_t ptid);
++
++/* These functions make elfcore note sections.
++   They may get overriden by code adjusting data for multi-target builds.  */
++extern char *(*linux_elfcore_write_prpsinfo)
++  (bfd *, char *, int *, const char *, const char *);
++extern char *(*linux_elfcore_write_prstatus)
++  (bfd *, char *, int *, long, int, const void *);
++extern char *(*linux_elfcore_write_prfpreg)
++  (bfd *, char *, int *, const void *, int, struct regcache *);

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,11 +31,10 @@ 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
-@@ -0,0 +1,83 @@
+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,90 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -61,10 +51,17 @@ new file mode 100644
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 +
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
 +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,62 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.5-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,51 @@
++# Copyright 2007 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++# 
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++# 
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
++
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
++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 +88,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-readline-long-line-crash.patch

@@ -0,0 +1,165 @@
+Fix Valgrind paste of >= 256 * (screen width) characters (as 130001).
+
+Invalid write of size 4
+   at 0x8203BD9: rl_redisplay (display.c:812)
+   by 0x81F5130: _rl_internal_char_cleanup (readline.c:427)
+   by 0x81F52B3: readline_internal_char (readline.c:508)
+   by 0x8209817: rl_callback_read_char (callback.c:184)
+   by 0x8135312: rl_callback_read_char_wrapper (event-top.c:179)
+   by 0x8135B7B: stdin_event_handler (event-top.c:432)
+   by 0x81349F2: handle_file_event (event-loop.c:730)
+   by 0x81342AB: process_event (event-loop.c:343)
+   by 0x81342F4: gdb_do_one_event (event-loop.c:380)
+   by 0x81313AC: catch_errors (exceptions.c:515)
+   by 0x80CE8CA: tui_command_loop (tui-interp.c:151)
+   by 0x81318B9: current_interp_command_loop (interps.c:278)
+ Address 0x43DCEB8 is 0 bytes after a block of size 1,024 alloc'd
+   at 0x4005400: malloc (vg_replace_malloc.c:149)
+   by 0x8087084: xmalloc (utils.c:959)
+   by 0x8202CA7: init_line_structures (display.c:440)
+   by 0x8202D14: rl_redisplay (display.c:471)
+   by 0x81F4F53: readline_internal_setup (readline.c:363)
+   by 0x820958C: _rl_callback_newline (callback.c:89)
+   by 0x82095BB: rl_callback_handler_install (callback.c:101)
+   by 0x80CE896: tui_command_loop (tui-interp.c:138)
+   by 0x81318B9: current_interp_command_loop (interps.c:278)
+   by 0x807E69A: captured_command_loop (main.c:101)
+   by 0x81313AC: catch_errors (exceptions.c:515)
+   by 0x807F55A: captured_main (main.c:826)
+
+
+2006-11-08  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* readline/display.c (line_state, line_state_array, line_state_visible,
+	line_state_invisible): Encapsulate _rl_wrapped_line, inv_lbreaks,
+	inv_lbsize, vis_lbreaks, vis_lbsize, visible_line, invisible_line.
+	(init_line_structures): Initialize both _rl_wrapped_line ones now.
+	(rl_redisplay): Fix _rl_wrapped_line handling by using its own size.
+	Swap whole `line_state_visible' / `line_state_invisible' structures.
+	(update_line): Update for new `_rl_wrapped_line'.
+
+
+Index: ./readline/display.c
+===================================================================
+--- ./readline/display.c	5 May 2006 18:26:12 -0000	1.11
++++ ./readline/display.c	8 Nov 2006 18:23:33 -0000
+@@ -73,15 +73,31 @@ static void delete_chars PARAMS((int));
+ static void insert_some_chars PARAMS((char *, int, int));
+ static void cr PARAMS((void));
+ 
++struct line_state
++  {
++    char *line;
++    int *lbreaks;
++    int lbreaks_size;
++#if defined (HANDLE_MULTIBYTE)
++    int *wrapped_line;
++    int wrapped_line_size;
++#endif
++  };
++static struct line_state line_state_array[2];
++static struct line_state *line_state_visible = &line_state_array[0];
++static struct line_state *line_state_invisible = &line_state_array[1];
++
+ #if defined (HANDLE_MULTIBYTE)
+ static int _rl_col_width PARAMS((const char *, int, int));
+-static int *_rl_wrapped_line;
+ #else
+ #  define _rl_col_width(l, s, e)	(((e) <= (s)) ? 0 : (e) - (s))
+ #endif
+ 
+-static int *inv_lbreaks, *vis_lbreaks;
+-static int inv_lbsize, vis_lbsize;
++/* FIXME: Backward compatible naming. */
++#define inv_lbreaks (line_state_invisible->lbreaks)
++#define inv_lbsize (line_state_invisible->lbreaks_size)
++#define vis_lbreaks (line_state_visible->lbreaks)
++#define vis_lbsize (line_state_visible->lbreaks_size)
+ 
+ /* Heuristic used to decide whether it is faster to move from CUR to NEW
+    by backing up or outputting a carriage return and moving forward. */
+@@ -150,8 +166,9 @@ static int last_lmargin;
+ 
+ /* The line display buffers.  One is the line currently displayed on
+    the screen.  The other is the line about to be displayed. */
+-static char *visible_line = (char *)NULL;
+-static char *invisible_line = (char *)NULL;
++/* FIXME: Backward compatible naming. */
++#define visible_line (line_state_visible->line)
++#define invisible_line (line_state_invisible->line)
+ 
+ /* A buffer for `modeline' messages. */
+ static char msg_buf[128];
+@@ -437,7 +454,10 @@ init_line_structures (minsize)
+       inv_lbreaks = (int *)xmalloc (inv_lbsize * sizeof (int));
+       vis_lbreaks = (int *)xmalloc (vis_lbsize * sizeof (int));
+ #if defined (HANDLE_MULTIBYTE)
+-      _rl_wrapped_line = (int *)xmalloc (vis_lbsize * sizeof (int));
++      line_state_visible->wrapped_line_size = vis_lbsize;
++      line_state_visible->wrapped_line = (int *)xmalloc (line_state_visible->wrapped_line_size * sizeof (int));
++      line_state_invisible->wrapped_line_size = inv_lbsize;
++      line_state_invisible->wrapped_line = (int *)xmalloc (line_state_invisible->wrapped_line_size * sizeof (int));
+ #endif
+       inv_lbreaks[0] = vis_lbreaks[0] = 0;
+     }
+@@ -572,10 +592,15 @@ rl_redisplay ()
+ 	      { \
+ 		inv_lbsize *= 2; \
+ 		inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+-		_rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
+ 	      } \
+ 	    inv_lbreaks[++newlines] = out; \
+-	    _rl_wrapped_line[newlines] = _rl_wrapped_multicolumn; \
++	    if (newlines >= (line_state_invisible->wrapped_line_size - 1)) \
++	      { \
++		line_state_invisible->wrapped_line_size *= 2; \
++		line_state_invisible->wrapped_line = (int *)xrealloc (line_state_invisible->wrapped_line, \
++		  line_state_invisible->wrapped_line_size * sizeof (int)); \
++	      } \
++	    line_state_invisible->wrapped_line[newlines] = _rl_wrapped_multicolumn; \
+ 	    lpos = 0; \
+ 	  } \
+       } while (0)
+@@ -605,7 +630,7 @@ rl_redisplay ()
+ #endif
+ 
+ #if defined (HANDLE_MULTIBYTE)
+-  memset (_rl_wrapped_line, 0, vis_lbsize);
++  memset (line_state_invisible->wrapped_line, 0, line_state_invisible->wrapped_line_size * sizeof (int));
+   num = 0;
+ #endif
+ 
+@@ -1118,17 +1143,10 @@ rl_redisplay ()
+ 
+   /* Swap visible and non-visible lines. */
+   {
+-    char *vtemp = visible_line;
+-    int *itemp = vis_lbreaks, ntemp = vis_lbsize;
+-
+-    visible_line = invisible_line;
+-    invisible_line = vtemp;
+-
+-    vis_lbreaks = inv_lbreaks;
+-    inv_lbreaks = itemp;
+-
+-    vis_lbsize = inv_lbsize;
+-    inv_lbsize = ntemp;
++    struct line_state *line_state_temp = line_state_visible;
++    
++    line_state_visible = line_state_invisible;
++    line_state_invisible = line_state_temp;
+ 
+     rl_display_fixed = 0;
+     /* If we are displaying on a single line, and last_lmargin is > 0, we
+@@ -1194,8 +1212,9 @@ update_line (old, new, current_line, oma
+ 	  /* This fixes only double-column characters, but if the wrapped
+ 	     character comsumes more than three columns, spaces will be
+ 	     inserted in the string buffer. */
+-	  if (_rl_wrapped_line[current_line] > 0)
+-	    _rl_clear_to_eol (_rl_wrapped_line[current_line]);
++	  if (current_line < line_state_visible->wrapped_line_size
++	      && line_state_visible->wrapped_line[current_line] > 0)
++	    _rl_clear_to_eol (line_state_visible->wrapped_line[current_line]);
+ 
+ 	  memset (&ps, 0, sizeof (mbstate_t));
+ 	  ret = mbrtowc (&wc, new, MB_CUR_MAX, &ps);

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.5-tls-of-separate-debuginfo.patch

@@ -0,0 +1,24 @@
+Dependency on: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
+
+
+2006-09-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* target.c (target_translate_tls_address): Fix for separate debuginfo.
+
+
+diff -rup gdb-6.5.orig/gdb/target.c gdb-6.5/gdb/target.c
+--- gdb-6.5.orig/gdb/target.c	2006-09-20 17:13:35.000000000 -0400
++++ gdb-6.5/gdb/target.c	2006-09-20 17:15:53.000000000 -0400
+@@ -769,6 +769,12 @@ target_translate_tls_address (struct obj
+       ptid_t ptid = inferior_ptid;
+       volatile struct gdb_exception ex;
+ 
++      /* Resolve: Cannot find shared library
++	 `/usr/lib/debug/lib/lib....so.debug' in dynamic linker's load
++	 module list  */
++      if (objfile->separate_debug_objfile_backlink != NULL)
++	objfile = objfile->separate_debug_objfile_backlink;
++
+       TRY_CATCH (ex, RETURN_MASK_ALL)
+ 	{
+ 	  CORE_ADDR lm_addr;

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

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

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

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-solib-missing-ids.patch

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

gdb-6.6-bz225783-gdb-debuginfo-paths.patch

@@ -0,0 +1,33 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=225783
+
+
+Index: gdb-6.8.50.20081128/gdb/Makefile.in
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/Makefile.in	2008-12-02 23:06:16.000000000 +0100
++++ gdb-6.8.50.20081128/gdb/Makefile.in	2008-12-02 23:28:02.000000000 +0100
+@@ -1490,8 +1490,10 @@ po/$(PACKAGE).pot: force
+ 
+ .SUFFIXES: .y .l
+ .y.c:
+-	$(SHELL) $(YLWRAP) $< y.tab.c $@.tmp -- $(YACC) $(YFLAGS)
+-	-sed -e '/extern.*malloc/d' \
++	rm -f $@ $@.tmp
++	$(SHELL) $(YLWRAP) $< y.tab.c $@ -- $(YACC) $(YFLAGS) && mv $@ $@.tmp \
++		|| (rm -f $@; false)
++	sed -e '/extern.*malloc/d' \
+ 	     -e '/extern.*realloc/d' \
+ 	     -e '/extern.*free/d' \
+ 	     -e '/include.*malloc.h/d' \
+@@ -1500,9 +1502,9 @@ po/$(PACKAGE).pot: force
+ 	     -e 's/\([ \t;,(]\)free\([ \t]*[&(),]\)/\1xfree\2/g' \
+ 	     -e 's/\([ \t;,(]\)free$$/\1xfree/g' \
+ 	     -e '/^#line.*y.tab.c/d' \
+-	  < $@.tmp > $@.new
+-	-rm $@.tmp
+-	mv $@.new ./$*.c
++	     -e "s/^\(#line.*\)`basename $<`/\1`echo $<|sed 's/\//\\\\\//g'`/" \
++	  < $@.tmp > $@
++	rm -f $@.tmp
+ .l.c:
+ 	if [ "$(FLEX)" ] && $(FLEX) --version >/dev/null 2>&1; then \
+ 	    $(FLEX) -o$@ $< && \

gdb-6.6-bz225783-prelink-path.patch

@@ -0,0 +1,27 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=225783
+
+--- gdb-6.8/gdb/testsuite/gdb.base/prelink.exp.orig	2008-07-12 08:56:43.000000000 +0200
++++ gdb-6.8/gdb/testsuite/gdb.base/prelink.exp	2008-07-12 08:59:59.000000000 +0200
+@@ -55,7 +55,7 @@ if { [gdb_compile "${srcdir}/${subdir}/$
+ # single new unprelinked library address without wasting the first one/two
+ # memory areas.  We do not care of the efficiency of loading such resulting
+ # exec-shield unfriendly prelinked library.
+-if {[catch "system \"prelink -qNR --no-exec-shield ${libfile}\""] != 0} {
++if {[catch "system \"/usr/sbin/prelink -qNR --no-exec-shield ${libfile}\""] != 0} {
+     # Maybe we don't have prelink.
+     return -1
+ }
+@@ -96,11 +96,11 @@ if { $found == 0  } {
+     return 0
+ }
+ 
+-if {[catch "system \"prelink -uN ${libfile}\""] != 0} {
++if {[catch "system \"/usr/sbin/prelink -uN ${libfile}\""] != 0} {
+     untested "${testfile}.so was not prelinked, maybe system libraries are not prelinked?"
+     return 0
+ }
+-catch "system \"prelink -qNR --no-exec-shield ${libfile}\""
++catch "system \"/usr/sbin/prelink -qNR --no-exec-shield ${libfile}\""
+ 
+ # Start with a fresh gdb
+ 

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,34 @@ 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 @@
+
+--- gdb-6.6-orig/gdb/gdb_gcore.sh	2005-12-17 17:33:59.000000000 -0500
++++ gdb-6.6/gdb/gdb_gcore.sh	2007-04-22 05:42:50.000000000 -0400
+@@ -71,7 +71,9 @@
+ quit
+ EOF
+ 
+-	gdb -x $tmpfile -batch
++	# `</dev/null' to avoid touching interactive terminal if it is
++	# available but not accessible (SIGTTIN risk)
++	gdb -x $tmpfile -batch </dev/null
+ 
+ 	if [ -r $name.$pid ] ; then 
+ 	    rc=0
+--- /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 +50,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,17 +61,14 @@ 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
-@@ -0,0 +1,113 @@
+--- /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,120 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -97,15 +93,22 @@ new file mode 100644
 +# It also tests a regression with `gdb_gcore.sh' being run without its
 +# accessible terminal.
 +
++if $tracelevel then {
++	strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
 +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 +157,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,128 @@
+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-6.7.50.20080227/gdb/linux-nat.c
+===================================================================
+--- gdb-6.7.50.20080227.orig/gdb/linux-nat.c	2008-03-01 10:30:48.000000000 +0100
++++ gdb-6.7.50.20080227/gdb/linux-nat.c	2008-03-01 10:48:25.000000000 +0100
+@@ -415,7 +415,7 @@ linux_child_follow_fork (struct target_o
+       /* Detach new forked process?  */
+       if (detach_fork)
+ 	{
+-	  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-6.7.50.20080227/gdb/testsuite/gdb.base/fork-detach.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.base/fork-detach.c	2008-03-01 10:30:49.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-6.7.50.20080227/gdb/testsuite/gdb.base/fork-detach.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.base/fork-detach.exp	2008-03-01 10:49:36.000000000 +0100
+@@ -0,0 +1,43 @@
++# Copyright 2007 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++# 
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++# 
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
++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.*Program 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-bz247354-leader-exit-fix.patch

@@ -0,0 +1,142 @@
+2007-07-08  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* linux-nat.c (linux_lwp_is_zombie): New function.
+	(wait_lwp): Fix lockup on exit of the thread group leader.
+	(linux_xfer_partial): Renamed to ...
+	(linux_xfer_partial_lwp): ... here.
+	(linux_xfer_partial): New function wrapping LINUX_XFER_PARTIAL_LWP.
+
+2008-02-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.8pre.
+
+Index: gdb-6.8.50.20081209/gdb/linux-nat.c
+===================================================================
+--- gdb-6.8.50.20081209.orig/gdb/linux-nat.c	2008-12-10 01:27:34.000000000 +0100
++++ gdb-6.8.50.20081209/gdb/linux-nat.c	2008-12-10 01:28:14.000000000 +0100
+@@ -1981,6 +1981,31 @@ linux_handle_extended_wait (struct lwp_i
+ 		  _("unknown ptrace event %d"), event);
+ }
+ 
++static int
++linux_lwp_is_zombie (long lwp)
++{
++  char buffer[MAXPATHLEN];
++  FILE *procfile;
++  int retval = 0;
++
++  sprintf (buffer, "/proc/%ld/status", lwp);
++  procfile = fopen (buffer, "r");
++  if (procfile == NULL)
++    {
++      warning (_("unable to open /proc file '%s'"), buffer);
++      return 0;
++    }
++  while (fgets (buffer, sizeof (buffer), procfile) != NULL)
++    if (strcmp (buffer, "State:\tZ (zombie)\n") == 0)
++      {
++	retval = 1;
++	break;
++      }
++  fclose (procfile);
++
++  return retval;
++}
++
+ /* Wait for LP to stop.  Returns the wait status, or 0 if the LWP has
+    exited.  */
+ 
+@@ -1988,16 +2013,31 @@ static int
+ wait_lwp (struct lwp_info *lp)
+ {
+   pid_t pid;
+-  int status;
++  int status = 0;
+   int thread_dead = 0;
+ 
+   gdb_assert (!lp->stopped);
+   gdb_assert (lp->status == 0);
+ 
+-  pid = my_waitpid (GET_LWP (lp->ptid), &status, 0);
+-  if (pid == -1 && errno == ECHILD)
++  /* Thread group leader may have exited but we would lock up by WAITPID as it
++     waits on all its threads; __WCLONE is not applicable for the leader.
++     The thread leader restrictions is only a performance optimization here.
++     LINUX_NAT_THREAD_ALIVE cannot be used here as it requires a STOPPED
++     process; it gets ESRCH both for the zombie and for running processes.  */
++  if (is_lwp (lp->ptid) && GET_PID (lp->ptid) == GET_LWP (lp->ptid)
++      && linux_lwp_is_zombie (GET_LWP (lp->ptid)))
++    {
++      thread_dead = 1;
++      if (debug_linux_nat)
++	fprintf_unfiltered (gdb_stdlog, "WL: Threads leader %s vanished.\n",
++			    target_pid_to_str (lp->ptid));
++    }
++
++  if (!thread_dead)
+     {
+-      pid = my_waitpid (GET_LWP (lp->ptid), &status, __WCLONE);
++      pid = my_waitpid (GET_LWP (lp->ptid), &status, 0);
++      if (pid == -1 && errno == ECHILD)
++	pid = my_waitpid (GET_LWP (lp->ptid), &status, __WCLONE);
+       if (pid == -1 && errno == ECHILD)
+ 	{
+ 	  /* The thread has previously exited.  We need to delete it
+@@ -4153,8 +4193,10 @@ linux_nat_xfer_osdata (struct target_ops
+   return len;
+ }
+ 
++/* Transfer from the specific LWP currently set by PID of INFERIOR_PTID.  */
++
+ static LONGEST
+-linux_xfer_partial (struct target_ops *ops, enum target_object object,
++linux_xfer_partial_lwp (struct target_ops *ops, enum target_object object,
+                     const char *annex, gdb_byte *readbuf,
+ 		    const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+ {
+@@ -4201,6 +4243,45 @@ linux_xfer_partial (struct target_ops *o
+ 			     offset, len);
+ }
+ 
++/* nptl_db expects being able to transfer memory just by specifying PID.
++   After the thread group leader exists the Linux kernel turns the task
++   into zombie no longer permitting accesses to its memory.
++   Transfer the memory from an arbitrary LWP_LIST entry in such case.  */
++
++static LONGEST
++linux_xfer_partial (struct target_ops *ops, enum target_object object,
++                    const char *annex, gdb_byte *readbuf,
++		    const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
++{
++  LONGEST xfer;
++  struct lwp_info *lp;
++  /* Not using SAVE_INFERIOR_PTID already here for better performance.  */
++  struct cleanup *old_chain = NULL;
++  ptid_t inferior_ptid_orig = inferior_ptid;
++
++  errno = 0;
++  xfer = linux_xfer_partial_lwp (ops, object, annex, readbuf, writebuf,
++				 offset, len);
++
++  for (lp = lwp_list; xfer == 0 && (errno == EACCES || errno == ESRCH)
++		      && lp != NULL; lp = lp->next)
++    {
++      if (!is_lwp (lp->ptid) || ptid_equal (lp->ptid, inferior_ptid_orig))
++        continue;
++      
++      if (old_chain == NULL)
++	old_chain = save_inferior_ptid ();
++      inferior_ptid = BUILD_LWP (GET_LWP (lp->ptid), GET_LWP (lp->ptid));
++      errno = 0;
++      xfer = linux_xfer_partial_lwp (ops, object, annex, readbuf, writebuf,
++				     offset, len);
++    }
++
++  if (old_chain != NULL)
++    do_cleanups (old_chain);
++  return xfer;
++}
++
+ /* Create a prototype generic GNU/Linux target.  The client can override
+    it with local methods.  */
+ 

gdb-6.6-bz247354-leader-exit-test.patch

@@ -0,0 +1,121 @@
+2007-07-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.threads/leader-exit.c, gdb.threads/leader-exit.exp: New files.
+
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/leader-exit.c	7 Jul 2007 15:21:57 -0000
+@@ -0,0 +1,47 @@
++/* Clean exit of the thread group leader should not break GDB.
++
++   Copyright 2007 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.  */
++
++#include <pthread.h>
++#include <assert.h>
++#include <unistd.h>
++
++static void *start (void *arg)
++{
++  for (;;)
++    pause ();
++  /* NOTREACHED */
++  assert (0);
++  return arg;
++}
++
++int main (void)
++{
++  pthread_t thread;
++  int i;
++
++  i = pthread_create (&thread, NULL, start, NULL);	/* create1 */
++  assert (i == 0);
++
++  pthread_exit (NULL);
++  /* NOTREACHED */
++  assert (0);
++  return 0;
++}
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/leader-exit.exp	7 Jul 2007 15:21:57 -0000
+@@ -0,0 +1,64 @@
++# Copyright (C) 2007 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++# 
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++# 
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
++
++# Exit of the thread group leader should not break GDB.
++
++# This file was written by Jan Kratochvil <jan.kratochvil@redhat.com>.
++
++if $tracelevel then {
++	strace $tracelevel
++}
++
++set testfile "leader-exit"
++set srcfile ${testfile}.c
++set binfile ${objdir}/${subdir}/${testfile}
++
++if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++gdb_run_cmd
++
++proc stop_process { description } {
++  global gdb_prompt
++
++  # For this to work we must be sure to consume the "Continuing."
++  # message first, or GDB's signal handler may not be in place.
++  after 1000 {send_gdb "\003"}
++  gdb_expect {
++    -re "Program received signal SIGINT.*$gdb_prompt $"
++      {
++	pass $description
++      }
++    timeout
++      {
++	fail "$description (timeout)"
++      }
++  }
++}
++
++# Prevent races.
++sleep 8
++
++stop_process "Threads could be stopped"
++
++gdb_test "info threads" \
++         "\\* 2 Thread \[^\r\n\]* in \[^\r\n\]*" \
++         "Single thread has been left"

gdb-6.6-gcore32-test.patch

@@ -0,0 +1,216 @@
+Test GCORE on 32bit inferiors on 64bit platforms.
+
+UNSUPPORTED results are valid for `-m64' on 32bit targets.
+
+
+Index: gdb-6.8/gdb/testsuite/gdb.base/gcore.exp
+===================================================================
+--- gdb-6.8.orig/gdb/testsuite/gdb.base/gcore.exp	2008-01-01 23:53:19.000000000 +0100
++++ gdb-6.8/gdb/testsuite/gdb.base/gcore.exp	2008-07-14 10:28:05.000000000 +0200
+@@ -30,9 +30,14 @@ set testfile "gcore"
+ set srcfile  ${testfile}.c
+ set binfile  ${objdir}/${subdir}/${testfile}
+ 
+-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+-     untested gcore.exp
+-     return -1
++# `-static-libgcc' to avoid dependency on `libgcc.{i386,ppc}'.
++foreach additional_flags {{} {-m32 -static-libgcc} {-m64 -static-libgcc}} {
++
++set prefix "arch{$additional_flags}:"
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug additional_flags=$additional_flags]] != "" } {
++     unsupported "${prefix} gcore.exp"
++     continue
+ }
+ 
+ # Start with a fresh gdb.
+@@ -47,23 +52,23 @@ send_gdb "help gcore\n"
+ gdb_expect {
+     -re "Undefined command: .gcore.*$gdb_prompt $" {
+ 	# gcore command not supported -- nothing to test here.
+-	unsupported "gdb does not support gcore on this target"
+-	return -1;
++	unsupported "${prefix} gdb does not support gcore on this target"
++	continue
+     }
+     -re "Save a core file .*$gdb_prompt $" {
+-	pass "help gcore"
++	pass "${prefix} help gcore"
+     }
+     -re ".*$gdb_prompt $" {
+-	fail "help gcore"
++	fail "${prefix} help gcore"
+     }
+     timeout {
+-	fail "help gcore (timeout)"
++	fail "${prefix} help gcore (timeout)"
+     }
+ }
+ 
+ if { ! [ runto_main ] } then {
+-    untested gcore.exp
+-    return -1
++    untested "${prefix} gcore.exp"
++    continue
+ }
+ 
+ proc capture_command_output { command prefix } {
+@@ -77,7 +82,7 @@ proc capture_command_output { command pr
+ 	    set output_string $expect_out(1,string)
+ 	}
+ 	default {
+-	    fail "capture_command_output failed on $command."
++	    fail "${prefix} capture_command_output failed on $command."
+ 	}
+     }
+     return $output_string
+@@ -109,22 +114,22 @@ set escapedfilename [string_to_regexp ${
+ 
+ set core_supported 0
+ gdb_test_multiple "gcore ${objdir}/${subdir}/gcore.test" \
+-	"save a corefile" \
++	"${prefix} save a corefile" \
+ {
+   -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
+-    pass "save a corefile"
++    pass "${prefix} save a corefile"
+     global core_supported
+     set core_supported 1
+   }
+   -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" {
+-    unsupported "save a corefile"
++    unsupported "${prefix} save a corefile"
+     global core_supported
+     set core_supported 0
+   }
+ }
+ 
+ if {!$core_supported} {
+-  return -1
++    continue
+ }
+ 
+ # Now restart gdb and load the corefile.
+@@ -136,31 +141,31 @@ gdb_load ${binfile}
+ send_gdb "core ${objdir}/${subdir}/gcore.test\n"
+ gdb_expect {
+     -re ".* is not a core dump:.*$gdb_prompt $" {
+-	fail "re-load generated corefile (bad file format)"
++	fail "${prefix} re-load generated corefile (bad file format)"
+ 	# No use proceeding from here.
+-	return;	
++	continue
+     }
+     -re ".*: No such file or directory.*$gdb_prompt $" {
+-	fail "re-load generated corefile (file not found)"
++	fail "${prefix} re-load generated corefile (file not found)"
+ 	# No use proceeding from here.
+-	return;	
++	continue
+     }
+     -re ".*Couldn't find .* registers in core file.*$gdb_prompt $" {
+-	fail "re-load generated corefile (incomplete note section)"
++	fail "${prefix} re-load generated corefile (incomplete note section)"
+     }
+     -re "Core was generated by .*$gdb_prompt $" {
+-	pass "re-load generated corefile"
++	pass "${prefix} re-load generated corefile"
+     }
+     -re ".*$gdb_prompt $" {
+-	fail "re-load generated corefile"
++	fail "${prefix} re-load generated corefile"
+     }
+     timeout {
+-	fail "re-load generated corefile (timeout)"
++	fail "${prefix} re-load generated corefile (timeout)"
+     }
+ }
+ 
+ send_gdb "where\n"
+-gdb_expect_list "where in corefile" ".*$gdb_prompt $" {
++gdb_expect_list "${prefix} where in corefile" ".*$gdb_prompt $" {
+     ".*\[\r\n\]+#0 .* terminal_func \\(\\) at "
+     ".*\[\r\n\]+#1 .* array_func \\(\\) at "
+     ".*\[\r\n\]+#2 .* factorial_func \\(value=1\\) at "
+@@ -174,61 +179,64 @@ gdb_expect_list "where in corefile" ".*$
+ 
+ set post_corefile_regs [capture_command_output "info registers" ""]
+ if ![string compare $pre_corefile_regs $post_corefile_regs] then {
+-    pass "corefile restored general registers"
++    pass "${prefix} corefile restored general registers"
+ } else {
+-    fail "corefile restored general registers"
++    fail "${prefix} corefile restored general registers"
+ }
+ 
+ set post_corefile_allregs [capture_command_output "info all-reg" ""]
+ if ![string compare $pre_corefile_allregs $post_corefile_allregs] then {
+-    pass "corefile restored all registers"
++    pass "${prefix} corefile restored all registers"
+ } else {
+-    fail "corefile restored all registers"
++    fail "${prefix} corefile restored all registers"
+ }
+ 
+ set post_corefile_extern_array \
+ 	[capture_command_output "print extern_array" "$print_prefix"]
+ if ![string compare $pre_corefile_extern_array $post_corefile_extern_array]  {
+-    pass "corefile restored extern array"
++    pass "${prefix} corefile restored extern array"
+ } else {
+-    fail "corefile restored extern array"
++    fail "${prefix} corefile restored extern array"
+ }
+ 
+ set post_corefile_static_array \
+ 	[capture_command_output "print static_array" "$print_prefix"]
+ if ![string compare $pre_corefile_static_array $post_corefile_static_array]  {
+-    pass "corefile restored static array"
++    pass "${prefix} corefile restored static array"
+ } else {
+-    fail "corefile restored static array"
++    fail "${prefix} corefile restored static array"
+ }
+ 
+ set post_corefile_uninit_array \
+ 	[capture_command_output "print un_initialized_array" "$print_prefix"]
+ if ![string compare $pre_corefile_uninit_array $post_corefile_uninit_array]  {
+-    pass "corefile restored un-initialized array"
++    pass "${prefix} corefile restored un-initialized array"
+ } else {
+-    fail "corefile restored un-initialized array"
++    fail "${prefix} corefile restored un-initialized array"
+ }
+ 
+ set post_corefile_heap_string \
+ 	[capture_command_output "print heap_string" "$print_prefix"]
+ if ![string compare $pre_corefile_heap_string $post_corefile_heap_string]  {
+-    pass "corefile restored heap array"
++    pass "${prefix} corefile restored heap array"
+ } else {
+-    fail "corefile restored heap array"
++    fail "${prefix} corefile restored heap array"
+ }
+ 
+ set post_corefile_local_array \
+ 	[capture_command_output "print array_func::local_array" "$print_prefix"]
+ if ![string compare $pre_corefile_local_array $post_corefile_local_array]  {
+-    pass "corefile restored stack array"
++    pass "${prefix} corefile restored stack array"
+ } else {
+-    fail "corefile restored stack array"
++    fail "${prefix} corefile restored stack array"
+ }
+ 
+ set post_corefile_backtrace [capture_command_output "backtrace" ""]
+ if ![string compare $pre_corefile_backtrace $post_corefile_backtrace]  {
+-    pass "corefile restored backtrace"
++    pass "${prefix} corefile restored backtrace"
+ } else {
+-    fail "corefile restored backtrace"
++    fail "${prefix} corefile restored backtrace"
++}
++
++# $additional_flags:
+ }

gdb-6.6-readline-system.patch

@@ -0,0 +1,116 @@
+2007-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Port to GDB-6.7.
+
+Index: gdb-6.7/gdb/doc/Makefile.in
+===================================================================
+--- gdb-6.7.orig/gdb/doc/Makefile.in	2007-07-26 12:34:00.000000000 +0200
++++ gdb-6.7/gdb/doc/Makefile.in	2007-10-16 16:31:08.000000000 +0200
+@@ -109,9 +109,7 @@ DVIPS = dvips
+ GDB_DOC_SOURCE_INCLUDES = \
+ 	$(srcdir)/fdl.texi \
+ 	$(srcdir)/gpl.texi \
+-	$(srcdir)/agentexpr.texi \
+-	$(READLINE_DIR)/rluser.texi \
+-	$(READLINE_DIR)/inc-hist.texinfo
++	$(srcdir)/agentexpr.texi
+ GDB_DOC_BUILD_INCLUDES = \
+ 	gdb-cfg.texi \
+ 	GDBvn.texi
+Index: gdb-6.7/gdb/doc/gdb.texinfo
+===================================================================
+--- gdb-6.7.orig/gdb/doc/gdb.texinfo	2007-10-16 16:19:19.000000000 +0200
++++ gdb-6.7/gdb/doc/gdb.texinfo	2007-10-16 16:32:10.000000000 +0200
+@@ -158,8 +158,8 @@ software in general.  We will miss him.
+ 
+ * GDB Bugs::                    Reporting bugs in @value{GDBN}
+ 
+-* Command Line Editing::        Command Line Editing
+-* Using History Interactively:: Using History Interactively
++* Command Line Editing: (rluserman).       Command Line Editing
++* Using History Interactively: (history).  Using History Interactively
+ * Formatting Documentation::    How to format and print @value{GDBN} documentation
+ * Installing GDB::              Installing GDB
+ * Maintenance Commands::        Maintenance Commands
+@@ -15533,7 +15533,7 @@ Disable command line editing.
+ Show whether command line editing is enabled.
+ @end table
+ 
+-@xref{Command Line Editing}, for more details about the Readline
++@xref{Command Line Editing, , , rluserman, GNU Readline Library}, for more details about the Readline
+ interface.  Users unfamiliar with @sc{gnu} Emacs or @code{vi} are
+ encouraged to read that chapter.
+ 
+@@ -15548,7 +15548,8 @@ history facility.
+ 
+ @value{GDBN} uses the @sc{gnu} History library, a part of the Readline
+ package, to provide the history facility.  @xref{Using History
+-Interactively}, for the detailed description of the History library.
++Interactively, , , history, GNU History Library}, for the detailed description
++of the History library.
+ 
+ To issue a command to @value{GDBN} without affecting certain aspects of
+ the state which is seen by users, prefix it with @samp{server }
+@@ -15600,7 +15601,7 @@ This defaults to the value of the enviro
+ @end table
+ 
+ History expansion assigns special meaning to the character @kbd{!}.
+-@xref{Event Designators}, for more details.
++@xref{Event Designators, , , history, GNU History Library}, for more details.
+ 
+ @cindex history expansion, turn on/off
+ Since @kbd{!} is also the logical not operator in C, history expansion
+@@ -16660,7 +16661,8 @@ Indicates the current program counter ad
+ @cindex TUI key bindings
+ 
+ The TUI installs several key bindings in the readline keymaps
+-(@pxref{Command Line Editing}).  The following key bindings
++(@pxref{Command Line Editing, , , rluserman, GNU Readline Library}).
++The following key bindings
+ are installed for both TUI mode and the @value{GDBN} standard mode.
+ 
+ @table @kbd
+@@ -21937,15 +21939,6 @@ Such guesses are usually wrong.  Even we
+ things without first using the debugger to find the facts.
+ @end itemize
+ 
+-@c The readline documentation is distributed with the readline code
+-@c and consists of the two following files:
+-@c     rluser.texinfo
+-@c     inc-hist.texinfo
+-@c Use -I with makeinfo to point to the appropriate directory,
+-@c environment var TEXINPUTS with TeX.
+-@include rluser.texi
+-@include inc-hist.texinfo
+-
+ 
+ @node Formatting Documentation
+ @appendix Formatting Documentation
+@@ -22115,9 +22108,6 @@ source for the @samp{-liberty} free soft
+ @item gdb-@value{GDBVN}/opcodes
+ source for the library of opcode tables and disassemblers
+ 
+-@item gdb-@value{GDBVN}/readline
+-source for the @sc{gnu} command-line interface
+-
+ @item gdb-@value{GDBVN}/glob
+ source for the @sc{gnu} filename pattern-matching subroutine
+ 
+@@ -22149,7 +22139,7 @@ where @var{host} is an identifier such a
+ correct value by examining your system.)
+ 
+ Running @samp{configure @var{host}} and then running @code{make} builds the
+-@file{bfd}, @file{readline}, @file{mmalloc}, and @file{libiberty}
++@file{bfd}, @file{mmalloc}, and @file{libiberty}
+ libraries, then @code{gdb} itself.  The configured source files, and the
+ binaries, are left in the corresponding source directories.
+ 
+@@ -22175,7 +22165,7 @@ source tree, the @file{gdb-@var{version-
+ that subdirectory.  That is usually not what you want.  In particular,
+ if you run the first @file{configure} from the @file{gdb} subdirectory
+ of the @file{gdb-@var{version-number}} directory, you will omit the
+-configuration of @file{bfd}, @file{readline}, and other sibling
++configuration of @file{bfd}, and other sibling
+ directories of the @file{gdb} subdirectory.  This leads to build errors
+ about missing include files such as @file{bfd/bfd.h}.
+ 

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

@@ -0,0 +1,41 @@
+Index: gdb-6.8.50.20081128/gdb/infrun.c
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/infrun.c	2008-12-09 15:56:16.000000000 +0100
++++ gdb-6.8.50.20081128/gdb/infrun.c	2008-12-09 15:56:59.000000000 +0100
+@@ -931,7 +931,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-6.8.50.20081128/gdb/testsuite/gdb.mi/mi-console.exp
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/testsuite/gdb.mi/mi-console.exp	2008-08-06 14:52:08.000000000 +0200
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.mi/mi-console.exp	2008-12-09 15:59:34.000000000 +0100
+@@ -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-6.8.50.20081128/gdb/testsuite/gdb.mi/mi2-console.exp
+===================================================================
+--- gdb-6.8.50.20081128.orig/gdb/testsuite/gdb.mi/mi2-console.exp	2008-08-06 14:52:08.000000000 +0200
++++ gdb-6.8.50.20081128/gdb/testsuite/gdb.mi/mi2-console.exp	2008-12-09 16:00:33.000000000 +0100
+@@ -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
+ send_gdb "220-exec-next\n"
+ gdb_expect {

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

@@ -0,0 +1,202 @@
+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-6.8.50.20081209/gdb/inferior.h
+===================================================================
+--- gdb-6.8.50.20081209.orig/gdb/inferior.h	2008-11-20 01:35:23.000000000 +0100
++++ gdb-6.8.50.20081209/gdb/inferior.h	2008-12-10 01:22:23.000000000 +0100
+@@ -168,7 +168,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);
+ 
+ /* From misc files */
+ 
+Index: gdb-6.8.50.20081209/gdb/infrun.c
+===================================================================
+--- gdb-6.8.50.20081209.orig/gdb/infrun.c	2008-12-02 20:20:23.000000000 +0100
++++ gdb-6.8.50.20081209/gdb/infrun.c	2008-12-10 01:23:46.000000000 +0100
+@@ -73,7 +73,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_callback (struct thread_info *tp, void *data);
+ 
+@@ -961,7 +961,7 @@ set_schedlock_func (char *args, int from
+    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);
+@@ -975,10 +975,12 @@ resume (int step, enum target_signal sig
+   QUIT;
+ 
+   if (debug_infrun)
+-    fprintf_unfiltered (gdb_stdlog,
+-                        "infrun: resume (step=%d, signal=%d), "
+-			"trap_expected=%d\n",
+- 			step, sig, tp->trap_expected);
++    fprintf_unfiltered (gdb_stdlog, "infrun: resume (step=%s, signal=%d), "
++				    "trap_expected=%d\n",
++			(step == RESUME_STEP_CONTINUE ? "RESUME_STEP_CONTINUE"
++			: (step == RESUME_STEP_USER ? "RESUME_STEP_USER"
++			                            : "RESUME_STEP_NEEDED")),
++			sig, tp->trap_expected);
+ 
+   /* Some targets (e.g. Solaris x86) have a kernel bug when stepping
+      over an instruction that causes a page fault without triggering
+@@ -1127,9 +1129,10 @@ a command like `return' or `jump' to con
+ 	     individually.  */
+ 	  resume_ptid = inferior_ptid;
+ 	}
+-      else if ((scheduler_mode == schedlock_on)
++      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;
+@@ -1302,7 +1305,7 @@ proceed (CORE_ADDR addr, enum target_sig
+   struct gdbarch *gdbarch = get_regcache_arch (regcache);
+   struct thread_info *tp;
+   CORE_ADDR pc = regcache_read_pc (regcache);
+-  int oneproc = 0;
++  enum resume_step resume_step = RESUME_STEP_CONTINUE;
+ 
+   if (step > 0)
+     step_start_function = find_pc_function (pc);
+@@ -1322,13 +1325,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
+     {
+@@ -1359,13 +1362,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->trap_expected = 1;
+       /* If displaced stepping is enabled, we can step over the
+@@ -1451,8 +1454,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->stop_signal);
++  resume (resume_step, tp->stop_signal);
+ 
+   /* Wait for it to stop (if not standalone)
+      and in any case decode why it stopped, and act accordingly.  */
+@@ -3690,10 +3698,16 @@ currently_stepping_callback (struct thre
+   return tp != data && currently_stepping_thread (tp);
+ }
+ 
+-static int
++static enum resume_step
+ currently_stepping (struct thread_info *tp)
+ {
+-  return currently_stepping_thread (tp) || bpstat_should_step ();
++  if (currently_stepping_thread (tp))
++    return RESUME_STEP_USER;
++
++  if (bpstat_should_step ())
++    return RESUME_STEP_NEEDED;
++
++  return RESUME_STEP_CONTINUE;
+ }
+ 
+ /* Inferior has stepped into a subroutine call with source code that
+Index: gdb-6.8.50.20081209/gdb/linux-nat.c
+===================================================================
+--- gdb-6.8.50.20081209.orig/gdb/linux-nat.c	2008-12-02 08:57:36.000000000 +0100
++++ gdb-6.8.50.20081209/gdb/linux-nat.c	2008-12-10 01:22:23.000000000 +0100
+@@ -2343,7 +2343,10 @@ count_events_callback (struct lwp_info *
+ static int
+ select_singlestep_lwp_callback (struct lwp_info *lp, void *data)
+ {
+-  if (lp->step && 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'.  */
++  if (lp->step == RESUME_STEP_USER && lp->status != 0)
+     return 1;
+   else
+     return 0;
+Index: gdb-6.8.50.20081209/gdb/linux-nat.h
+===================================================================
+--- gdb-6.8.50.20081209.orig/gdb/linux-nat.h	2008-07-27 23:12:40.000000000 +0200
++++ gdb-6.8.50.20081209/gdb/linux-nat.h	2008-12-10 01:22:23.000000000 +0100
+@@ -55,8 +55,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-step-thread-exit.patch

@@ -0,0 +1,61 @@
+Index: gdb-6.8.50.20090226/gdb/linux-nat.c
+===================================================================
+--- gdb-6.8.50.20090226.orig/gdb/linux-nat.c	2009-02-27 00:04:35.000000000 +0100
++++ gdb-6.8.50.20090226/gdb/linux-nat.c	2009-02-27 07:51:44.000000000 +0100
+@@ -1790,15 +1790,17 @@ resume_set_callback (struct lwp_info *lp
+ 
+ static void
+ linux_nat_resume (struct target_ops *ops,
+-		  ptid_t ptid, int step, enum target_signal signo)
++		  ptid_t ptid, int step_int, enum target_signal signo)
+ {
+   struct lwp_info *lp;
+   int resume_all;
++  enum resume_step step = step_int;
+ 
+   if (debug_linux_nat)
+     fprintf_unfiltered (gdb_stdlog,
+ 			"LLR: Preparing to %s %s, %s, inferior_ptid %s\n",
+-			step ? "step" : "resume",
++			(step == RESUME_STEP_NEEDED
++			 ? "needed" : (step ? "step" : "resume")),
+ 			target_pid_to_str (ptid),
+ 			signo ? strsignal (signo) : "0",
+ 			target_pid_to_str (inferior_ptid));
+@@ -2740,6 +2742,9 @@ linux_nat_filter_event (int lwpid, int s
+   /* Check if the thread has exited.  */
+   if ((WIFEXITED (status) || WIFSIGNALED (status)) && num_lwps > 1)
+     {
++      enum resume_step step = lp->step;
++      pid_t pid = GET_PID (lp->ptid);
++
+       /* If this is the main thread, we must stop all threads and
+ 	 verify if they are still alive.  This is because in the nptl
+ 	 thread model, there is no signal issued for exiting LWPs
+@@ -2763,6 +2768,26 @@ linux_nat_filter_event (int lwpid, int s
+ 
+       exit_lwp (lp);
+ 
++      if (step == RESUME_STEP_USER)
++	{
++	  /* Now stop the closest LWP's ...  */
++	  lp = find_lwp_pid (pid_to_ptid (pid));
++	  if (!lp)
++	    lp = lwp_list;
++	  gdb_assert (lp != NULL);
++	  errno = 0;
++	  ptrace (PTRACE_CONT, GET_LWP (lp->ptid), 0,
++		  (void *) (unsigned long) SIGSTOP);
++	  if (debug_linux_nat)
++	    fprintf_unfiltered (gdb_stdlog,
++				"PTRACE_CONT %s, 0, 0 (%s)\n",
++				target_pid_to_str (lp->ptid),
++				errno ? safe_strerror (errno)
++				      : "OK");
++	  /* Avoid the silent `delayed SIGSTOP' handling.  */
++	  lp->signalled = 0;
++	}
++
+       /* If there is at least one more LWP, then the exit signal was
+ 	 not the end of the debugged application and should be
+ 	 ignored.  */

gdb-6.6-testsuite-timeouts.patch

@@ -1,32 +1,42 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.6-testsuite-timeouts.patch
-
-;; Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
-;;=fedoratest
-
-diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
---- a/gdb/testsuite/gdb.base/annota1.exp
-+++ b/gdb/testsuite/gdb.base/annota1.exp
-@@ -39,6 +39,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
- 
- clean_restart ${binfile}
+--- ./gdb/testsuite/gdb.base/annota1.exp	10 Jan 2007 03:23:04 -0000	1.23
++++ ./gdb/testsuite/gdb.base/annota1.exp	10 May 2007 12:54:11 -0000
+@@ -57,6 +57,8 @@ if [target_info exists gdb_stub] {
+     gdb_step_for_stub;
+ }
  
 +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
+ #
+--- ./gdb/testsuite/gdb.base/annota3.exp	9 Jan 2007 17:59:09 -0000	1.12
++++ ./gdb/testsuite/gdb.base/annota3.exp	10 May 2007 12:54:11 -0000
+@@ -56,6 +56,8 @@ if [target_info exists gdb_stub] {
+     gdb_step_for_stub;
+ }
  
 +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/gdb/testsuite/gdb.threads/step-thread-exit.exp-orig	2007-05-10 15:03:15.000000000 +0200
++++ gdb-6.6/gdb/testsuite/gdb.threads/step-thread-exit.exp	2007-05-10 15:04:24.000000000 +0200
+@@ -58,6 +58,9 @@ gdb_test "continue" "Break.*thread_funct
+ # thread to be stopped and a message printed to tell us we have stepped
+ # over the thread exit.
+ set test "step over thread exit 1"
++# ppc64 is currently failing:
++set timeout_old $timeout
++set timeout 60
+ gdb_test_multiple "next" "$test" {
+   -re "\}.*$gdb_prompt $" {
+      send_gdb "next\n"
+@@ -71,6 +74,7 @@ gdb_test_multiple "next" "$test" {
+      exp_continue
+   }
+ }
++set timeout $timeout_old
+ 
+ # Without this fixup we could end up in:
+ # #0  0x00110416 in __kernel_vsyscall ()

gdb-6.6-threads-static-test.patch

@@ -0,0 +1,25 @@
+--- gdb-6.6/gdb/testsuite/gdb.threads/staticthreads.exp-orig	2005-04-30 21:56:47.000000000 +0200
++++ gdb-6.6/gdb/testsuite/gdb.threads/staticthreads.exp	2008-01-11 14:30:15.000000000 +0100
+@@ -44,9 +44,21 @@ gdb_load ${binfile}
+ gdb_test "set print sevenbit-strings" ""
+ 
+ 
++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
++
++set test "info threads on start"
++gdb_test_multiple "info threads" "$test" {
++    -re "^info threads\r?\n\[^\r\n\]* Thread \[^\r\n\]*\r?\n$gdb_prompt" {
++	pass "$test"
++    }
++}
++
+ # See if the static multi-threaded program runs.
+ 
+-runto_main
+ gdb_test "break sem_post"
+ set test "Continue to main's call of sem_post"
+ gdb_test_multiple "continue" "$test" {