Rebase to FSF GDB 9.0.50.20191119 (9.1pre).

Drop 'gdb-readline62-ask-more-rh.patch'. Drop 'gdb-6.5-bz216711-clone-is-outermost.patch'. Adjust 'gdb-archer-pie-addons-keep-disabled.patch'.
2019-11-21 12:10:32 -05:00 · 2019-11-21 12:10:32 -05:00 · 99dc38b0d5
parent 2f578f51e4
commit 99dc38b0d5
33 changed files with 180 additions and 515 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,3 @@
 /gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz
 /v2.0.1.tar.gz
-/gdb-9.0.50.20191018.tar.xz
+/gdb-9.0.50.20191119.tar.xz
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@ -66,325 +66,317 @@ Patch016: gdb-6.5-last-address-space-byte-test.patch
 #=fedoratest
 Patch017: gdb-6.5-readline-long-line-crash-test.patch

-# Fix bogus 0x0 unwind of the thread's topmost function clone(3) (BZ 216711).
-#=fedora
-Patch018: gdb-6.5-bz216711-clone-is-outermost.patch
-
 # Test sideeffects of skipping ppc .so libs trampolines (BZ 218379).
 #=fedoratest
-Patch019: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
+Patch018: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch

 # Fix lockup on trampoline vs. its function lookup; unreproducible (BZ 218379).
 #=fedora
-Patch020: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
+Patch019: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch

 # Find symbols properly at their original (included) file (BZ 109921).
 #=fedoratest
-Patch021: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
+Patch020: gdb-6.5-bz109921-DW_AT_decl_file-test.patch

 # Update PPC unwinding patches to their upstream variants (BZ 140532).
 #=fedoratest
-Patch022: gdb-6.3-bz140532-ppc-unwinding-test.patch
+Patch021: gdb-6.3-bz140532-ppc-unwinding-test.patch

 # Testcase for exec() from threaded program (BZ 202689).
 #=fedoratest
-Patch023: gdb-6.3-bz202689-exec-from-pthread-test.patch
+Patch022: gdb-6.3-bz202689-exec-from-pthread-test.patch

 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 #=fedoratest
-Patch024: gdb-6.6-bz230000-power6-disassembly-test.patch
+Patch023: gdb-6.6-bz230000-power6-disassembly-test.patch

 # Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
 #=fedoratest
-Patch025: gdb-6.6-bz229517-gcore-without-terminal.patch
+Patch024: gdb-6.6-bz229517-gcore-without-terminal.patch

 # Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
 #=fedoratest
-Patch026: gdb-6.6-testsuite-timeouts.patch
+Patch025: gdb-6.6-testsuite-timeouts.patch

 # Support for stepping over PPC atomic instruction sequences (BZ 237572).
 #=fedoratest
-Patch027: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
+Patch026: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch

 # Make upstream `set scheduler-locking step' as default.
 #=push+jan: How much is scheduler-locking relevant after non-stop?
-Patch028: gdb-6.6-scheduler_locking-step-is-default.patch
+Patch027: gdb-6.6-scheduler_locking-step-is-default.patch

 # Test kernel VDSO decoding while attaching to an i386 process.
 #=fedoratest
-Patch029: gdb-6.3-attach-see-vdso-test.patch
+Patch028: gdb-6.3-attach-see-vdso-test.patch

 # Test leftover zombie process (BZ 243845).
 #=fedoratest
-Patch030: gdb-6.5-bz243845-stale-testing-zombie-test.patch
+Patch029: gdb-6.5-bz243845-stale-testing-zombie-test.patch

 # New locating of the matching binaries from the pure core file (build-id).
 #=push+jan
-Patch031: gdb-6.6-buildid-locate.patch
+Patch030: 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
-Patch032: gdb-6.6-buildid-locate-solib-missing-ids.patch
+Patch031: gdb-6.6-buildid-locate-solib-missing-ids.patch

 #=push+jan
-Patch033: gdb-6.6-buildid-locate-rpm.patch
+Patch032: 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.
-Patch034: gdb-6.7-charsign-test.patch
+Patch033: gdb-6.7-charsign-test.patch

 # Test PPC hiding of call-volatile parameter register.
 #=fedoratest
-Patch035: gdb-6.7-ppc-clobbered-registers-O2-test.patch
+Patch034: gdb-6.7-ppc-clobbered-registers-O2-test.patch

 # Testsuite fixes for more stable/comparable results.
 #=fedoratest
-Patch036: gdb-6.7-testsuite-stable-results.patch
+Patch035: gdb-6.7-testsuite-stable-results.patch

 # Test ia64 memory leaks of the code using libunwind.
 #=fedoratest
-Patch037: gdb-6.5-ia64-libunwind-leak-test.patch
+Patch036: gdb-6.5-ia64-libunwind-leak-test.patch

 # Test hiding unexpected breakpoints on intentional step commands.
 #=fedoratest
-Patch038: gdb-6.5-missed-trap-on-step-test.patch
+Patch037: gdb-6.5-missed-trap-on-step-test.patch

 # Test gcore memory and time requirements for large inferiors.
 #=fedoratest
-Patch039: gdb-6.5-gcore-buffer-limit-test.patch
+Patch038: gdb-6.5-gcore-buffer-limit-test.patch

 # Test GCORE for shmid 0 shared memory mappings.
 #=fedoratest: But it is broken anyway, sometimes the case being tested is not reproducible.
-Patch040: gdb-6.3-mapping-zero-inode-test.patch
+Patch039: gdb-6.3-mapping-zero-inode-test.patch

 # Test a crash on `focus cmd', `focus prev' commands.
 #=fedoratest
-Patch041: gdb-6.3-focus-cmd-prev-test.patch
+Patch040: gdb-6.3-focus-cmd-prev-test.patch

 # Test various forms of threads tracking across exec() (BZ 442765).
 #=fedoratest
-Patch042: gdb-6.8-bz442765-threaded-exec-test.patch
+Patch041: gdb-6.8-bz442765-threaded-exec-test.patch

 # Test a crash on libraries missing the .text section.
 #=fedoratest
-Patch043: gdb-6.5-section-num-fixup-test.patch
+Patch042: gdb-6.5-section-num-fixup-test.patch

 # Fix register assignments with no GDB stack frames (BZ 436037).
 #=push+jan: This fix is incorrect.
-Patch044: gdb-6.8-bz436037-reg-no-longer-active.patch
+Patch043: gdb-6.8-bz436037-reg-no-longer-active.patch

 # Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 #=fedoratest
-Patch045: gdb-6.8-bz466901-backtrace-full-prelinked.patch
+Patch044: gdb-6.8-bz466901-backtrace-full-prelinked.patch

 # New test for step-resume breakpoint placed in multiple threads at once.
 #=fedoratest
-Patch046: gdb-simultaneous-step-resume-breakpoint-test.patch
+Patch045: 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@.*>
-Patch047: gdb-core-open-vdso-warning.patch
+Patch046: gdb-core-open-vdso-warning.patch

 # Fix stepping with OMP parallel Fortran sections (BZ 533176).
 #=push+jan: It requires some better DWARF annotations.
-Patch048: gdb-bz533176-fortran-omp-step.patch
+Patch047: 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.
-Patch049: gdb-ccache-workaround.patch
+Patch048: gdb-ccache-workaround.patch

 #=push+jan: May get obsoleted by Tom's unrelocated objfiles patch.
-Patch050: gdb-archer-pie-addons.patch
+Patch049: gdb-archer-pie-addons.patch

 #=push+jan: Breakpoints disabling matching should not be based on address.
-Patch051: gdb-archer-pie-addons-keep-disabled.patch
+Patch050: gdb-archer-pie-addons-keep-disabled.patch

 # Testcase for "Do not make up line information" fix by Daniel Jacobowitz.
 #=fedoratest
-Patch052: gdb-lineno-makeup-test.patch
+Patch051: gdb-lineno-makeup-test.patch

 # Test power7 ppc disassembly.
 #=fedoratest
-Patch053: gdb-ppc-power7-test.patch
+Patch052: 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.
-Patch054: gdb-moribund-utrace-workaround.patch
+Patch053: gdb-moribund-utrace-workaround.patch

 # Fix follow-exec for C++ programs (bugreported by Martin Stransky).
 #=fedoratest
-Patch055: gdb-archer-next-over-throw-cxx-exec.patch
+Patch054: gdb-archer-next-over-throw-cxx-exec.patch

 # Backport DWARF-4 support (BZ 601887, Tom Tromey).
 #=fedoratest
-Patch056: gdb-bz601887-dwarf4-rh-test.patch
+Patch055: gdb-bz601887-dwarf4-rh-test.patch

 #=push+jan
-Patch057: gdb-6.6-buildid-locate-core-as-arg.patch
+Patch056: gdb-6.6-buildid-locate-core-as-arg.patch

 # Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
 #=push+jan
-Patch058: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+Patch057: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch

 # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
 #=fedoratest
-Patch059: gdb-test-bt-cfi-without-die.patch
+Patch058: gdb-test-bt-cfi-without-die.patch

 # Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
 #=fedoratest
-Patch060: gdb-bz634108-solib_address.patch
+Patch059: gdb-bz634108-solib_address.patch

 # New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435).
 #=fedoratest
-Patch061: gdb-test-pid0-core.patch
+Patch060: gdb-test-pid0-core.patch

 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch062: gdb-test-dw2-aranges.patch
+Patch061: gdb-test-dw2-aranges.patch

 # [archer-keiths-expr-cumulative+upstream] Import C++ testcases.
 #=fedoratest
-Patch063: gdb-test-expr-cumulative-archer.patch
+Patch062: gdb-test-expr-cumulative-archer.patch

 # Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
 #=fedoratest
-Patch064: gdb-physname-pr11734-test.patch
+Patch063: gdb-physname-pr11734-test.patch

 # Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
 #=fedoratest
-Patch065: gdb-physname-pr12273-test.patch
+Patch064: gdb-physname-pr12273-test.patch

 # Test GDB opcodes/ disassembly of Intel Ivy Bridge instructions (BZ 696890).
 #=fedoratest
-Patch066: gdb-test-ivy-bridge.patch
+Patch065: gdb-test-ivy-bridge.patch

 # Hack for proper PIE run of the testsuite.
 #=fedoratest
-Patch067: gdb-runtest-pie-override.patch
+Patch066: gdb-runtest-pie-override.patch

 # Print reasons for failed attach/spawn incl. SELinux deny_ptrace (BZ 786878).
 #=push+jan
-Patch068: gdb-attach-fail-reasons-5of5.patch
+Patch067: gdb-attach-fail-reasons-5of5.patch

 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedoratest: Compatibility with RHELs (unchecked which ones).
-Patch069: gdb-glibc-strstr-workaround.patch
+Patch068: gdb-glibc-strstr-workaround.patch

 # Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789).
 #=fedoratest
-Patch070: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
+Patch069: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch

 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch071: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch070: 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
-Patch072: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch071: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch

 # Fix crash of -readnow /usr/lib/debug/usr/bin/gnatbind.debug (BZ 1069211).
 #=push+jan
-Patch073: gdb-gnat-dwarf-crash-3of3.patch
+Patch072: gdb-gnat-dwarf-crash-3of3.patch

 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch074: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch073: 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
-Patch075: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch074: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch

 #=fedoratest
-Patch076: gdb-archer-vla-tests.patch
+Patch075: gdb-archer-vla-tests.patch

 #=fedoratest
-Patch077: gdb-vla-intel-tests.patch
+Patch076: gdb-vla-intel-tests.patch

 # Continue backtrace even if a frame filter throws an exception (Phil Muldoon).
 #=push
-Patch078: gdb-btrobust.patch
+Patch077: gdb-btrobust.patch

 # Display Fortran strings in backtraces.
 #=fedoratest
-Patch079: gdb-fortran-frame-string.patch
+Patch078: gdb-fortran-frame-string.patch

 # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 # crash.' (RH BZ 1156192).
 #=fedoratest
-Patch080: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch079: gdb-rhbz1156192-recursive-dlopen-test.patch

 # Fix jit-reader.h for multi-lib.
 #=push+jan
-Patch081: gdb-jit-reader-multilib.patch
+Patch080: gdb-jit-reader-multilib.patch

 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch082: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch081: 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
-Patch083: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+Patch082: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch

 # Test 'info type-printers' Python error (RH BZ 1350436).
 #=fedoratest
-Patch084: gdb-rhbz1350436-type-printers-error.patch
+Patch083: gdb-rhbz1350436-type-printers-error.patch

 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch085: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch084: 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
-Patch086: gdb-bz1219747-attach-kills.patch
+Patch085: gdb-bz1219747-attach-kills.patch

 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch087: gdb-fedora-libncursesw.patch
+Patch086: gdb-fedora-libncursesw.patch

 # Test clflushopt instruction decode (for RH BZ 1262471).
 #=fedoratest
-Patch088: gdb-opcodes-clflushopt-test.patch
+Patch087: gdb-opcodes-clflushopt-test.patch

 # [rhel6] DTS backward Python compatibility API (BZ 1020004, Phil Muldoon).
 #=fedora
-Patch089: gdb-dts-rhel6-python-compat.patch
+Patch088: gdb-dts-rhel6-python-compat.patch

 # [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
 #=push+jan
-Patch090: gdb-6.6-buildid-locate-rpm-scl.patch
-
-# Work around readline-6.2 incompatibility not asking for --more-- (BZ 701131).
-#=fedora
-Patch091: gdb-readline62-ask-more-rh.patch
+Patch089: 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 .
-Patch092: gdb-6.8-quit-never-aborts.patch
+Patch090: gdb-6.8-quit-never-aborts.patch

 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch093: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch091: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch

 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch094: gdb-container-rh-pkg.patch
+Patch092: gdb-container-rh-pkg.patch

 # New test for Python "Cannot locate object file for block" (for RH BZ 1325795).
 #=fedoratest
-Patch095: gdb-rhbz1325795-framefilters-test.patch
+Patch093: gdb-rhbz1325795-framefilters-test.patch

 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch096: gdb-linux_perf-bundle.patch
+Patch094: gdb-linux_perf-bundle.patch

 # Fix gdb-headless /usr/bin/ executables (BZ 1390251).
 #
@ -393,20 +385,20 @@ Patch096: gdb-linux_perf-bundle.patch
 #
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #=fedora
-Patch097: gdb-libexec-add-index.patch
+Patch095: gdb-libexec-add-index.patch

 # New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
 #=fedoratest
-Patch098: gdb-rhbz1398387-tab-crash-test.patch
+Patch096: gdb-rhbz1398387-tab-crash-test.patch

 # Python patches of: http://sourceware.org/gdb/wiki/ProjectArcher
 #=push
-Patch099: gdb-archer.patch
+Patch097: gdb-archer.patch

 # Revert upstream commit 469412dd9ccc4de5874fd3299b105833f36b34cd
-Patch100: gdb-vla-intel-fix-print-char-array.patch
+Patch098: gdb-vla-intel-fix-print-char-array.patch

 # [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
 # =fedoratest
-Patch101: gdb-rhbz1553104-s390x-arch12-test.patch
+Patch099: gdb-rhbz1553104-s390x-arch12-test.patch

--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@ -97,5 +97,3 @@
 %patch097 -p1
 %patch098 -p1
 %patch099 -p1
-%patch100 -p1
-%patch101 -p1
--- a/2
+++ b/2
@ -1 +1 @@
-39849b0503152de7447b3da67ed9fa45fa9ba5fd
+58bd3702d7aad95e08bcd05efc4ef4f1585305a9
--- a/2
+++ b/2
@ -15,7 +15,6 @@ 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-bz216711-clone-is-outermost.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
@ -88,7 +87,6 @@ gdb-fedora-libncursesw.patch
 gdb-opcodes-clflushopt-test.patch
 gdb-dts-rhel6-python-compat.patch
 gdb-6.6-buildid-locate-rpm-scl.patch
-gdb-readline62-ask-more-rh.patch
 gdb-6.8-quit-never-aborts.patch
 gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 gdb-container-rh-pkg.patch
--- a/gdb-6.3-gstack-20050411.patch
+++ b/gdb-6.3-gstack-20050411.patch
@ -16,7 +16,7 @@ Subject: gdb-6.3-gstack-20050411.patch
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
-@@ -1744,7 +1744,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
+@@ -1756,7 +1756,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
 install: all
 	@$(MAKE) $(FLAGS_TO_PASS) install-only
 
@ -25,7 +25,7 @@ diff --git a/gdb/Makefile.in b/gdb/Makefile.in
 	transformed_name=`t='$(program_transform_name)'; \
 			  echo gdb | sed -e "$$t"` ; \
 		if test "x$$transformed_name" = x; then \
-@@ -1793,7 +1793,25 @@ install-guile:
+@@ -1805,7 +1805,25 @@ install-guile:
 install-python:
 	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_DATADIR)/python/gdb
 
@ -52,7 +52,7 @@ diff --git a/gdb/Makefile.in b/gdb/Makefile.in
 	transformed_name=`t='$(program_transform_name)'; \
 			  echo gdb | sed -e $$t` ; \
 		if test "x$$transformed_name" = x; then \
-@@ -1816,6 +1834,18 @@ uninstall: force $(CONFIG_UNINSTALL)
+@@ -1828,6 +1846,18 @@ uninstall: force $(CONFIG_UNINSTALL)
 	fi
 	@$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
 
--- a/gdb-6.3-rh-testversion-20041202.patch
+++ b/gdb-6.3-rh-testversion-20041202.patch
@ -27,7 +27,7 @@ diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest
 diff --git a/gdb/top.c b/gdb/top.c
 --- a/gdb/top.c
 +++ b/gdb/top.c
-@@ -2057,7 +2057,7 @@ init_gdb_version_vars (void)
+@@ -2061,7 +2061,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;
--- a/gdb-6.5-bz216711-clone-is-outermost.patch
+++ b/gdb-6.5-bz216711-clone-is-outermost.patch
@ -1,304 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Jan Kratochvil <jan.kratochvil@redhat.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.5-bz216711-clone-is-outermost.patch
-
-;; Fix bogus 0x0 unwind of the thread's topmost function clone(3) (BZ 216711).
-;;=fedora
-
-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.
-
-diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
--- a/gdb/amd64-linux-tdep.c
-+++ b/gdb/amd64-linux-tdep.c
-@@ -291,6 +291,80 @@ amd64_linux_register_reggroup_p (struct gdbarch *gdbarch, int regnum,
- 
- /* 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);
-+  const 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)
- {
-@@ -1808,6 +1882,8 @@ amd64_linux_init_abi_common(struct gdbarch_info info, struct gdbarch *gdbarch)
- 
-   tdep->xsave_xcr0_offset = I386_LINUX_XSAVE_XCR0_OFFSET;
- 
-+  tdep->outermost_frame_p = amd64_linux_outermost_frame;
-+
-   /* Add the %orig_rax register used for syscall restarting.  */
-   set_gdbarch_write_pc (gdbarch, amd64_linux_write_pc);
- 
-diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
--- a/gdb/amd64-tdep.c
-+++ b/gdb/amd64-tdep.c
-@@ -2647,6 +2647,7 @@ amd64_frame_unwind_stop_reason (struct frame_info *this_frame,
- {
-   struct amd64_frame_cache *cache =
-     amd64_frame_cache (this_frame, this_cache);
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (get_frame_arch (this_frame));
- 
-   if (!cache->base_p)
-     return UNWIND_UNAVAILABLE;
-@@ -2655,6 +2656,10 @@ amd64_frame_unwind_stop_reason (struct frame_info *this_frame,
-   if (cache->base == 0)
-     return UNWIND_OUTERMOST;
- 
-+  /* Detect OS dependent outermost frames; such as `clone'.  */
-+  if (tdep->outermost_frame_p && tdep->outermost_frame_p (this_frame))
-+    return UNWIND_OUTERMOST;
-+
-   return UNWIND_NO_REASON;
- }
- 
-@@ -2788,6 +2793,7 @@ amd64_sigtramp_frame_this_id (struct frame_info *this_frame,
- {
-   struct amd64_frame_cache *cache =
-     amd64_sigtramp_frame_cache (this_frame, this_cache);
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (get_frame_arch (this_frame));
- 
-   if (!cache->base_p)
-     (*this_id) = frame_id_build_unavailable_stack (get_frame_pc (this_frame));
-@@ -2796,6 +2802,11 @@ amd64_sigtramp_frame_this_id (struct frame_info *this_frame,
-       /* This marks the outermost frame.  */
-       return;
-     }
-+  else if (tdep->outermost_frame_p && tdep->outermost_frame_p (this_frame))
-+    {
-+      /* Detect OS dependent outermost frames; such as `clone'.  */
-+      return;
-+    }
-   else
-     (*this_id) = frame_id_build (cache->base + 16, get_frame_pc (this_frame));
- }
-diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
--- a/gdb/i386-tdep.c
-+++ b/gdb/i386-tdep.c
-@@ -8445,6 +8445,9 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
- 
-   tdep->xsave_xcr0_offset = -1;
- 
-+  /* Unwinding stops on i386 automatically.  */
-+  tdep->outermost_frame_p = NULL;
-+
-   tdep->record_regmap = i386_record_regmap;
- 
-   set_gdbarch_type_align (gdbarch, i386_type_align);
-diff --git a/gdb/i386-tdep.h b/gdb/i386-tdep.h
--- a/gdb/i386-tdep.h
-+++ b/gdb/i386-tdep.h
-@@ -256,6 +256,9 @@ struct gdbarch_tdep
- 
-   /* Regsets. */
-   const struct regset *fpregset;
-+
-+  /* Detect OS dependent outermost frames; such as `clone'.  */
-+  int (*outermost_frame_p) (struct frame_info *this_frame);
- };
- 
- /* Floating-point registers.  */
-diff --git a/gdb/testsuite/gdb.threads/bt-clone-stop.c b/gdb/testsuite/gdb.threads/bt-clone-stop.c
-new file mode 100644
--- /dev/null
-+++ b/gdb/testsuite/gdb.threads/bt-clone-stop.c
-@@ -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();
-+}
-diff --git a/gdb/testsuite/gdb.threads/bt-clone-stop.exp b/gdb/testsuite/gdb.threads/bt-clone-stop.exp
-new file mode 100644
--- /dev/null
-+++ b/gdb/testsuite/gdb.threads/bt-clone-stop.exp
-@@ -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 [standard_output_file ${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" \
-+     {Thread 2 "bt-clone-stop" 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"
-+    }
-+}
--- a/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
+++ b/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
@ -11,7 +11,7 @@ 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
-@@ -3133,6 +3133,13 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
+@@ -3142,6 +3142,13 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
 	     SYMBOL_LINKAGE_NAME (msymbol)); */
 	  ;
 	/* fall through */
--- a/gdb-6.6-buildid-locate-core-as-arg.patch
+++ b/gdb-6.6-buildid-locate-core-as-arg.patch
@ -120,7 +120,7 @@ diff --git a/gdb/gdbsupport/common-exceptions.h b/gdb/gdbsupport/common-exceptio
 diff --git a/gdb/main.c b/gdb/main.c
 --- a/gdb/main.c
 +++ b/gdb/main.c
-@@ -447,6 +447,34 @@ struct cmdarg
+@@ -489,6 +489,34 @@ struct cmdarg
   char *string;
 };
 
@ -155,7 +155,7 @@ diff --git a/gdb/main.c b/gdb/main.c
 static void
 captured_main_1 (struct captured_main_args *context)
 {
-@@ -887,6 +915,8 @@ captured_main_1 (struct captured_main_args *context)
+@@ -929,6 +957,8 @@ captured_main_1 (struct captured_main_args *context)
 	{
 	  symarg = argv[optind];
 	  execarg = argv[optind];
@ -164,7 +164,7 @@ diff --git a/gdb/main.c b/gdb/main.c
 	  optind++;
 	}
 
-@@ -1040,12 +1070,25 @@ captured_main_1 (struct captured_main_args *context)
+@@ -1085,12 +1115,25 @@ captured_main_1 (struct captured_main_args *context)
       && symarg != NULL
       && strcmp (execarg, symarg) == 0)
     {
--- a/gdb-6.6-buildid-locate-rpm-scl.patch
+++ b/gdb-6.6-buildid-locate-rpm-scl.patch
@ -98,7 +98,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -3472,6 +3472,16 @@ read_gdb_index_from_buffer (struct objfile *objfile,
+@@ -3494,6 +3494,16 @@ read_gdb_index_from_buffer (struct objfile *objfile,
      "set use-deprecated-index-sections on".  */
   if (version < 6 && !deprecated_ok)
     {
@ -115,7 +115,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
       static int warning_printed = 0;
       if (!warning_printed)
 	{
-@@ -3483,6 +3493,10 @@ to use the section anyway."),
+@@ -3505,6 +3515,10 @@ to use the section anyway."),
 	  warning_printed = 1;
 	}
       return 0;
--- a/gdb-6.6-buildid-locate-rpm.patch
+++ b/gdb-6.6-buildid-locate-rpm.patch
@ -682,9 +682,9 @@ diff --git a/gdb/config.in b/gdb/config.in
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 #undef ENABLE_NLS
-@@ -252,6 +255,9 @@
- /* Define if Python 2.7 is being used. */
- #undef HAVE_LIBPYTHON2_7
+@@ -246,6 +249,9 @@
+ /* Define if you have the mpfr library. */
+ #undef HAVE_LIBMPFR
 
 +/* Define if librpm library is being used. */
 +#undef HAVE_LIBRPM
@ -695,7 +695,7 @@ diff --git a/gdb/config.in b/gdb/config.in
 diff --git a/gdb/configure b/gdb/configure
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -751,6 +751,11 @@ CODESIGN_CERT
+@@ -756,6 +756,11 @@ CODESIGN_CERT
 HAVE_NATIVE_GCORE_TARGET
 TARGET_OBS
 subdirs
@ -707,7 +707,7 @@ diff --git a/gdb/configure b/gdb/configure
 GDB_DATADIR
 DEBUGDIR
 MAKEINFO_EXTRA_FLAGS
-@@ -854,6 +859,7 @@ with_gdb_datadir
+@@ -859,6 +864,7 @@ with_gdb_datadir
 with_relocated_sources
 with_auto_load_dir
 with_auto_load_safe_path
@ -715,7 +715,7 @@ diff --git a/gdb/configure b/gdb/configure
 enable_targets
 enable_64_bit_bfd
 enable_gdbmi
-@@ -913,6 +919,11 @@ CCC
+@@ -921,6 +927,11 @@ CCC
 CPP
 MAKEINFO
 MAKEINFOFLAGS
@ -727,7 +727,7 @@ diff --git a/gdb/configure b/gdb/configure
 YACC
 YFLAGS
 XMKMF'
-@@ -1585,6 +1596,8 @@ Optional Packages:
+@@ -1593,6 +1604,8 @@ Optional Packages:
                           [--with-auto-load-dir]
   --without-auto-load-safe-path
                           do not restrict auto-loaded files locations
@ -736,7 +736,7 @@ diff --git a/gdb/configure b/gdb/configure
   --with-libunwind-ia64   use libunwind frame unwinding for ia64 targets
   --with-curses           use the curses library instead of the termcap
                           library
-@@ -1642,6 +1655,13 @@ Some influential environment variables:
+@@ -1656,6 +1669,13 @@ Some influential environment variables:
   MAKEINFO    Parent configure detects if it is of sufficient version.
   MAKEINFOFLAGS
               Parameters for MAKEINFO.
@ -750,7 +750,7 @@ diff --git a/gdb/configure b/gdb/configure
   YACC        The `Yet Another Compiler Compiler' implementation to use.
               Defaults to the first program found out of: `bison -y', `byacc',
               `yacc'.
-@@ -6501,6 +6521,494 @@ _ACEOF
+@@ -6515,6 +6535,494 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_auto_load_safe_path" >&5
 $as_echo "$with_auto_load_safe_path" >&6; }
 
--- a/gdb-6.6-buildid-locate.patch
+++ b/gdb-6.6-buildid-locate.patch
@ -954,7 +954,7 @@ diff --git a/gdb/build-id.h b/gdb/build-id.h
 diff --git a/gdb/coffread.c b/gdb/coffread.c
 --- a/gdb/coffread.c
 +++ b/gdb/coffread.c
-@@ -710,7 +710,8 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
+@@ -709,7 +709,8 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
   /* Try to add separate debug file if no symbols table found.   */
   if (!objfile_has_partial_symbols (objfile))
     {
@ -1058,7 +1058,7 @@ diff --git a/gdb/corelow.c b/gdb/corelow.c
 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
 --- a/gdb/doc/gdb.texinfo
 +++ b/gdb/doc/gdb.texinfo
-@@ -20699,6 +20699,27 @@ information files.
+@@ -20830,6 +20830,27 @@ information files.
 
 @end table
 
@ -1111,7 +1111,7 @@ diff --git a/gdb/dwarf-index-cache.c b/gdb/dwarf-index-cache.c
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -2693,7 +2693,7 @@ dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile)
+@@ -2715,7 +2715,7 @@ dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile)
     }
 
   if (dwz_bfd == NULL)
@ -1120,7 +1120,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 
   if (dwz_bfd == NULL)
     error (_("could not find '.gnu_debugaltlink' file for %s"),
-@@ -6227,7 +6227,7 @@ get_gdb_index_contents_from_section (objfile *obj, T *section_owner)
+@@ -6273,7 +6273,7 @@ get_gdb_index_contents_from_section (objfile *obj, T *section_owner)
 static gdb::array_view<const gdb_byte>
 get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_objfile *dwarf2_obj)
 {
@ -1129,7 +1129,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
   if (build_id == nullptr)
     return {};
 
-@@ -6240,7 +6240,7 @@ get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_objfile *dwarf2_obj)
+@@ -6286,7 +6286,7 @@ get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_objfile *dwarf2_obj)
 static gdb::array_view<const gdb_byte>
 get_gdb_index_contents_from_cache_dwz (objfile *obj, dwz_file *dwz)
 {
@ -1141,7 +1141,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 diff --git a/gdb/elfread.c b/gdb/elfread.c
 --- a/gdb/elfread.c
 +++ b/gdb/elfread.c
-@@ -1298,7 +1298,9 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
+@@ -1299,7 +1299,9 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
 	   && objfile->separate_debug_objfile == NULL
 	   && objfile->separate_debug_objfile_backlink == NULL)
     {
@ -1152,7 +1152,7 @@ diff --git a/gdb/elfread.c b/gdb/elfread.c
 
       if (debugfile.empty ())
 	debugfile = find_separate_debug_file_by_debuglink (objfile);
-@@ -1310,8 +1312,12 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
+@@ -1311,8 +1313,12 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
 	  symbol_file_add_separate (debug_bfd.get (), debugfile.c_str (),
 				    symfile_flags, objfile);
 	}
@ -1340,7 +1340,7 @@ diff --git a/gdb/testsuite/gdb.base/new-ui-pending-input.exp b/gdb/testsuite/gdb
 diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
 --- a/gdb/testsuite/lib/gdb.exp
 +++ b/gdb/testsuite/lib/gdb.exp
-@@ -1841,6 +1841,17 @@ proc default_gdb_start { } {
+@@ -1891,6 +1891,17 @@ proc default_gdb_start { } {
 	}
     }
 
--- a/gdb-6.6-scheduler_locking-step-is-default.patch
+++ b/gdb-6.6-scheduler_locking-step-is-default.patch
@ -9,7 +9,7 @@ Subject: gdb-6.6-scheduler_locking-step-is-default.patch
 diff --git a/gdb/infrun.c b/gdb/infrun.c
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
-@@ -2063,7 +2063,7 @@ static const char *const scheduler_enums[] = {
+@@ -2057,7 +2057,7 @@ static const char *const scheduler_enums[] = {
   schedlock_replay,
   NULL
 };
--- a/gdb-6.8-quit-never-aborts.patch
+++ b/gdb-6.8-quit-never-aborts.patch
@ -30,7 +30,7 @@ diff --git a/gdb/defs.h b/gdb/defs.h
 diff --git a/gdb/extension.c b/gdb/extension.c
 --- a/gdb/extension.c
 +++ b/gdb/extension.c
-@@ -820,6 +820,11 @@ check_quit_flag (void)
+@@ -823,6 +823,11 @@ check_quit_flag (void)
   int i, result = 0;
   const struct extension_language_defn *extlang;
 
@ -45,7 +45,7 @@ diff --git a/gdb/extension.c b/gdb/extension.c
 diff --git a/gdb/top.c b/gdb/top.c
 --- a/gdb/top.c
 +++ b/gdb/top.c
-@@ -1664,7 +1664,13 @@ quit_force (int *exit_arg, int from_tty)
+@@ -1668,7 +1668,13 @@ quit_force (int *exit_arg, int from_tty)
 
   qt.from_tty = from_tty;
 
--- a/gdb-archer-pie-addons-keep-disabled.patch
+++ b/gdb-archer-pie-addons-keep-disabled.patch
@ -8,7 +8,7 @@ Subject: gdb-archer-pie-addons-keep-disabled.patch
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
-@@ -15377,6 +15377,50 @@ static struct cmd_list_element *enablebreaklist = NULL;
+@@ -15372,6 +15372,50 @@ static struct cmd_list_element *enablebreaklist = NULL;
 
 cmd_list_element *commands_cmd_element = nullptr;
 
@ -52,8 +52,8 @@ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
 +    }
 +
 +  if (changed)
-+    qsort (bp_locations, bp_locations_count, sizeof (*bp_locations),
-+	   bp_locations_compare);
+    std::sort (bp_locations, bp_locations + bp_locations_count,
+	       bp_location_is_less_than);
 +}
 +
 void
@ -75,7 +75,7 @@ diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
 diff --git a/gdb/objfiles.c b/gdb/objfiles.c
 --- a/gdb/objfiles.c
 +++ b/gdb/objfiles.c
-@@ -827,6 +827,11 @@ objfile_relocate1 (struct objfile *objfile,
+@@ -816,6 +816,11 @@ objfile_relocate1 (struct objfile *objfile,
 				obj_section_addr (s));
     }
 
--- a/gdb-archer-vla-tests.patch
+++ b/gdb-archer-vla-tests.patch
@ -8,7 +8,7 @@ Subject: gdb-archer-vla-tests.patch
 diff --git a/gdb/testsuite/gdb.ada/packed_array.exp b/gdb/testsuite/gdb.ada/packed_array.exp
 --- a/gdb/testsuite/gdb.ada/packed_array.exp
 +++ b/gdb/testsuite/gdb.ada/packed_array.exp
-@@ -56,5 +56,11 @@ gdb_test_multiple "$test" "$test" {
+@@ -53,5 +53,11 @@ gdb_test_multiple "$test" "$test" {
         # are.  Observed with (FSF GNU Ada 4.5.3 20110124).
         xfail $test
     }
--- a/gdb-attach-fail-reasons-5of5.patch
+++ b/gdb-attach-fail-reasons-5of5.patch
@ -45,7 +45,7 @@ gdb/gdbserver/
 diff --git a/gdb/config.in b/gdb/config.in
 --- a/gdb/config.in
 +++ b/gdb/config.in
-@@ -258,6 +258,9 @@
+@@ -252,6 +252,9 @@
 /* Define if librpm library is being used. */
 #undef HAVE_LIBRPM
 
@ -55,7 +55,7 @@ diff --git a/gdb/config.in b/gdb/config.in
 /* Define to 1 if you have the <libunwind-ia64.h> header file. */
 #undef HAVE_LIBUNWIND_IA64_H
 
-@@ -381,6 +384,9 @@
+@@ -378,6 +381,9 @@
 /* Define to 1 if you have the `scm_new_smob' function. */
 #undef HAVE_SCM_NEW_SMOB
 
@ -68,7 +68,7 @@ diff --git a/gdb/config.in b/gdb/config.in
 diff --git a/gdb/configure b/gdb/configure
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -15647,6 +15647,64 @@ cat >>confdefs.h <<_ACEOF
+@@ -15594,6 +15594,64 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
@ -136,7 +136,7 @@ diff --git a/gdb/configure b/gdb/configure
 diff --git a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -2016,6 +2016,10 @@ case $host_os in
+@@ -1964,6 +1964,10 @@ case $host_os in
 esac
 AC_DEFINE_UNQUOTED(GDBINIT,"$gdbinit",[The .gdbinit filename.])
 
@ -173,7 +173,7 @@ diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in
 diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
 --- a/gdb/gdbserver/configure
 +++ b/gdb/gdbserver/configure
-@@ -8525,6 +8525,64 @@ if $want_ipa ; then
+@@ -8522,6 +8522,64 @@ if $want_ipa ; then
    fi
 fi
 
@ -241,7 +241,7 @@ diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
 diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
 --- a/gdb/gdbserver/configure.ac
 +++ b/gdb/gdbserver/configure.ac
-@@ -469,6 +469,10 @@ if $want_ipa ; then
+@@ -465,6 +465,10 @@ if $want_ipa ; then
    fi
 fi
 
--- a/gdb-bz1219747-attach-kills.patch
+++ b/gdb-bz1219747-attach-kills.patch
@ -80,7 +80,7 @@ gdb/testsuite/ChangeLog
 diff --git a/gdb/main.c b/gdb/main.c
 --- a/gdb/main.c
 +++ b/gdb/main.c
-@@ -1125,7 +1125,10 @@ captured_main_1 (struct captured_main_args *context)
+@@ -1170,7 +1170,10 @@ captured_main_1 (struct captured_main_args *context)
 	{
 	  ret = catch_command_errors (attach_command, pid_or_core_arg,
 				      !batch_flag);
--- a/gdb-bz533176-fortran-omp-step.patch
+++ b/gdb-bz533176-fortran-omp-step.patch
@ -30,7 +30,7 @@ debugging problem of GOMP outside of the scope of this Bug.
 diff --git a/gdb/infrun.c b/gdb/infrun.c
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
-@@ -6460,6 +6460,16 @@ process_event_stop_test (struct execution_control_state *ecs)
+@@ -6454,6 +6454,16 @@ process_event_stop_test (struct execution_control_state *ecs)
 
       if (ecs->event_thread->control.step_over_calls == STEP_OVER_ALL)
 	{
@ -47,7 +47,7 @@ diff --git a/gdb/infrun.c b/gdb/infrun.c
 	  /* We're doing a "next".
 
 	     Normal (forward) execution: set a breakpoint at the
-@@ -6493,6 +6503,7 @@ process_event_stop_test (struct execution_control_state *ecs)
+@@ -6487,6 +6497,7 @@ process_event_stop_test (struct execution_control_state *ecs)
 
 	  keep_going (ecs);
 	  return;
--- a/gdb-container-rh-pkg.patch
+++ b/gdb-container-rh-pkg.patch
@ -9,7 +9,7 @@ Subject: gdb-container-rh-pkg.patch
 diff --git a/gdb/remote.c b/gdb/remote.c
 --- a/gdb/remote.c
 +++ b/gdb/remote.c
-@@ -13904,7 +13904,17 @@ remote_target::pid_to_exec_file (int pid)
+@@ -13891,7 +13891,17 @@ remote_target::pid_to_exec_file (int pid)
   char *annex = NULL;
 
   if (packet_support (PACKET_qXfer_exec_file) != PACKET_ENABLE)
--- a/gdb-core-open-vdso-warning.patch
+++ b/gdb-core-open-vdso-warning.patch
@ -27,7 +27,7 @@ diff --git a/gdb/testsuite/gdb.base/solib-symbol.exp b/gdb/testsuite/gdb.base/so
 
 if [get_compiler_info] {
     return -1
-@@ -72,8 +73,26 @@ gdb_test "br foo2" \
+@@ -71,8 +72,26 @@ gdb_test "br foo2" \
 	 "Breakpoint.*: foo2. .2 locations..*" \
 	 "foo2 in mdlib"
 
--- a/gdb-fedora-libncursesw.patch
+++ b/gdb-fedora-libncursesw.patch
@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1270534
 diff --git a/gdb/configure b/gdb/configure
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -9293,6 +9293,7 @@ if test x"$prefer_curses" = xyes; then
+@@ -9303,6 +9303,7 @@ if test x"$prefer_curses" = xyes; then
   # search /usr/local/include, if ncurses is installed in /usr/local.  A
   # default installation of ncurses on alpha*-dec-osf* will lead to such
   # a situation.
@ -20,7 +20,7 @@ diff --git a/gdb/configure b/gdb/configure
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing waddstr" >&5
 $as_echo_n "checking for library containing waddstr... " >&6; }
 if ${ac_cv_search_waddstr+:} false; then :
-@@ -9317,7 +9318,7 @@ return waddstr ();
+@@ -9327,7 +9328,7 @@ return waddstr ();
   return 0;
 }
 _ACEOF
@ -29,7 +29,7 @@ diff --git a/gdb/configure b/gdb/configure
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
-@@ -9391,6 +9392,7 @@ case $host_os in
+@@ -9401,6 +9402,7 @@ case $host_os in
 esac
 
 # These are the libraries checked by Readline.
@ -37,7 +37,7 @@ diff --git a/gdb/configure b/gdb/configure
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
 $as_echo_n "checking for library containing tgetent... " >&6; }
 if ${ac_cv_search_tgetent+:} false; then :
-@@ -9415,7 +9417,7 @@ return tgetent ();
+@@ -9425,7 +9427,7 @@ return tgetent ();
   return 0;
 }
 _ACEOF
@ -49,7 +49,7 @@ diff --git a/gdb/configure b/gdb/configure
 diff --git a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -721,7 +721,8 @@ if test x"$prefer_curses" = xyes; then
+@@ -717,7 +717,8 @@ if test x"$prefer_curses" = xyes; then
   # search /usr/local/include, if ncurses is installed in /usr/local.  A
   # default installation of ncurses on alpha*-dec-osf* will lead to such
   # a situation.
@ -59,7 +59,7 @@ diff --git a/gdb/configure.ac b/gdb/configure.ac
 
   if test "$ac_cv_search_waddstr" != no; then
     curses_found=yes
-@@ -763,7 +764,8 @@ case $host_os in
+@@ -759,7 +760,8 @@ case $host_os in
 esac
 
 # These are the libraries checked by Readline.
--- a/gdb-gnat-dwarf-crash-3of3.patch
+++ b/gdb-gnat-dwarf-crash-3of3.patch
@ -42,7 +42,7 @@ gdb/
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -10608,6 +10608,13 @@ private:
+@@ -10654,6 +10654,13 @@ private:
 static void
 process_die (struct die_info *die, struct dwarf2_cu *cu)
 {
@ -59,7 +59,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 diff --git a/gdb/infrun.c b/gdb/infrun.c
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
-@@ -608,6 +608,13 @@ holding the child stopped.  Try \"set detach-on-fork\" or \
+@@ -602,6 +602,13 @@ holding the child stopped.  Try \"set detach-on-fork\" or \
 				target_pid_to_str (process_ptid).c_str ());
 	    }
 
--- a/gdb-jit-reader-multilib.patch
+++ b/gdb-jit-reader-multilib.patch
@ -9,7 +9,7 @@ Subject: gdb-jit-reader-multilib.patch
 diff --git a/gdb/configure b/gdb/configure
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -9612,10 +9612,12 @@ _ACEOF
+@@ -9622,10 +9622,12 @@ _ACEOF
 
 
 
@ -28,7 +28,7 @@ diff --git a/gdb/configure b/gdb/configure
 diff --git a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -812,10 +812,12 @@ AC_CHECK_SIZEOF(unsigned long long)
+@@ -808,10 +808,12 @@ AC_CHECK_SIZEOF(unsigned long long)
 AC_CHECK_SIZEOF(unsigned long)
 AC_CHECK_SIZEOF(unsigned __int128)
 
--- a/gdb-linux_perf-bundle.patch
+++ b/gdb-linux_perf-bundle.patch
@ -9,7 +9,7 @@ Subject: gdb-linux_perf-bundle.patch
 diff --git a/gdb/configure b/gdb/configure
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -11887,7 +11887,7 @@ else
+@@ -11833,7 +11833,7 @@ else
 
 #include <linux/perf_event.h>
 #ifndef PERF_ATTR_SIZE_VER5
@ -21,7 +21,7 @@ diff --git a/gdb/configure b/gdb/configure
 diff --git a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -1466,7 +1466,7 @@ else
+@@ -1414,7 +1414,7 @@ else
   AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
 #include <linux/perf_event.h>
 #ifndef PERF_ATTR_SIZE_VER5
--- a/gdb-moribund-utrace-workaround.patch
+++ b/gdb-moribund-utrace-workaround.patch
@ -14,7 +14,7 @@ Bug in FSF GDB exploited by the ptrace-on-utrace interaction.
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
-@@ -11877,6 +11877,8 @@ update_global_location_list (enum ugll_insert_mode insert_mode)
+@@ -11872,6 +11872,8 @@ update_global_location_list (enum ugll_insert_mode insert_mode)
 		 traps we can no longer explain.  */
 
 	      old_loc->events_till_retirement = 3 * (thread_count () + 1);
--- a/gdb-readline62-ask-more-rh.patch
+++ b/gdb-readline62-ask-more-rh.patch
@ -1,25 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-readline62-ask-more-rh.patch
-
-;; Work around readline-6.2 incompatibility not asking for --more-- (BZ 701131).
-;;=fedora
-
-diff --git a/gdb/event-top.c b/gdb/event-top.c
--- a/gdb/event-top.c
-+++ b/gdb/event-top.c
-@@ -1178,6 +1178,13 @@ gdb_setup_readline (int editing)
- {
-   struct ui *ui = current_ui;
- 
-+#ifdef NEED_RL_STATE_FEDORA_GDB
-+  /* 6.2 regression: no longed asks for --more--
-+     gdb.base/readline-ask.exp
-+     https://bugzilla.redhat.com/show_bug.cgi?id=701131  */
-+  RL_SETSTATE (RL_STATE_FEDORA_GDB);
-+#endif
-+
-   /* This function is a noop for the sync case.  The assumption is
-      that the sync setup is ALL done in gdb_init, and we would only
-      mess it up here.  The sync stuff should really go away over
--- a/gdb-vla-intel-fortran-strides.patch
+++ b/gdb-vla-intel-fortran-strides.patch
@ -37,7 +37,7 @@ dbfd7140bf4c0500d1f5d192be781f83f78f7922
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -17890,7 +17890,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17935,7 +17935,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
   struct type *base_type, *orig_base_type;
   struct type *range_type;
   struct attribute *attr;
@ -46,7 +46,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
   int low_default_is_valid;
   int high_bound_is_count = 0;
   const char *name;
-@@ -17911,7 +17911,9 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17956,7 +17956,9 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
 
   low.kind = PROP_CONST;
   high.kind = PROP_CONST;
@ -56,7 +56,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 
   /* Set LOW_DEFAULT_IS_VALID if current language and DWARF version allow
      omitting DW_AT_lower_bound.  */
-@@ -17944,6 +17946,14 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17989,6 +17991,14 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
       break;
     }
 
@ -71,7 +71,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
   attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
   if (attr)
     attr_to_dynamic_prop (attr, die, cu, &low, base_type);
-@@ -18002,7 +18012,8 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -18047,7 +18057,8 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
       && !TYPE_UNSIGNED (base_type) && (high.data.const_val & negative_mask))
     high.data.const_val |= negative_mask;
 
@ -483,7 +483,7 @@ diff --git a/gdb/eval.c b/gdb/eval.c
 
 	case TYPE_CODE_PTR:
 	case TYPE_CODE_FUNC:
-@@ -2381,49 +2638,6 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -2388,49 +2645,6 @@ evaluate_subexp_standard (struct type *expect_type,
 	}
       return (arg1);
 
@ -533,7 +533,7 @@ diff --git a/gdb/eval.c b/gdb/eval.c
     case BINOP_LOGICAL_AND:
       arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
       if (noside == EVAL_SKIP)
-@@ -3343,6 +3557,9 @@ calc_f77_array_dims (struct type *array_type)
+@@ -3350,6 +3564,9 @@ calc_f77_array_dims (struct type *array_type)
   int ndimen = 1;
   struct type *tmp_type;
 
--- a/gdb-vla-intel-fortran-vla-strings.patch
+++ b/gdb-vla-intel-fortran-vla-strings.patch
@ -33,7 +33,7 @@ git diff --stat -p gdb/master...gdb/users/bheckel/fortran-vla-strings
 diff --git a/gdb/NEWS b/gdb/NEWS
 --- a/gdb/NEWS
 +++ b/gdb/NEWS
-@@ -701,6 +701,8 @@ SH-5/SH64 running OpenBSD 	SH-5/SH64 support in sh*-*-openbsd*
+@@ -745,6 +745,8 @@ SH-5/SH64 running OpenBSD 	SH-5/SH64 support in sh*-*-openbsd*
 
 *** Changes in GDB 8.1
 
@ -77,7 +77,7 @@ diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -1805,7 +1805,10 @@ static void read_signatured_type (struct signatured_type *);
+@@ -1827,7 +1827,10 @@ static void read_signatured_type (struct signatured_type *);
 
 static int attr_to_dynamic_prop (const struct attribute *attr,
 				 struct die_info *die, struct dwarf2_cu *cu,
@ -89,7 +89,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 
 /* memory allocation interface */
 
-@@ -13747,7 +13750,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -13793,7 +13796,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
       newobj->static_link
 	= XOBNEW (&objfile->objfile_obstack, struct dynamic_prop);
       attr_to_dynamic_prop (attr, die, cu, newobj->static_link,
@ -98,7 +98,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
     }
 
   cu->list_in_scope = cu->get_builder ()->get_local_symbols ();
-@@ -16509,7 +16512,7 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -16554,7 +16557,7 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
       byte_stride_prop
 	= (struct dynamic_prop *) alloca (sizeof (struct dynamic_prop));
       stride_ok = attr_to_dynamic_prop (attr, die, cu, byte_stride_prop,
@ -107,7 +107,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
       if (!stride_ok)
 	{
 	  complaint (_("unable to read array DW_AT_byte_stride "
-@@ -17267,29 +17270,90 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17312,29 +17315,90 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
   struct gdbarch *gdbarch = get_objfile_arch (objfile);
   struct type *type, *range_type, *index_type, *char_type;
   struct attribute *attr;
@ -209,7 +209,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
   char_type = language_string_char_type (cu->language_defn, gdbarch);
   type = create_string_type (NULL, char_type, range_type);
 
-@@ -17722,7 +17786,8 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17767,7 +17831,8 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu)
 static int
 attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
 		      struct dwarf2_cu *cu, struct dynamic_prop *prop,
@ -219,7 +219,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 {
   struct dwarf2_property_baton *baton;
   struct obstack *obstack
-@@ -17741,9 +17806,30 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
+@@ -17786,9 +17851,30 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
       baton->locexpr.size = DW_BLOCK (attr)->size;
       baton->locexpr.data = DW_BLOCK (attr)->data;
       baton->locexpr.is_reference = false;
@ -251,7 +251,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
     }
   else if (attr_form_is_ref (attr))
     {
-@@ -17776,9 +17862,29 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
+@@ -17821,9 +17907,29 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
 		baton = XOBNEW (obstack, struct dwarf2_property_baton);
 		baton->property_type = die_type (target_die, target_cu);
 		baton->locexpr.per_cu = cu->per_cu;
@ -283,7 +283,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 		prop->data.baton = baton;
 		prop->kind = PROP_LOCEXPR;
 		gdb_assert (prop->data.baton != NULL);
-@@ -17948,7 +18054,8 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17993,7 +18099,8 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
 
   attr = dwarf2_attr (die, DW_AT_byte_stride, cu);
   if (attr)
@ -293,7 +293,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
         complaint (_("Missing DW_AT_byte_stride "
 		     "- DIE at 0x%s [in module %s]"),
 		   sect_offset_str (die->sect_off),
-@@ -17956,7 +18063,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -18001,7 +18108,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
 
   attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
   if (attr)
@ -302,7 +302,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
   else if (!low_default_is_valid)
     complaint (_("Missing DW_AT_lower_bound "
 				      "- DIE at %s [in module %s]"),
-@@ -17965,10 +18072,10 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -18010,10 +18117,10 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
 
   struct attribute *attr_ub, *attr_count;
   attr = attr_ub = dwarf2_attr (die, DW_AT_upper_bound, cu);
@ -315,7 +315,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 	{
 	  /* If bounds are constant do the final calculation here.  */
 	  if (low.kind == PROP_CONST && high.kind == PROP_CONST)
-@@ -25679,7 +25786,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -25736,7 +25843,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
     {
       struct type *prop_type
 	= dwarf2_per_cu_addr_sized_int_type (cu->per_cu, false);
@ -324,7 +324,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
         add_dyn_prop (DYN_PROP_ALLOCATED, prop, type);
     }
   else if (attr != NULL)
-@@ -25695,7 +25802,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -25752,7 +25859,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
     {
       struct type *prop_type
 	= dwarf2_per_cu_addr_sized_int_type (cu->per_cu, false);
@ -333,7 +333,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
         add_dyn_prop (DYN_PROP_ASSOCIATED, prop, type);
     }
   else if (attr != NULL)
-@@ -25708,7 +25815,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -25765,7 +25872,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
   /* Read DW_AT_data_location and set in type.  */
   attr = dwarf2_attr (die, DW_AT_data_location, cu);
   if (attr_to_dynamic_prop (attr, die, cu, &prop,
@ -345,7 +345,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
 --- a/gdb/f-typeprint.c
 +++ b/gdb/f-typeprint.c
-@@ -198,15 +198,14 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
+@@ -197,15 +197,14 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
 	print_rank_only = true;
       else if ((TYPE_ASSOCIATED_PROP (type)
 		&& PROP_CONST != TYPE_DYN_PROP_KIND (TYPE_ASSOCIATED_PROP (type)))
@ -369,7 +369,7 @@ diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
 
       if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ARRAY)
 	f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0,
-@@ -218,8 +217,9 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
+@@ -217,8 +216,9 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
       else
 	{
 	  LONGEST lower_bound = f77_get_lowerbound (type);
@ -380,7 +380,7 @@ diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
 
 	  /* Make sure that, if we have an assumed size array, we
 	       print out a warning and print the upperbound as '*'.  */
-@@ -230,7 +230,7 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
+@@ -229,7 +229,7 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
 	    {
 	      LONGEST upper_bound = f77_get_upperbound (type);
 
@ -389,7 +389,7 @@ diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
 	    }
 	}
 
-@@ -250,7 +250,7 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
+@@ -249,7 +249,7 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
     case TYPE_CODE_REF:
       f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 1, 0,
 				   arrayprint_recurse_level, false);
--- a/gdb-vla-intel-tests.patch
+++ b/gdb-vla-intel-tests.patch
@ -339,7 +339,7 @@ diff --git a/gdb/testsuite/gdb.fortran/whatis_type.exp b/gdb/testsuite/gdb.fortr
 
 gdb_test "ptype t1" \
   [multi_line "type = Type t1" \
-@@ -75,4 +75,4 @@ gdb_test "ptype t3p" \
+@@ -73,4 +73,4 @@ gdb_test "ptype t3p" \
   [multi_line "type = PTR TO -> \\( Type t3" \
               "    $int :: t3_i" \
               "    Type t2 :: t2_n" \
--- a/gdb.spec
+++ b/gdb.spec
@ -27,7 +27,7 @@
 Name: %{?scl_prefix}gdb

 # Freeze it when GDB gets branched
-%global snapsrc    20191018
+%global snapsrc    20191119
 # See timestamp of source gnulib installed into gdb/gnulib/ .
 %global snapgnulib 20161115
 %global tarname gdb-%{version}
@ -35,7 +35,7 @@ Version: 9.0.50.%{snapsrc}

 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 1%{?dist}
+Release: 2%{?dist}

 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
 # Do not provide URL for snapshots as the file lasts there only for 2 days.
@ -503,9 +503,9 @@ rm -f gdb/doc/*.info-*
 # RL_STATE_FEDORA_GDB would not be found for:
 # Patch642: gdb-readline62-ask-more-rh.patch
 # --with-system-readline
-mv -f readline/doc readline-doc
-rm -rf readline/*
-mv -f readline-doc readline/doc
+mv -f readline/readline/doc readline-doc
+rm -rf readline/readline/*
+mv -f readline-doc readline/readline/doc
 %endif # 0%{!?rhel:1} || 0%{?rhel} > 6

 rm -rf zlib texinfo
@ -1146,6 +1146,12 @@ fi
 %endif

 %changelog
+* Tue Nov 19 2019 Sergio Durigan Junior <sergiodj@redhat.com> - 9.0.50.20191119-2
+- Rebase to FSF GDB 9.0.50.20191119 (9.1pre).
+- Drop 'gdb-readline62-ask-more-rh.patch'.
+- Drop 'gdb-6.5-bz216711-clone-is-outermost.patch'.
+- Adjust 'gdb-archer-pie-addons-keep-disabled.patch'.
+
 * Fri Oct 18 2019 Sergio Durigan Junior <sergiodj@redhat.com> - 9.0.50.20191018-1
 - Rebase to FSF GDB 9.0.50.20191018 (9.1pre).
 - Expand comment on "bundled(binutils)".
--- a/2
+++ b/2
@ -1,3 +1,3 @@
 SHA512 (gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz) = a8b1c54dd348cfeb37da73f968742896be3dd13a4215f8d8519870c2abea915f5176c3fa6989ddd10f20020a16f0fab20cbae68ee8d58a82234d8778023520f8
 SHA512 (v2.0.1.tar.gz) = e38e93908c3fbf1f2384cfca381eaf4bf667033de678041bd440adac8bbce4757b77304868896256ed72c202ee22ba1646aada90125029f14f5bffaf828a7df4
-SHA512 (gdb-9.0.50.20191018.tar.xz) = a0fdf66d42f766c468b6a084c0e716a39fc28afd60227e95e15b0a1aa19fe132d17f7ec2ba6fb9ad296e3e140561835896ccdac48507c31fae498341bc397e93
+SHA512 (gdb-9.0.50.20191119.tar.xz) = 1163bc264580fcb3896ad2868da1e1e715e9b1fbfd03e007168e173d50f76e9592a65d3f1bd11957cdd41d87587c9db8c5681cdce989a2257d4cb61f9b4587d4