Rebase to FSF GDB 10.2.

Drop gdb-6.3-test-pie-20050107.patch. Drop gdb-6.3-test-self-20050110.patch. Drop gdb-6.5-bz218379-ppc-solib-trampoline-test.patch. Drop gdb-6.6-buildid-locate-core-as-arg.patch. Drop gdb-6.8-quit-never-aborts.patch. Drop gdb-archer-pie-addons-keep-disabled.patch. Drop gdb-archer-pie-addons.patch. Drop gdb-archer-vla-tests.patch. Drop gdb-archer.patch. Drop gdb-attach-fail-reasons-5of5.patch. Drop gdb-btrobust.patch. Drop gdb-bz1219747-attach-kills.patch. Drop gdb-bz533176-fortran-omp-step.patch. Drop gdb-dts-rhel6-python-compat.patch. Drop gdb-gnat-dwarf-crash-3of3.patch. Drop gdb-jit-reader-multilib.patch. Drop gdb-moribund-utrace-workaround.patch. Drop gdb-rhbz1930528-fix-gnulib-build-error.patch. Drop gdb-rhbz1932645-aarch64-ptrace-header-order.patch. Drop gdb-vla-intel-fix-print-char-array.patch. Drop gdb-vla-intel-fortran-strides.patch. Drop gdb-vla-intel-stringbt-fix.patch. Drop gdb-vla-intel-tests.patch. Drop process_psymtab_comp_unit-type-unit.patch. Drop gdb-testsuite-readline63-sigint-revert.patch. Drop gdb-config.patch. Add following upstream patches for Fortran stride / slice support: gdb-rhbz1964167-convert-enum-range_type.patch gdb-rhbz1964167-fortran-array-slices-at-prompt.patch gdb-rhbz1964167-fortran-array-strides-in-expressions.patch gdb-rhbz1964167-fortran-clean-up-array-expression-evaluation.patch gdb-rhbz1964167-fortran-range_type-to-range_flag.patch gdb-rhbz1964167-fortran-whitespace_array.patch gdb-rhbz1964167-move-fortran-expr-handling.patch
2021-06-06 14:54:47 -07:00 · 2021-06-06 14:54:47 -07:00 · ca26ddfa99
commit ca26ddfa99
parent 6b2d2db242
44 changed files with 4887 additions and 10425 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,4 @@
-/binutils-gdb
+/new-fedora-release
 /gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz
 /gdb-10.1.tar.xz
 /v2.0.4.tar.gz
 /gdb-10.2.tar.xz
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@ -2,370 +2,300 @@
 #=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+jan
 Patch003: gdb-vla-intel-stringbt-fix.patch
 # Add a wrapper script to GDB that implements pstack using the
 # --readnever option.
 #=push
-Patch004: gdb-6.3-gstack-20050411.patch
+Patch002: gdb-6.3-gstack-20050411.patch
 # VSYSCALL and PIE
 #=fedoratest
 Patch005: gdb-6.3-test-pie-20050107.patch
 # Get selftest working with sep-debug-info
 #=fedoratest
 Patch006: gdb-6.3-test-self-20050110.patch
 # Test support of multiple destructors just like multiple constructors
 #=fedoratest
-Patch007: gdb-6.3-test-dtorfix-20050121.patch
+Patch003: gdb-6.3-test-dtorfix-20050121.patch
 # Fix to support executable moving
 #=fedoratest
-Patch008: gdb-6.3-test-movedir-20050125.patch
+Patch004: gdb-6.3-test-movedir-20050125.patch
 # Test sibling threads to set threaded watchpoints for x86 and x86-64
 #=fedoratest
-Patch009: gdb-6.3-threaded-watchpoints2-20050225.patch
+Patch005: gdb-6.3-threaded-watchpoints2-20050225.patch
 # Notify observers that the inferior has been created
 #=fedoratest
-Patch010: gdb-6.3-inferior-notification-20050721.patch
+Patch006: gdb-6.3-inferior-notification-20050721.patch
 # Verify printing of inherited members test
 #=fedoratest
-Patch011: gdb-6.3-inheritancetest-20050726.patch
+Patch007: gdb-6.3-inheritancetest-20050726.patch
 # Support TLS symbols (+`errno' suggestion if no pthread is found) (BZ 185337).
 #=push+jan: It should be replaced by Infinity project.
-Patch012: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
+Patch008: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
 # Fix TLS symbols resolving for shared libraries with a relative pathname.
 # The testsuite needs `gdb-6.5-tls-of-separate-debuginfo.patch'.
 #=fedoratest: One should recheck if it is really fixed upstream.
-Patch013: gdb-6.5-sharedlibrary-path.patch
+Patch009: gdb-6.5-sharedlibrary-path.patch
 # Improved testsuite results by the testsuite provided by the courtesy of BEA.
 #=fedoratest: For upstream it should be rewritten as a dejagnu test, the test of no "??" was useful.
-Patch014: gdb-6.5-BEA-testsuite.patch
+Patch010: gdb-6.5-BEA-testsuite.patch
 # Testcase for deadlocking on last address space byte; for corrupted backtraces.
 #=fedoratest
-Patch015: gdb-6.5-last-address-space-byte-test.patch
+Patch011: gdb-6.5-last-address-space-byte-test.patch
 # Fix readline segfault on excessively long hand-typed lines.
 #=fedoratest
-Patch016: gdb-6.5-readline-long-line-crash-test.patch
+Patch012: gdb-6.5-readline-long-line-crash-test.patch
 # Test sideeffects of skipping ppc .so libs trampolines (BZ 218379).
 #=fedoratest
-Patch017: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
+Patch013: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
 # Fix lockup on trampoline vs. its function lookup; unreproducible (BZ 218379).
 #=fedora
 Patch018: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
 # Find symbols properly at their original (included) file (BZ 109921).
 #=fedoratest
-Patch019: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
+Patch014: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
 # Update PPC unwinding patches to their upstream variants (BZ 140532).
 #=fedoratest
-Patch020: gdb-6.3-bz140532-ppc-unwinding-test.patch
+Patch015: gdb-6.3-bz140532-ppc-unwinding-test.patch
 # Testcase for exec() from threaded program (BZ 202689).
 #=fedoratest
-Patch021: gdb-6.3-bz202689-exec-from-pthread-test.patch
+Patch016: gdb-6.3-bz202689-exec-from-pthread-test.patch
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 #=fedoratest
-Patch022: gdb-6.6-bz230000-power6-disassembly-test.patch
+Patch017: gdb-6.6-bz230000-power6-disassembly-test.patch
 # Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
 #=fedoratest
-Patch023: gdb-6.6-bz229517-gcore-without-terminal.patch
+Patch018: gdb-6.6-bz229517-gcore-without-terminal.patch
 # Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
 #=fedoratest
-Patch024: gdb-6.6-testsuite-timeouts.patch
+Patch019: gdb-6.6-testsuite-timeouts.patch
 # Support for stepping over PPC atomic instruction sequences (BZ 237572).
 #=fedoratest
-Patch025: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
+Patch020: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
 # Test kernel VDSO decoding while attaching to an i386 process.
 #=fedoratest
-Patch026: gdb-6.3-attach-see-vdso-test.patch
+Patch021: gdb-6.3-attach-see-vdso-test.patch
 # Test leftover zombie process (BZ 243845).
 #=fedoratest
-Patch027: gdb-6.5-bz243845-stale-testing-zombie-test.patch
+Patch022: gdb-6.5-bz243845-stale-testing-zombie-test.patch
 # New locating of the matching binaries from the pure core file (build-id).
 #=push+jan
-Patch028: gdb-6.6-buildid-locate.patch
+Patch023: gdb-6.6-buildid-locate.patch
 # Fix loading of core files without build-ids but with build-ids in executables.
 # Load strictly build-id-checked core files only if no executable is specified
 # (Jan Kratochvil, RH BZ 1339862).
 #=push+jan
-Patch029: gdb-6.6-buildid-locate-solib-missing-ids.patch
+Patch024: gdb-6.6-buildid-locate-solib-missing-ids.patch
 #=push+jan
-Patch030: gdb-6.6-buildid-locate-rpm.patch
+Patch025: gdb-6.6-buildid-locate-rpm.patch
 # Fix displaying of numeric char arrays as strings (BZ 224128).
 #=fedoratest: But it is failing anyway, one should check the behavior more.
-Patch031: gdb-6.7-charsign-test.patch
+Patch026: gdb-6.7-charsign-test.patch
 # Test PPC hiding of call-volatile parameter register.
 #=fedoratest
-Patch032: gdb-6.7-ppc-clobbered-registers-O2-test.patch
+Patch027: gdb-6.7-ppc-clobbered-registers-O2-test.patch
 # Testsuite fixes for more stable/comparable results.
 #=fedoratest
-Patch033: gdb-6.7-testsuite-stable-results.patch
+Patch028: gdb-6.7-testsuite-stable-results.patch
 # Test ia64 memory leaks of the code using libunwind.
 #=fedoratest
-Patch034: gdb-6.5-ia64-libunwind-leak-test.patch
+Patch029: gdb-6.5-ia64-libunwind-leak-test.patch
 # Test hiding unexpected breakpoints on intentional step commands.
 #=fedoratest
-Patch035: gdb-6.5-missed-trap-on-step-test.patch
+Patch030: gdb-6.5-missed-trap-on-step-test.patch
 # Test gcore memory and time requirements for large inferiors.
 #=fedoratest
-Patch036: gdb-6.5-gcore-buffer-limit-test.patch
+Patch031: gdb-6.5-gcore-buffer-limit-test.patch
 # Test GCORE for shmid 0 shared memory mappings.
 #=fedoratest: But it is broken anyway, sometimes the case being tested is not reproducible.
-Patch037: gdb-6.3-mapping-zero-inode-test.patch
+Patch032: gdb-6.3-mapping-zero-inode-test.patch
 # Test a crash on `focus cmd', `focus prev' commands.
 #=fedoratest
-Patch038: gdb-6.3-focus-cmd-prev-test.patch
+Patch033: gdb-6.3-focus-cmd-prev-test.patch
 # Test various forms of threads tracking across exec() (BZ 442765).
 #=fedoratest
-Patch039: gdb-6.8-bz442765-threaded-exec-test.patch
+Patch034: gdb-6.8-bz442765-threaded-exec-test.patch
 # Test a crash on libraries missing the .text section.
 #=fedoratest
-Patch040: gdb-6.5-section-num-fixup-test.patch
+Patch035: gdb-6.5-section-num-fixup-test.patch
 # Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 #=fedoratest
-Patch041: gdb-6.8-bz466901-backtrace-full-prelinked.patch
+Patch036: gdb-6.8-bz466901-backtrace-full-prelinked.patch
 # New test for step-resume breakpoint placed in multiple threads at once.
 #=fedoratest
-Patch042: gdb-simultaneous-step-resume-breakpoint-test.patch
+Patch037: gdb-simultaneous-step-resume-breakpoint-test.patch
 # Fix GNU/Linux core open: Can't read pathname for load map: Input/output error.
 # Fix regression of undisplayed missing shared libraries caused by a fix for.
 #=fedoratest: It should be in glibc: libc-alpha: <20091004161706.GA27450@.*>
-Patch043: gdb-core-open-vdso-warning.patch
+Patch038: gdb-core-open-vdso-warning.patch
 # Fix stepping with OMP parallel Fortran sections (BZ 533176).
 #=push+jan: It requires some better DWARF annotations.
 Patch044: 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.
-Patch045: gdb-ccache-workaround.patch
+Patch039: gdb-ccache-workaround.patch
 #=push+jan: May get obsoleted by Tom's unrelocated objfiles patch.
 Patch046: gdb-archer-pie-addons.patch
 #=push+jan: Breakpoints disabling matching should not be based on address.
 Patch047: gdb-archer-pie-addons-keep-disabled.patch
 # Testcase for "Do not make up line information" fix by Daniel Jacobowitz.
 #=fedoratest
-Patch048: gdb-lineno-makeup-test.patch
+Patch040: gdb-lineno-makeup-test.patch
 # Test power7 ppc disassembly.
 #=fedoratest
-Patch049: gdb-ppc-power7-test.patch
+Patch041: 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.
 Patch050: gdb-moribund-utrace-workaround.patch
 # Fix follow-exec for C++ programs (bugreported by Martin Stransky).
 #=fedoratest
-Patch051: gdb-archer-next-over-throw-cxx-exec.patch
+Patch042: gdb-archer-next-over-throw-cxx-exec.patch
 # Backport DWARF-4 support (BZ 601887, Tom Tromey).
 #=fedoratest
-Patch052: gdb-bz601887-dwarf4-rh-test.patch
+Patch043: gdb-bz601887-dwarf4-rh-test.patch
 #=push+jan
 Patch053: gdb-6.6-buildid-locate-core-as-arg.patch
 # Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
 #=push+jan
-Patch054: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+Patch044: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
 #=fedoratest
-Patch055: gdb-test-bt-cfi-without-die.patch
+Patch045: gdb-test-bt-cfi-without-die.patch
 # Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
 #=fedoratest
-Patch056: gdb-bz634108-solib_address.patch
+Patch046: gdb-bz634108-solib_address.patch
 # New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435).
 #=fedoratest
-Patch057: gdb-test-pid0-core.patch
+Patch047: gdb-test-pid0-core.patch
 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch058: gdb-test-dw2-aranges.patch
+Patch048: gdb-test-dw2-aranges.patch
 # [archer-keiths-expr-cumulative+upstream] Import C++ testcases.
 #=fedoratest
-Patch059: gdb-test-expr-cumulative-archer.patch
+Patch049: gdb-test-expr-cumulative-archer.patch
 # Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
 #=fedoratest
-Patch060: gdb-physname-pr11734-test.patch
+Patch050: gdb-physname-pr11734-test.patch
 # Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
 #=fedoratest
-Patch061: gdb-physname-pr12273-test.patch
+Patch051: gdb-physname-pr12273-test.patch
 # Test GDB opcodes/ disassembly of Intel Ivy Bridge instructions (BZ 696890).
 #=fedoratest
-Patch062: gdb-test-ivy-bridge.patch
+Patch052: gdb-test-ivy-bridge.patch
 # Hack for proper PIE run of the testsuite.
 #=fedoratest
-Patch063: gdb-runtest-pie-override.patch
+Patch053: gdb-runtest-pie-override.patch
 # Print reasons for failed attach/spawn incl. SELinux deny_ptrace (BZ 786878).
 #=push+jan
 Patch064: gdb-attach-fail-reasons-5of5.patch
 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedoratest: Compatibility with RHELs (unchecked which ones).
-Patch065: gdb-glibc-strstr-workaround.patch
+Patch054: gdb-glibc-strstr-workaround.patch
 # Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789).
 #=fedoratest
-Patch066: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
+Patch055: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch067: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch056: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
 # Import regression test for `gdb/findvar.c:417: internal-error:
 # read_var_value: Assertion `frame' failed.' (RH BZ 947564) from RHEL 6.5.
 #=fedoratest
-Patch068: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch057: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
 # Fix crash of -readnow /usr/lib/debug/usr/bin/gnatbind.debug (BZ 1069211).
 #=push+jan
 Patch069: gdb-gnat-dwarf-crash-3of3.patch
 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch070: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch058: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
 # Fix 'gdb gives highly misleading error when debuginfo pkg is present,
 # but not corresponding binary pkg' (RH BZ 981154).
 #=push+jan
-Patch071: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch059: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 #=fedoratest
 Patch072: gdb-archer-vla-tests.patch
 #=fedoratest
 Patch073: gdb-vla-intel-tests.patch
 # Continue backtrace even if a frame filter throws an exception (Phil Muldoon).
 #=push
 Patch074: gdb-btrobust.patch
 # Display Fortran strings in backtraces.
 #=fedoratest
-Patch075: gdb-fortran-frame-string.patch
+Patch060: gdb-fortran-frame-string.patch
 # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 # crash.' (RH BZ 1156192).
 #=fedoratest
-Patch076: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch061: gdb-rhbz1156192-recursive-dlopen-test.patch
 # Fix jit-reader.h for multi-lib.
 #=push+jan
 Patch077: gdb-jit-reader-multilib.patch
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch078: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch062: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 # Fix 'backport GDB 7.4 fix to RHEL 6.6 GDB' [Original Sourceware bug
 # description: 'C++ (and objc): Internal error on unqualified name
 # re-set', PR 11657] (RH BZ 1186476).
 #=fedoratest
-Patch079: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+Patch063: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
 # Test 'info type-printers' Python error (RH BZ 1350436).
 #=fedoratest
-Patch080: gdb-rhbz1350436-type-printers-error.patch
+Patch064: gdb-rhbz1350436-type-printers-error.patch
 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch081: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch065: 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
 Patch082: gdb-bz1219747-attach-kills.patch
 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch083: gdb-fedora-libncursesw.patch
+Patch066: gdb-fedora-libncursesw.patch
 # Test clflushopt instruction decode (for RH BZ 1262471).
 #=fedoratest
-Patch084: gdb-opcodes-clflushopt-test.patch
+Patch067: gdb-opcodes-clflushopt-test.patch
 # [rhel6] DTS backward Python compatibility API (BZ 1020004, Phil Muldoon).
 #=fedora
 Patch085: gdb-dts-rhel6-python-compat.patch
 # [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
 #=push+jan
-Patch086: gdb-6.6-buildid-locate-rpm-scl.patch
+Patch068: 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 .
 Patch087: gdb-6.8-quit-never-aborts.patch
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch088: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch069: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch089: gdb-container-rh-pkg.patch
+Patch070: gdb-container-rh-pkg.patch
 # New test for Python "Cannot locate object file for block" (for RH BZ 1325795).
 #=fedoratest
-Patch090: gdb-rhbz1325795-framefilters-test.patch
+Patch071: gdb-rhbz1325795-framefilters-test.patch
 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch091: gdb-linux_perf-bundle.patch
+Patch072: gdb-linux_perf-bundle.patch
 # Fix gdb-headless /usr/bin/ executables (BZ 1390251).
 #
@ -374,57 +304,71 @@ Patch091: gdb-linux_perf-bundle.patch
 #
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #=fedora
-Patch092: gdb-libexec-add-index.patch
+Patch073: gdb-libexec-add-index.patch
 # New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
 #=fedoratest
-Patch093: gdb-rhbz1398387-tab-crash-test.patch
+Patch074: gdb-rhbz1398387-tab-crash-test.patch
 # Python patches of: http://sourceware.org/gdb/wiki/ProjectArcher
 #=push
 Patch094: gdb-archer.patch
 # Revert upstream commit 469412dd9ccc4de5874fd3299b105833f36b34cd
 Patch095: gdb-vla-intel-fix-print-char-array.patch
 # [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
 # =fedoratest
-Patch096: gdb-rhbz1553104-s390x-arch12-test.patch
+Patch075: gdb-rhbz1553104-s390x-arch12-test.patch
 # Fix off-by-one error in ada_fold_name.patch (RH BZ 1905996)
 # Upstream patch proposal: https://sourceware.org/pipermail/gdb-patches/2020-December/173935.html
 # =fedoratest
-Patch097: gdb-rhbz1905996-fix-off-by-one-error-in-ada_fold_name.patch
+Patch076: gdb-rhbz1905996-fix-off-by-one-error-in-ada_fold_name.patch
 # Backport fix for libstdc++ assert when performing tab completion
 # (RH BZ 1912985).
-Patch098: gdb-rhbz1912985-libstdc++-assert.patch
+Patch077: gdb-rhbz1912985-libstdc++-assert.patch
 # Backport fix for rawhide build error (RH BZ 1930528).
 Patch099: gdb-rhbz1930528-fix-gnulib-build-error.patch
 # [aarch64] Backport fix for aarch64-linux-hw-point.c build problem
 # (RH BZ 1932645).
 Patch100: gdb-rhbz1932645-aarch64-ptrace-header-order.patch
 # Backport fix for frame_id_p assertion failure (RH BZ 1909902).
-Patch101: gdb-rhbz1909902-frame_id_p-assert-1.patch
+Patch078: gdb-rhbz1909902-frame_id_p-assert-1.patch
 # Backport patch #2 which fixes a frame_id_p assertion failure (RH BZ 1909902).
-Patch102: gdb-rhbz1909902-frame_id_p-assert-2.patch
+Patch079: gdb-rhbz1909902-frame_id_p-assert-2.patch
 # Backport change which fixes gdbserver testing hang on f34 and rawhide.
-Patch103: gdb-rhbz1941080-fix-gdbserver-hang.patch
+Patch080: gdb-rhbz1941080-fix-gdbserver-hang.patch
 # Backport "Disable bracketed paste mode in GDB tests"
 # (Tom Tromey)
-Patch104: testing-custom-inputrc.patch
+Patch081: testing-custom-inputrc.patch
 # Backport "Handle DW_TAG_type_unit in process_symtab_unit"
 # (Tom de Vries)
 Patch105: process_psymtab_comp_unit-type-unit.patch
 # Backport "Save/restore file offset while reading notes in core file"
 # (Keith Seitz, RHBZ 1931344)
-Patch106: gdb-rhbz1931344-bfd_seek-elf_read_notes.patch
+Patch082: gdb-rhbz1931344-bfd_seek-elf_read_notes.patch
 # [fortran] Backport Andrew Burgess's commit which cleans up
 # array/string expression evaluation.
 Patch083: gdb-rhbz1964167-fortran-clean-up-array-expression-evaluation.patch
 # [fortran] Backport Andrew Burgess's commit which moves Fortran
 # expression handling to f-lang.c.
 Patch084: gdb-rhbz1964167-move-fortran-expr-handling.patch
 # [fortran] Backport Andrew Burgess's commit which eliminates undesirable
 # whitespace when printing arrays.
 Patch085: gdb-rhbz1964167-fortran-whitespace_array.patch
 # [fortran] Backport Andrew Burgess's commit which changes enum
 # range_type into a bit field enum.
 Patch086: gdb-rhbz1964167-convert-enum-range_type.patch
 # [fortran] Backport Andrew Burgess's commit which renames enum
 # range_type to enum range_flag.
 Patch087: gdb-rhbz1964167-fortran-range_type-to-range_flag.patch
 # [fortran] Backport Andrew Burgess's commit which adds support
 # for array strides in expressions.
 Patch088: gdb-rhbz1964167-fortran-array-strides-in-expressions.patch
 # [fortran] Backport Andrew Burgess's commit for Fortran array
 # slice support
 Patch089: gdb-rhbz1964167-fortran-array-slices-at-prompt.patch
 # [fortran] Backport Simon Marchi's commit which fixes a 32-bit build
 # problem in gdb/f-lang.c.
 Patch090: gdb-rhbz1964167-fortran-fix-type-format-mismatch-in-f-lang.c.patch
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@ -88,19 +88,3 @@
 %patch088 -p1
 %patch089 -p1
 %patch090 -p1
 %patch091 -p1
 %patch092 -p1
 %patch093 -p1
 %patch094 -p1
 %patch095 -p1
 %patch096 -p1
 %patch097 -p1
 %patch098 -p1
 %patch099 -p1
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
 %patch104 -p1
 %patch105 -p1
 %patch106 -p1
--- a/2
+++ b/2
@ -1 +1 @@
-606e3fd147ed9a00df165e46f30fe5c46dcda345
+ce35d7163e779b1321058b22f005c70ce1524b25
--- a/32
+++ b/32
@ -1,9 +1,5 @@
 gdb-6.3-rh-testversion-20041202.patch
 gdb-vla-intel-fortran-strides.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
@ -15,7 +11,6 @@ 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
@ -41,16 +36,11 @@ 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
@ -61,46 +51,40 @@ 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-rhbz1905996-fix-off-by-one-error-in-ada_fold_name.patch
 gdb-rhbz1912985-libstdc++-assert.patch
 gdb-rhbz1930528-fix-gnulib-build-error.patch
 gdb-rhbz1932645-aarch64-ptrace-header-order.patch
 gdb-rhbz1909902-frame_id_p-assert-1.patch
 gdb-rhbz1909902-frame_id_p-assert-2.patch
 gdb-rhbz1941080-fix-gdbserver-hang.patch
 testing-custom-inputrc.patch
 process_psymtab_comp_unit-type-unit.patch
 gdb-rhbz1931344-bfd_seek-elf_read_notes.patch
 gdb-rhbz1964167-fortran-clean-up-array-expression-evaluation.patch
 gdb-rhbz1964167-move-fortran-expr-handling.patch
 gdb-rhbz1964167-fortran-whitespace_array.patch
 gdb-rhbz1964167-convert-enum-range_type.patch
 gdb-rhbz1964167-fortran-range_type-to-range_flag.patch
 gdb-rhbz1964167-fortran-array-strides-in-expressions.patch
 gdb-rhbz1964167-fortran-array-slices-at-prompt.patch
 gdb-rhbz1964167-fortran-fix-type-format-mismatch-in-f-lang.c.patch
--- a/gdb-6.3-test-pie-20050107.patch
+++ b/gdb-6.3-test-pie-20050107.patch
--- a/gdb-6.3-test-self-20050110.patch
+++ b/gdb-6.3-test-self-20050110.patch
@ -1,42 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Elena Zannoni <ezannoni@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-test-self-20050110.patch
 ;; Get selftest working with sep-debug-info
 ;;=fedoratest
 2004-02-23  Elena Zannoni  <ezannoni@redhat.com>
        * gdb.gdb/selftest.exp: Make sure that the debug directory is
        set up properly.
        * gdb.gdb/complaints.exp: Ditto.
        * gdb.gdb/xfullpath.exp: Ditto.
        * gdb.gdb/observer.exp: Ditto.
 diff --git a/gdb/testsuite/lib/selftest-support.exp b/gdb/testsuite/lib/selftest-support.exp
 --- a/gdb/testsuite/lib/selftest-support.exp
 +++ b/gdb/testsuite/lib/selftest-support.exp
@@ -152,18 +152,18 @@ proc do_self_tests {function body} {
     }
     # Remove any old copy lying around.
 -    remote_file host delete $xgdb
 +    #remote_file host delete $xgdb
     gdb_start
 -    set file [remote_download host $GDB_FULLPATH $xgdb]
 +    #set file [remote_download host $GDB_FULLPATH $xgdb]
 -    set result [selftest_setup $file $function]
 +    set result [selftest_setup $GDB_FULLPATH $function]
     if {$result == 0} then {
 	set result [uplevel $body]
     }
     gdb_exit
 -    catch "remote_file host delete $file"
 +    #catch "remote_file host delete $file"
     if {$result < 0} then {
 	warning "Couldn't test self"
--- a/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
+++ b/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
@ -1,27 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
 ;; Fix lockup on trampoline vs. its function lookup; unreproducible (BZ 218379).
 ;;=fedora
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
 diff --git a/gdb/symtab.c b/gdb/symtab.c
 --- a/gdb/symtab.c
 +++ b/gdb/symtab.c
@@ -3169,6 +3169,13 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
 	     msymbol->linkage_name ()); */
 	  ;
 	/* fall through */
 +	/* `msymbol' trampoline may be located before its .text symbol
 +	   but this text symbol may be the address we were looking for.
 +	   Avoid `find_pc_sect_line'<->`find_pc_line' infinite loop.
 +	   Red Hat Bug 218379.  */
 +	else if (BMSYMBOL_VALUE_ADDRESS (mfunsym) == pc)
 +	  warning ("In stub for %s (0x%s); interlocked, please submit the binary to http://bugzilla.redhat.com", msymbol.minsym->linkage_name (), paddress (target_gdbarch (), pc));
 +	/* fall through */
 	else
 	  {
 	    /* Detect an obvious case of infinite recursion.  If this
--- a/gdb-6.6-buildid-locate-core-as-arg.patch
+++ b/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
 };
--- 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/dwarf2/read.c b/gdb/dwarf2/read.c
 --- a/gdb/dwarf2/read.c
 +++ b/gdb/dwarf2/read.c
-@@ -3022,6 +3022,16 @@ read_gdb_index_from_buffer (const char *filename,
+@@ -3034,6 +3034,16 @@ read_gdb_index_from_buffer (const char *filename,
      "set use-deprecated-index-sections on".  */
   if (version < 6 && !deprecated_ok)
     {
@ -115,7 +115,7 @@ diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
       static int warning_printed = 0;
       if (!warning_printed)
 	{
-@@ -3033,6 +3043,10 @@ to use the section anyway."),
+@@ -3045,6 +3055,10 @@ to use the section anyway."),
 	  warning_printed = 1;
 	}
       return 0;
--- a/gdb-6.6-buildid-locate.patch
+++ b/gdb-6.6-buildid-locate.patch
@ -1107,7 +1107,7 @@ diff --git a/gdb/dwarf2/index-cache.c b/gdb/dwarf2/index-cache.c
 diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
 --- a/gdb/dwarf2/read.c
 +++ b/gdb/dwarf2/read.c
-@@ -2215,7 +2215,7 @@ dwarf2_get_dwz_file (dwarf2_per_bfd *per_bfd)
+@@ -2225,7 +2225,7 @@ dwarf2_get_dwz_file (dwarf2_per_bfd *per_bfd)
     }
   if (dwz_bfd == NULL)
@ -1116,7 +1116,7 @@ diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
   if (dwz_bfd == nullptr)
     {
-@@ -5977,7 +5977,7 @@ get_gdb_index_contents_from_section (objfile *obj, T *section_owner)
+@@ -5989,7 +5989,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_bfd *dwarf2_per_bfd)
 {
@ -1125,7 +1125,7 @@ diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
   if (build_id == nullptr)
     return {};
-@@ -5990,7 +5990,7 @@ get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_bfd *dwarf2_per_bfd)
+@@ -6002,7 +6002,7 @@ get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_bfd *dwarf2_per_bfd)
 static gdb::array_view<const gdb_byte>
 get_gdb_index_contents_from_cache_dwz (objfile *obj, dwz_file *dwz)
 {
--- a/gdb-6.8-quit-never-aborts.patch
+++ b/gdb-6.8-quit-never-aborts.patch
@ -1,78 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.8-quit-never-aborts.patch
 ;; Make the GDB quit processing non-abortable to cleanup everything properly.
 ;;=fedora: It was useful only after gdb-6.8-attach-signalled-detach-stopped.patch .
 We may abort the process of detaching threads with multiple SIGINTs - which are
 being sent during a testcase terminating its child GDB.
 Some of the threads may not be properly PTRACE_DETACHed which hurts if they
 should have been detached with SIGSTOP (as they are accidentally left running
 on the debugger termination).
 diff --git a/gdb/defs.h b/gdb/defs.h
 --- a/gdb/defs.h
 +++ b/gdb/defs.h
@@ -177,6 +177,10 @@ extern void default_quit_handler (void);
 /* Flag that function quit should call quit_force.  */
 extern volatile int sync_quit_force_run;
 +#ifdef NEED_DETACH_SIGSTOP
 +extern int quit_flag_cleanup;
 +#endif
 +
 extern void quit (void);
 /* Helper for the QUIT macro.  */
 diff --git a/gdb/extension.c b/gdb/extension.c
 --- a/gdb/extension.c
 +++ b/gdb/extension.c
@@ -769,6 +769,11 @@ check_quit_flag (void)
 {
   int result = 0;
 +#ifdef NEED_DETACH_SIGSTOP
 +  if (quit_flag_cleanup)
 +    return 0;
 +#endif
 +
   for (const struct extension_language_defn *extlang : extension_languages)
     {
       if (extlang->ops != nullptr
 diff --git a/gdb/top.c b/gdb/top.c
 --- a/gdb/top.c
 +++ b/gdb/top.c
@@ -1770,7 +1770,13 @@ quit_force (int *exit_arg, int from_tty)
   else if (return_child_result)
     exit_code = return_child_result_value;
 +#ifndef NEED_DETACH_SIGSTOP
   /* We want to handle any quit errors and exit regardless.  */
 +#else
 +  /* We want to handle any quit errors and exit regardless but we should never
 +     get user-interrupted to properly detach the inferior.  */
 +  quit_flag_cleanup = 1;
 +#endif
   /* Get out of tfind mode, and kill or detach all inferiors.  */
   try
 diff --git a/gdb/utils.c b/gdb/utils.c
 --- a/gdb/utils.c
 +++ b/gdb/utils.c
@@ -103,6 +103,13 @@ static std::chrono::steady_clock::duration prompt_for_continue_wait_time;
 static bool debug_timestamp = false;
 +#ifdef NEED_DETACH_SIGSTOP
 +/* Nonzero means we are already processing the quitting cleanups and we should
 +   no longer get aborted.  */
 +
 +int quit_flag_cleanup;
 +#endif
 +
 /* True means that strings with character values >0x7F should be printed
    as octal escapes.  False means just print the value (e.g. it's an
    international character, and the terminal or window can cope.)  */
--- a/gdb-archer-pie-addons-keep-disabled.patch
+++ b/gdb-archer-pie-addons-keep-disabled.patch
@ -1,89 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-archer-pie-addons-keep-disabled.patch
 ;;=push+jan: Breakpoints disabling matching should not be based on address.
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
@@ -15431,6 +15431,50 @@ static struct cmd_list_element *enablebreaklist = NULL;
 cmd_list_element *commands_cmd_element = nullptr;
 +void
 +breakpoints_relocate (struct objfile *objfile, section_offsets &delta)
 +{
 +  struct bp_location *bl, **blp_tmp;
 +  int changed = 0;
 +
 +  gdb_assert (objfile->separate_debug_objfile_backlink == NULL);
 +
 +  ALL_BP_LOCATIONS (bl, blp_tmp)
 +    {
 +      struct obj_section *osect;
 +
 +      /* BL->SECTION can be correctly NULL for breakpoints with multiple
 +         locations expanded through symtab.  */
 +
 +      ALL_OBJFILE_OSECTIONS (objfile, osect)
 +	{
 +	  CORE_ADDR relocated_address;
 +	  CORE_ADDR delta_offset;
 +
 +	  delta_offset = delta[osect->the_bfd_section->index];
 +	  if (delta_offset == 0)
 +	    continue;
 +	  relocated_address = bl->address + delta_offset;
 +
 +	  if (obj_section_addr (osect) <= relocated_address
 +	      && relocated_address < obj_section_endaddr (osect))
 +	    {
 +	      if (bl->inserted)
 +		remove_breakpoint (bl);
 +
 +	      bl->address += delta_offset;
 +	      bl->requested_address += delta_offset;
 +
 +	      changed = 1;
 +	    }
 +	}
 +    }
 +
 +  if (changed)
 +    std::sort (bp_locations, bp_locations + bp_locations_count,
 +	       bp_location_is_less_than);
 +}
 +
 void _initialize_breakpoint ();
 void
 _initialize_breakpoint ()
 diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
 --- a/gdb/breakpoint.h
 +++ b/gdb/breakpoint.h
@@ -1691,6 +1691,9 @@ extern const char *ep_parse_optional_if_clause (const char **arg);
    UIOUT iff debugging multiple threads.  */
 extern void maybe_print_thread_hit_breakpoint (struct ui_out *uiout);
 +extern void breakpoints_relocate (struct objfile *objfile,
 +				  section_offsets &delta);
 +
 /* Print the specified breakpoint.  */
 extern void print_breakpoint (breakpoint *bp);
 diff --git a/gdb/objfiles.c b/gdb/objfiles.c
 --- a/gdb/objfiles.c
 +++ b/gdb/objfiles.c
@@ -742,6 +742,11 @@ objfile_relocate1 (struct objfile *objfile,
 				obj_section_addr (s));
     }
 +  /* Final call of breakpoint_re_set can keep breakpoint locations disabled if
 +     their addresses match.  */
 +  if (objfile->separate_debug_objfile_backlink == NULL)
 +    breakpoints_relocate (objfile, delta);
 +
   /* Data changed.  */
   return 1;
 }
--- a/gdb-archer-pie-addons.patch
+++ b/gdb-archer-pie-addons.patch
@ -1,39 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-archer-pie-addons.patch
 ;;=push+jan: May get obsoleted by Tom's unrelocated objfiles patch.
 diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
 --- a/gdb/gdbtypes.h
 +++ b/gdb/gdbtypes.h
@@ -649,6 +649,7 @@ enum field_loc_kind
   {
     FIELD_LOC_KIND_BITPOS,	/**< bitpos */
     FIELD_LOC_KIND_ENUMVAL,	/**< enumval */
 +    /* This address is unrelocated by the objfile's ANOFFSET.  */
     FIELD_LOC_KIND_PHYSADDR,	/**< physaddr */
     FIELD_LOC_KIND_PHYSNAME,	/**< physname */
     FIELD_LOC_KIND_DWARF_BLOCK	/**< dwarf_block */
@@ -699,6 +700,7 @@ union field_location
      field.  Otherwise, physname is the mangled label of the
      static field.  */
 +  /* This address is unrelocated by the objfile's ANOFFSET.  */
   CORE_ADDR physaddr;
   const char *physname;
 diff --git a/gdb/value.c b/gdb/value.c
 --- a/gdb/value.c
 +++ b/gdb/value.c
@@ -2850,7 +2850,8 @@ value_static_field (struct type *type, int fieldno)
     {
     case FIELD_LOC_KIND_PHYSADDR:
       retval = value_at_lazy (type->field (fieldno).type (),
 -			      TYPE_FIELD_STATIC_PHYSADDR (type, fieldno));
 +			      TYPE_FIELD_STATIC_PHYSADDR (type, fieldno)
 +			      + (TYPE_OBJFILE (type) == NULL ? 0 : TYPE_OBJFILE (type)->section_offsets[SECT_OFF_TEXT (TYPE_OBJFILE (type))]));
       break;
     case FIELD_LOC_KIND_PHYSNAME:
     {
--- a/gdb-archer-vla-tests.patch
+++ b/gdb-archer-vla-tests.patch
--- a/gdb-archer.patch
+++ b/gdb-archer.patch
@ -1,187 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-archer.patch
 ;; Python patches of: http://sourceware.org/gdb/wiki/ProjectArcher
 ;;=push
 http://sourceware.org/gdb/wiki/ProjectArcher
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 GIT snapshot:
 commit 718a1618b2f691a7f407213bb50f100ac59f91c3
 tromey/python
 diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
 --- a/gdb/data-directory/Makefile.in
 +++ b/gdb/data-directory/Makefile.in
@@ -80,6 +80,7 @@ PYTHON_FILE_LIST = \
 	gdb/unwinder.py \
 	gdb/xmethod.py \
 	gdb/command/__init__.py \
 +	gdb/command/ignore_errors.py \
 	gdb/command/explore.py \
 	gdb/command/backtrace.py \
 	gdb/command/frame_filters.py \
@@ -92,6 +93,7 @@ PYTHON_FILE_LIST = \
 	gdb/function/as_string.py \
 	gdb/function/caller_is.py \
 	gdb/function/strfns.py \
 +	gdb/function/in_scope.py \
 	gdb/printer/__init__.py \
 	gdb/printer/bound_registers.py
 diff --git a/gdb/gdb-gdb.gdb.in b/gdb/gdb-gdb.gdb.in
 --- a/gdb/gdb-gdb.gdb.in
 +++ b/gdb/gdb-gdb.gdb.in
@@ -1,5 +1,15 @@
 echo Setting up the environment for debugging gdb.\n
 +# Set up the Python library and "require" command.
 +python
 +from os.path import abspath
 +gdb.datadir = abspath ('@srcdir@/python/lib')
 +gdb.pythonlibdir = gdb.datadir
 +gdb.__path__ = [gdb.datadir + '/gdb']
 +sys.path.insert(0, gdb.datadir)
 +end
 +source @srcdir@/python/lib/gdb/__init__.py
 +
 if !$gdb_init_done
   set variable $gdb_init_done = 1
 diff --git a/gdb/python/lib/gdb/command/ignore_errors.py b/gdb/python/lib/gdb/command/ignore_errors.py
 new file mode 100644
 --- /dev/null
 +++ b/gdb/python/lib/gdb/command/ignore_errors.py
@@ -0,0 +1,37 @@
 +# Ignore errors in user commands.
 +
 +# Copyright (C) 2008 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 3 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +import gdb
 +
 +class IgnoreErrorsCommand (gdb.Command):
 +    """Execute a single command, ignoring all errors.
 +Only one-line commands are supported.
 +This is primarily useful in scripts."""
 +
 +    def __init__ (self):
 +        super (IgnoreErrorsCommand, self).__init__ ("ignore-errors",
 +                                                    gdb.COMMAND_OBSCURE,
 +                                                    # FIXME...
 +                                                    gdb.COMPLETE_COMMAND)
 +
 +    def invoke (self, arg, from_tty):
 +        try:
 +            gdb.execute (arg, from_tty)
 +        except:
 +            pass
 +
 +IgnoreErrorsCommand ()
 diff --git a/gdb/python/lib/gdb/function/in_scope.py b/gdb/python/lib/gdb/function/in_scope.py
 new file mode 100644
 --- /dev/null
 +++ b/gdb/python/lib/gdb/function/in_scope.py
@@ -0,0 +1,47 @@
 +# In-scope function.
 +
 +# Copyright (C) 2008 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 3 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +import gdb
 +
 +class InScope (gdb.Function):
 +    """Return True if all the given variables or macros are in scope.
 +Takes one argument for each variable name to be checked."""
 +
 +    def __init__ (self):
 +        super (InScope, self).__init__ ("in_scope")
 +
 +    def invoke (self, *vars):
 +        if len (vars) == 0:
 +            raise (TypeError, "in_scope takes at least one argument")
 +
 +        # gdb.Value isn't hashable so it can't be put in a map.
 +        # Convert to string first.
 +        wanted = set (map (lambda x: x.string (), vars))
 +        found = set ()
 +        block = gdb.selected_frame ().block ()
 +        while block:
 +            for sym in block:
 +                if (sym.is_argument or sym.is_constant
 +                      or sym.is_function or sym.is_variable):
 +                    if sym.name in wanted:
 +                        found.add (sym.name)
 +
 +            block = block.superblock
 +
 +        return wanted == found
 +
 +InScope ()
 diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp
 --- a/gdb/testsuite/gdb.python/py-frame.exp
 +++ b/gdb/testsuite/gdb.python/py-frame.exp
@@ -95,6 +95,8 @@ gdb_test "python print ('result = %s' % f0.read_var ('a'))" " = 1" "test Frame.r
 gdb_test "python print ('result = %s' % (gdb.selected_frame () == f1))" " = True" "test gdb.selected_frame"
 +gdb_test "python print ('result = %s' % (f0.block ()))" "<gdb.Block object at 0x\[\[:xdigit:\]\]+>" "test Frame.block"
 +
 # Can read SP register.
 gdb_test "python print ('result = %s' % (gdb.selected_frame ().read_register ('sp') == gdb.parse_and_eval ('\$sp')))" \
   " = True" \
 diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
 --- a/gdb/testsuite/gdb.python/py-value.exp
 +++ b/gdb/testsuite/gdb.python/py-value.exp
@@ -419,6 +419,15 @@ proc test_value_after_death {} {
     "print value's type"
 }
 +# Regression test for a cast failure.  The bug was that if we cast a
 +# value to its own type, gdb could crash.  This happened because we
 +# could end up double-freeing a struct value.
 +proc test_cast_regression {} {
 +  gdb_test "python v = gdb.Value(5)" "" "create value for cast test"
 +  gdb_test "python v = v.cast(v.type)" "" "cast value for cast test"
 +  gdb_test "python print(v)" "5" "print value for cast test"
 +}
 +
 # Regression test for invalid subscript operations.  The bug was that
 # the type of the value was not being checked before allowing a
 # subscript operation to proceed.
@@ -606,6 +615,7 @@ test_value_in_inferior
 test_value_from_buffer
 test_inferior_function_call
 test_value_after_death
 +test_cast_regression
 # Test either C or C++ values. 
--- a/gdb-attach-fail-reasons-5of5.patch
+++ b/gdb-attach-fail-reasons-5of5.patch
@ -1,356 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-attach-fail-reasons-5of5.patch
 ;; Print reasons for failed attach/spawn incl. SELinux deny_ptrace (BZ 786878).
 ;;=push+jan
 http://sourceware.org/ml/gdb-patches/2012-03/msg00171.html
 Hi,
 and here is the last bit for new SELinux 'deny_ptrace':
 	https://bugzilla.redhat.com/show_bug.cgi?id=786878
 As even PTRACE_TRACEME fails in such case it needs to install hook for even
 that event.
 Thanks,
 Jan
 gdb/
 2012-03-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
 	* common/linux-ptrace.c [HAVE_SELINUX_SELINUX_H]: include
 	selinux/selinux.h.
 	(linux_ptrace_attach_warnings): Call linux_ptrace_create_warnings.
 	(linux_ptrace_create_warnings): New.
 	* common/linux-ptrace.h (linux_ptrace_create_warnings): New declaration.
 	* config.in: Regenerate.
 	* configure: Regenerate.
 	* configure.ac: Check selinux/selinux.h and the selinux library.
 	* inf-ptrace.c (inf_ptrace_me): Check the ptrace result.
 	* linux-nat.c (linux_nat_create_inferior): New variable ex.  Wrap
 	to_create_inferior into TRY_CATCH, call linux_ptrace_create_warnings.
 gdb/gdbserver/
 	* config.in: Regenerate.
 	* configure: Regenerate.
 	* configure.ac: Check selinux/selinux.h and the selinux library.
 	* linux-low.c (linux_traceme): New function.
 	(linux_create_inferior, linux_tracefork_child): Call it instead of
 	direct ptrace.
 diff --git a/gdb/config.in b/gdb/config.in
 --- a/gdb/config.in
 +++ b/gdb/config.in
@@ -253,6 +253,9 @@
 /* Define if librpm library is being used. */
 #undef HAVE_LIBRPM
 +/* Define to 1 if you have the `selinux' library (-lselinux). */
 +#undef HAVE_LIBSELINUX
 +
 /* Define to 1 if you have the <libunwind-ia64.h> header file. */
 #undef HAVE_LIBUNWIND_IA64_H
@@ -388,6 +391,9 @@
 /* Define to 1 if you have the `scm_new_smob' function. */
 #undef HAVE_SCM_NEW_SMOB
 +/* Define to 1 if you have the <selinux/selinux.h> header file. */
 +#undef HAVE_SELINUX_SELINUX_H
 +
 /* Define to 1 if you have the `setlocale' function. */
 #undef HAVE_SETLOCALE
 diff --git a/gdb/configure b/gdb/configure
 --- a/gdb/configure
 +++ b/gdb/configure
@@ -16861,6 +16861,64 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 +for ac_header in selinux/selinux.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
 +if test "x$ac_cv_header_selinux_selinux_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_SELINUX_SELINUX_H 1
 +_ACEOF
 +
 +fi
 +
 +done
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for security_get_boolean_active in -lselinux" >&5
 +$as_echo_n "checking for security_get_boolean_active in -lselinux... " >&6; }
 +if test "${ac_cv_lib_selinux_security_get_boolean_active+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lselinux  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
 +#ifdef __cplusplus
 +extern "C"
 +#endif
 +char security_get_boolean_active ();
 +int
 +main ()
 +{
 +return security_get_boolean_active ();
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_selinux_security_get_boolean_active=yes
 +else
 +  ac_cv_lib_selinux_security_get_boolean_active=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_get_boolean_active" >&5
 +$as_echo "$ac_cv_lib_selinux_security_get_boolean_active" >&6; }
 +if test "x$ac_cv_lib_selinux_security_get_boolean_active" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBSELINUX 1
 +_ACEOF
 +
 +  LIBS="-lselinux $LIBS"
 +
 +fi
 +
 +
 # Support for --with-sysroot is a copy of GDB_AC_WITH_DIR,
 # except that the argument to --with-sysroot is optional.
 diff --git a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
@@ -1900,6 +1900,10 @@ case $host_os in
 esac
 AC_DEFINE_UNQUOTED(GDBINIT,"$gdbinit",[The .gdbinit filename.])
 +dnl Check security_get_boolean_active availability.
 +AC_CHECK_HEADERS(selinux/selinux.h)
 +AC_CHECK_LIB(selinux, security_get_boolean_active)
 +
 dnl Handle optional features that can be enabled.
 # Support for --with-sysroot is a copy of GDB_AC_WITH_DIR,
 diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
@@ -1103,7 +1103,16 @@ linux_nat_target::create_inferior (const char *exec_file,
   /* Make sure we report all signals during startup.  */
   pass_signals ({});
 -  inf_ptrace_target::create_inferior (exec_file, allargs, env, from_tty);
 +  try
 +    {
 +      inf_ptrace_target::create_inferior (exec_file, allargs, env, from_tty);
 +    }
 +  catch (const gdb_exception_error &ex)
 +    {
 +      std::string result =  linux_ptrace_create_warnings ();
 +
 +      throw_error (ex.error, "%s%s", result.c_str (), ex.message->c_str ());
 +    }
 }
 /* Callback for linux_proc_attach_tgid_threads.  Attach to PTID if not
 diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
 --- a/gdb/nat/linux-ptrace.c
 +++ b/gdb/nat/linux-ptrace.c
@@ -25,6 +25,10 @@
 #include <sys/procfs.h>
 #endif
 +#ifdef HAVE_SELINUX_SELINUX_H
 +# include <selinux/selinux.h>
 +#endif /* HAVE_SELINUX_SELINUX_H */
 +
 /* Stores the ptrace options supported by the running kernel.
    A value of -1 means we did not check for features yet.  A value
    of 0 means there are no supported features.  */
@@ -50,6 +54,8 @@ linux_ptrace_attach_fail_reason (pid_t pid)
 		      "terminated"),
 		    (int) pid);
 +  result += linux_ptrace_create_warnings ();
 +
   return result;
 }
@@ -586,6 +592,25 @@ linux_ptrace_init_warnings (void)
   linux_ptrace_test_ret_to_nx ();
 }
 +/* Print all possible reasons we could fail to create a traced process.  */
 +
 +std::string
 +linux_ptrace_create_warnings ()
 +{
 +  std::string result;
 +
 +#ifdef HAVE_LIBSELINUX
 +  /* -1 is returned for errors, 0 if it has no effect, 1 if PTRACE_ATTACH is
 +     forbidden.  */
 +  if (security_get_boolean_active ("deny_ptrace") == 1)
 +    string_appendf (result,
 +		    _("the SELinux boolean 'deny_ptrace' is enabled, "
 +		      "you can disable this process attach protection by: "
 +		      "(gdb) shell sudo setsebool deny_ptrace=0\n"));
 +#endif /* HAVE_LIBSELINUX */
 +  return result;
 +}
 +
 /* Extract extended ptrace event from wait status.  */
 int
 diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
 --- a/gdb/nat/linux-ptrace.h
 +++ b/gdb/nat/linux-ptrace.h
@@ -184,6 +184,7 @@ extern std::string linux_ptrace_attach_fail_reason (pid_t pid);
 extern std::string linux_ptrace_attach_fail_reason_string (ptid_t ptid, int err);
 extern void linux_ptrace_init_warnings (void);
 +extern std::string linux_ptrace_create_warnings ();
 extern void linux_check_ptrace_features (void);
 extern void linux_enable_event_reporting (pid_t pid, int attached);
 extern void linux_disable_event_reporting (pid_t pid);
 diff --git a/gdbserver/config.in b/gdbserver/config.in
 --- a/gdbserver/config.in
 +++ b/gdbserver/config.in
@@ -143,6 +143,9 @@
 /* Define if you have the ipt library. */
 #undef HAVE_LIBIPT
 +/* Define to 1 if you have the `selinux' library (-lselinux). */
 +#undef HAVE_LIBSELINUX
 +
 /* Define if the target supports branch tracing. */
 #undef HAVE_LINUX_BTRACE
@@ -249,6 +252,9 @@
 /* Define to 1 if you have the `sbrk' function. */
 #undef HAVE_SBRK
 +/* Define to 1 if you have the <selinux/selinux.h> header file. */
 +#undef HAVE_SELINUX_SELINUX_H
 +
 /* Define to 1 if you have the `setns' function. */
 #undef HAVE_SETNS
 diff --git a/gdbserver/configure b/gdbserver/configure
 --- a/gdbserver/configure
 +++ b/gdbserver/configure
@@ -10683,6 +10683,64 @@ if $want_ipa ; then
    fi
 fi
 +for ac_header in selinux/selinux.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
 +if test "x$ac_cv_header_selinux_selinux_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_SELINUX_SELINUX_H 1
 +_ACEOF
 +
 +fi
 +
 +done
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for security_get_boolean_active in -lselinux" >&5
 +$as_echo_n "checking for security_get_boolean_active in -lselinux... " >&6; }
 +if test "${ac_cv_lib_selinux_security_get_boolean_active+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lselinux  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
 +#ifdef __cplusplus
 +extern "C"
 +#endif
 +char security_get_boolean_active ();
 +int
 +main ()
 +{
 +return security_get_boolean_active ();
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_selinux_security_get_boolean_active=yes
 +else
 +  ac_cv_lib_selinux_security_get_boolean_active=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_get_boolean_active" >&5
 +$as_echo "$ac_cv_lib_selinux_security_get_boolean_active" >&6; }
 +if test "x$ac_cv_lib_selinux_security_get_boolean_active" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBSELINUX 1
 +_ACEOF
 +
 +  LIBS="-lselinux $LIBS"
 +
 +fi
 +
 +
 diff --git a/gdbserver/configure.ac b/gdbserver/configure.ac
 --- a/gdbserver/configure.ac
 +++ b/gdbserver/configure.ac
@@ -401,6 +401,10 @@ if $want_ipa ; then
    fi
 fi
 +dnl Check security_get_boolean_active availability.
 +AC_CHECK_HEADERS(selinux/selinux.h)
 +AC_CHECK_LIB(selinux, security_get_boolean_active)
 +
 AC_SUBST(GDBSERVER_DEPFILES)
 AC_SUBST(GDBSERVER_LIBS)
 AC_SUBST(srv_xmlbuiltin)
 diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
 --- a/gdbserver/linux-low.cc
 +++ b/gdbserver/linux-low.cc
@@ -932,7 +932,16 @@ linux_ptrace_fun ()
 {
   if (ptrace (PTRACE_TRACEME, 0, (PTRACE_TYPE_ARG3) 0,
 	      (PTRACE_TYPE_ARG4) 0) < 0)
 -    trace_start_error_with_name ("ptrace");
 +    {
 +      int save_errno = errno;
 +
 +      std::string msg (linux_ptrace_create_warnings ());
 +
 +      msg += _("Cannot trace created process");
 +
 +      errno = save_errno;
 +      trace_start_error_with_name (msg.c_str ());
 +    }
   if (setpgid (0, 0) < 0)
     trace_start_error_with_name ("setpgid");
--- a/gdb-btrobust.patch
+++ b/gdb-btrobust.patch
@ -1,72 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-btrobust.patch
 ;; Continue backtrace even if a frame filter throws an exception (Phil Muldoon).
 ;;=push
 This should fix the error  with glib.  An error message will still be
 printed, but a default backtrace will occur in this case.
 --
 diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
 --- a/gdb/python/py-framefilter.c
 +++ b/gdb/python/py-framefilter.c
@@ -1204,6 +1204,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
 				       htab_eq_pointer,
 				       NULL));
 +  int count_printed = 0;
   while (true)
     {
       gdbpy_ref<> item (PyIter_Next (iterable.get ()));
@@ -1212,8 +1213,8 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
 	{
 	  if (PyErr_Occurred ())
 	    {
 -	      gdbpy_print_stack_or_quit ();
 -	      return EXT_LANG_BT_ERROR;
 +	      gdbpy_print_stack ();
 +	      return count_printed > 0 ? EXT_LANG_BT_ERROR : EXT_LANG_BT_NO_FILTERS;
 	    }
 	  break;
 	}
@@ -1245,7 +1246,8 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
       /* Do not exit on error printing a single frame.  Print the
 	 error and continue with other frames.  */
       if (success == EXT_LANG_BT_ERROR)
 -	gdbpy_print_stack_or_quit ();
 +	gdbpy_print_stack ();
 +      count_printed++;
     }
   return success;
 diff --git a/gdb/testsuite/gdb.python/py-framefilter.exp b/gdb/testsuite/gdb.python/py-framefilter.exp
 --- a/gdb/testsuite/gdb.python/py-framefilter.exp
 +++ b/gdb/testsuite/gdb.python/py-framefilter.exp
@@ -277,9 +277,20 @@ gdb_test_multiple "bt 1" $test {
 # Now verify that we can see a quit.
 gdb_test_no_output "python name_error = KeyboardInterrupt" \
     "Change ErrorFilter to throw KeyboardInterrupt"
 -gdb_test "bt 1" "Quit" "bt 1 with KeyboardInterrupt"
 -
 -
 +set re1 [multi_line \
 +	     "Python Exception <class 'KeyboardInterrupt'> whoops: " \
 +	     "\\(More stack frames follow\.\.\.\\)"]
 +set re2 [multi_line \
 +	     "Python Exception <type 'exceptions.KeyboardInterrupt'> whoops: " \
 +	     "\\(More stack frames follow\.\.\.\\)"]
 +gdb_test_multiple "bt 1" "" {
 +    -re -wrap $re1 {
 +	pass $gdb_test_name
 +    }
 +    -re -wrap $re2 {
 +	pass $gdb_test_name
 +    }
 +}
 # Test with no debuginfo
 # We cannot use prepare_for_testing as we have to set the safe-patch
--- a/gdb-bz1219747-attach-kills.patch
+++ b/gdb-bz1219747-attach-kills.patch
@ -1,178 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-bz1219747-attach-kills.patch
 ;; Never kill PID on: gdb exec PID (Jan Kratochvil, RH BZ 1219747).
 ;;=push+jan
 http://sourceware.org/ml/gdb-patches/2015-10/msg00301.html
 Hi,
 in some cases with deleted main executable GDB will want to kill the inferior.
 $ cp /bin/sleep /tmp/sleep;/tmp/sleep 1h&p=$!
 $ rm /tmp/sleep
 $ gdb /tmp/sleep $p
 GNU gdb (GDB) 7.10.50.20151016-cvs
 /tmp/sleep: No such file or directory.
 Attaching to process 9694
 /tmp/sleep (deleted): No such file or directory.
 A program is being debugged already.  Kill it? (y or n) _
 The first attachment of "/tmp/sleep" commandline argument errors at:
 267               if (scratch_chan < 0)
 268                 perror_with_name (filename);
 1051          if (catch_command_errors_const (exec_file_attach, execarg,
 1052                                          !batch_flag))
 Then GDB tries to attach to the process $p:
 1082              if (catch_command_errors (attach_command, pid_or_core_arg,
 1083                                        !batch_flag) == 0)
 This succeeds and since this moment GDB has a valid inferior.  But despite that
 the lines
 1082              if (catch_command_errors (attach_command, pid_or_core_arg,
 1083                                        !batch_flag) == 0)
 still fail because consequently attach_command() fails to find the associated
 executable file:
 267               if (scratch_chan < 0)
 268                 perror_with_name (filename);
 1082              if (catch_command_errors (attach_command, pid_or_core_arg,
 1083                                        !batch_flag) == 0)
 and therefore GDB executes the following:
 (gdb) bt
 2179	  if (have_inferiors ())
 2180	    {
 2181	      if (!from_tty
 2182		  || !have_live_inferiors ()
 2183		  || query (_("A program is being debugged already.  Kill it? ")))
 2184		iterate_over_inferiors (dispose_inferior, NULL);
 2185	      else
 2186		error (_("Program not killed."));
 2187	    }
 1084		    catch_command_errors (core_file_command, pid_or_core_arg,
 1085					  !batch_flag);
 No regressions on {x86_64,x86_64-m32,i686}-fedora24pre-linux-gnu.
 Thanks,
 Jan
 gdb/ChangeLog
 2015-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
 	* main.c (captured_main): Run core_file_command for pid_or_core_arg
 	only if not have_inferiors ().
 gdb/testsuite/ChangeLog
 2015-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
 	* gdb.base/attach-kills.c: New.
 	* gdb.base/attach-kills.exp: New.
 diff --git a/gdb/main.c b/gdb/main.c
 --- a/gdb/main.c
 +++ b/gdb/main.c
@@ -1199,7 +1199,10 @@ captured_main_1 (struct captured_main_args *context)
 	{
 	  ret = catch_command_errors (attach_command, pid_or_core_arg,
 				      !batch_flag);
 -	  if (ret == 0)
 +	  if (ret == 0
 +	      /* attach_command could succeed partially and core_file_command
 +		 would try to kill it.  */
 +	      && !have_inferiors ())
 	    ret = catch_command_errors (core_file_command,
 					pid_or_core_arg,
 					!batch_flag);
 diff --git a/gdb/testsuite/gdb.base/attach-kills.c b/gdb/testsuite/gdb.base/attach-kills.c
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/attach-kills.c
@@ -0,0 +1,25 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2015 Free Software Foundation, Inc.
 +
 +   This program is free software; you can redistribute it and/or modify
 +   it under the terms of the GNU General Public License as published by
 +   the Free Software Foundation; either version 3 of the License, or
 +   (at your option) any later version.
 +
 +   This program is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
 +
 +   You should have received a copy of the GNU General Public License
 +   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 +
 +#include <unistd.h>
 +
 +int
 +main (void)
 +{
 +  sleep (600);
 +  return 0;
 +}
 diff --git a/gdb/testsuite/gdb.base/attach-kills.exp b/gdb/testsuite/gdb.base/attach-kills.exp
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/attach-kills.exp
@@ -0,0 +1,49 @@
 +# Copyright (C) 2015 Free Software Foundation, Inc.
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 3 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +if { ![can_spawn_for_attach] } {
 +    return 0
 +}
 +
 +standard_testfile
 +
 +if { [build_executable ${testfile}.exp $testfile] == -1 } {
 +    return -1
 +}
 +
 +# Start the program running and then wait for a bit, to be sure
 +# that it can be attached to.
 +
 +set test_spawn_id [spawn_wait_for_attach $binfile]
 +set testpid [spawn_id_get_pid $test_spawn_id]
 +
 +remote_exec target "cp -pf -- $binfile $binfile-copy"
 +remote_exec target "rm -f -- $binfile"
 +
 +set test "start gdb"
 +set res [gdb_spawn_with_cmdline_opts \
 +	 "-iex \"set height 0\" -iex \"set width 0\" /DoEsNoTeXySt $testpid"]
 +if { $res != 0} {
 +    fail "$test (spawn)"
 +    kill_wait_spawned_process $test_spawn_id
 +    return -1
 +}
 +gdb_test_multiple "" $test {
 +    -re "\r\nAttaching to .*\r\n$gdb_prompt $" {
 +	pass $test
 +    }
 +}
 +
 +kill_wait_spawned_process $test_spawn_id
--- a/gdb-bz533176-fortran-omp-step.patch
+++ b/gdb-bz533176-fortran-omp-step.patch
@ -1,130 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-bz533176-fortran-omp-step.patch
 ;; Fix stepping with OMP parallel Fortran sections (BZ 533176).
 ;;=push+jan: It requires some better DWARF annotations.
 https://bugzilla.redhat.com/show_bug.cgi?id=533176#c4
 I find it a bug in DWARF and gdb behaves correctly according to it.  From the
 current DWARF's point of view the is a function call which you skip by "next".
 If you hide any /usr/lib/debug such as using:
 gdb -nx -ex 'set debug-file-directory /qwe' -ex 'file ./tpcommon_gfortran44'
 and use "step" command instead of "next" there it will work.
 (You need to hide debuginfo from libgomp as you would step into libgomp sources
 to maintain the threads for execution.)
 There should be some DWARF extension for it, currently tried to detect
 substring ".omp_fn." as this function is called "MAIN__.omp_fn.0" and do not
 consider such sub-function as a skippable by "next".
 Another problem is that with "set scheduler-locking" being "off" (default
 upstream) or "step" (default in F/RHEL) the simultaneous execution of the
 threads is inconvenient.  Setting it to "on" will lockup the debugging as the
 threads need to get synchronized at some point.  This is a more general
 debugging problem of GOMP outside of the scope of this Bug.
 diff --git a/gdb/infrun.c b/gdb/infrun.c
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
@@ -6788,6 +6788,16 @@ process_event_stop_test (struct execution_control_state *ecs)
       if (ecs->event_thread->control.step_over_calls == STEP_OVER_ALL)
 	{
 +	  struct symbol *stop_fn = find_pc_function (stop_pc);
 +	  struct minimal_symbol *stopf = lookup_minimal_symbol_by_pc (stop_pc).minsym;
 +
 +	  if ((stop_fn == NULL
 +	       || strstr (stop_fn->linkage_name (), ".omp_fn.") == NULL)
 +	      /* gcc-4.7.2-9.fc19.x86_64 uses a new format.  */
 +	      && (stopf == NULL
 +		  || strstr (stopf->linkage_name (), "._omp_fn.") == NULL))
 +{	/* ".omp_fn." */
 +
 	  /* We're doing a "next".
 	     Normal (forward) execution: set a breakpoint at the
@@ -6821,6 +6831,7 @@ process_event_stop_test (struct execution_control_state *ecs)
 	  keep_going (ecs);
 	  return;
 +}	/* ".omp_fn." */
 	}
       /* If we are in a function call trampoline (a stub between the
 diff --git a/gdb/testsuite/gdb.fortran/omp-step.exp b/gdb/testsuite/gdb.fortran/omp-step.exp
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.fortran/omp-step.exp
@@ -0,0 +1,31 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 3 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +set testfile "omp-step"
 +set srcfile ${testfile}.f90
 +if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f90 additional_flags=-fopenmp}] } {
 +    return -1
 +}
 +
 +if ![runto [gdb_get_line_number "start-here"]] {
 +    perror "Couldn't run to start-here"
 +    return 0
 +}
 +
 +gdb_test "next" {!\$omp parallel} "step closer"
 +gdb_test "next" {a\(omp_get_thread_num\(\) \+ 1\) = 1} "step into omp"
 +
 +gdb_breakpoint [gdb_get_line_number "success"]
 +gdb_continue_to_breakpoint "success" ".*success.*"
 diff --git a/gdb/testsuite/gdb.fortran/omp-step.f90 b/gdb/testsuite/gdb.fortran/omp-step.f90
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.fortran/omp-step.f90
@@ -0,0 +1,32 @@
 +! Copyright 2009 Free Software Foundation, Inc.
 +
 +! This program is free software; you can redistribute it and/or modify
 +! it under the terms of the GNU General Public License as published by
 +! the Free Software Foundation; either version 3 of the License, or
 +! (at your option) any later version.
 +!
 +! This program is distributed in the hope that it will be useful,
 +! but WITHOUT ANY WARRANTY; without even the implied warranty of
 +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +! GNU General Public License for more details.
 +!
 +! You should have received a copy of the GNU General Public License
 +! along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +      use omp_lib
 +      integer nthreads, i, a(1000)
 +      nthreads = omp_get_num_threads()
 +      if (nthreads .gt. 1000) call abort
 +
 +      do i = 1, nthreads
 +          a(i) = 0
 +      end do
 +      print *, "start-here"
 +!$omp parallel
 +      a(omp_get_thread_num() + 1) = 1
 +!$omp end parallel
 +      do i = 1, nthreads
 +          if (a(i) .ne. 1) call abort
 +      end do
 +      print *, "success"
 +      end
--- a/gdb-dts-rhel6-python-compat.patch
+++ b/gdb-dts-rhel6-python-compat.patch
@ -1,334 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-dts-rhel6-python-compat.patch
 ;; [rhel6] DTS backward Python compatibility API (BZ 1020004, Phil Muldoon).
 ;;=fedora
 https://bugzilla.redhat.com/show_bug.cgi?id=1020004
 diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
 --- a/gdb/data-directory/Makefile.in
 +++ b/gdb/data-directory/Makefile.in
@@ -71,6 +71,8 @@ PYTHON_FILE_LIST = \
 	gdb/__init__.py \
 	gdb/FrameDecorator.py \
 	gdb/FrameIterator.py \
 +	gdb/FrameWrapper.py \
 +	gdb/backtrace.py \
 	gdb/frames.py \
 	gdb/printing.py \
 	gdb/prompt.py \
@@ -79,6 +81,7 @@ PYTHON_FILE_LIST = \
 	gdb/xmethod.py \
 	gdb/command/__init__.py \
 	gdb/command/explore.py \
 +	gdb/command/backtrace.py \
 	gdb/command/frame_filters.py \
 	gdb/command/pretty_printers.py \
 	gdb/command/prompt.py \
 diff --git a/gdb/python/lib/gdb/FrameWrapper.py b/gdb/python/lib/gdb/FrameWrapper.py
 new file mode 100644
 --- /dev/null
 +++ b/gdb/python/lib/gdb/FrameWrapper.py
@@ -0,0 +1,122 @@
 +# Wrapper API for frames.
 +
 +# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 3 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +import gdb
 +
 +# FIXME: arguably all this should be on Frame somehow.
 +class FrameWrapper:
 +    def __init__ (self, frame):
 +        self.frame = frame;
 +
 +    def write_symbol (self, stream, sym, block):
 +        if len (sym.linkage_name):
 +            nsym, is_field_of_this = gdb.lookup_symbol (sym.linkage_name, block)
 +            if nsym.addr_class != gdb.SYMBOL_LOC_REGISTER:
 +                sym = nsym
 +
 +        stream.write (sym.print_name + "=")
 +        try:
 +            val = self.read_var (sym)
 +            if val != None:
 +                val = str (val)
 +        # FIXME: would be nice to have a more precise exception here.
 +        except RuntimeError as text:
 +            val = text
 +        if val == None:
 +            stream.write ("???")
 +        else:
 +            stream.write (str (val))
 +
 +    def print_frame_locals (self, stream, func):
 +
 +        try:
 +            block = self.frame.block()
 +        except RuntimeError:
 +            block = None
 +
 +        while block != None:
 +            if block.is_global or block.is_static:
 +                break
 +
 +        for sym in block:
 +            if sym.is_argument:
 +                continue;
 +
 +            self.write_symbol (stream, sym, block)
 +            stream.write ('\n')
 +
 +    def print_frame_args (self, stream, func):
 +
 +        try:
 +            block = self.frame.block()
 +        except RuntimeError:
 +            block = None
 +
 +        while block != None:
 +            if block.function != None:
 +                break
 +            block = block.superblock
 +
 +        first = True
 +        for sym in block:
 +            if not sym.is_argument:
 +                continue;
 +
 +            if not first:
 +                stream.write (", ")
 +
 +            self.write_symbol (stream, sym, block)
 +            first = False
 +
 +    # FIXME: this should probably just be a method on gdb.Frame.
 +    # But then we need stream wrappers.
 +    def describe (self, stream, full):
 +        if self.type () == gdb.DUMMY_FRAME:
 +            stream.write (" <function called from gdb>\n")
 +        elif self.type () == gdb.SIGTRAMP_FRAME:
 +            stream.write (" <signal handler called>\n")
 +        else:
 +            sal = self.find_sal ()
 +            pc = self.pc ()
 +            name = self.name ()
 +            if not name:
 +                name = "??"
 +            if pc != sal.pc or not sal.symtab:
 +                stream.write (" 0x%08x in" % pc)
 +            stream.write (" " + name + " (")
 +
 +            func = self.function ()
 +            self.print_frame_args (stream, func)
 +
 +            stream.write (")")
 +
 +            if sal.symtab and sal.symtab.filename:
 +                stream.write (" at " + sal.symtab.filename)
 +                stream.write (":" + str (sal.line))
 +
 +            if not self.name () or (not sal.symtab or not sal.symtab.filename):
 +                lib = gdb.solib_name (pc)
 +                if lib:
 +                    stream.write (" from " + lib)
 +
 +            stream.write ("\n")
 +
 +            if full:
 +                self.print_frame_locals (stream, func)
 +
 +    def __getattr__ (self, name):
 +        return getattr (self.frame, name)
 diff --git a/gdb/python/lib/gdb/backtrace.py b/gdb/python/lib/gdb/backtrace.py
 new file mode 100644
 --- /dev/null
 +++ b/gdb/python/lib/gdb/backtrace.py
@@ -0,0 +1,41 @@
 +# Filtering backtrace.
 +
 +# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 3 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +import gdb
 +import itertools
 +
 +# Our only exports.
 +__all__ = ['push_frame_filter', 'create_frame_filter']
 +
 +old_frame_filter = None
 +
 +def push_frame_filter (constructor):
 +    """Register a new backtrace filter class with the 'backtrace' command.
 +The filter will be passed an iterator as an argument.  The iterator
 +will return gdb.Frame-like objects.  The filter should in turn act as
 +an iterator returning such objects."""
 +    global old_frame_filter
 +    if old_frame_filter == None:
 +        old_frame_filter = constructor
 +    else:
 +        old_frame_filter = lambda iterator, filter = frame_filter: constructor (filter(iterator))
 +
 +def create_frame_filter (iter):
 +    global old_frame_filter
 +    if old_frame_filter is None:
 +        return iter
 +    return old_frame_filter (iter)
 diff --git a/gdb/python/lib/gdb/command/backtrace.py b/gdb/python/lib/gdb/command/backtrace.py
 new file mode 100644
 --- /dev/null
 +++ b/gdb/python/lib/gdb/command/backtrace.py
@@ -0,0 +1,112 @@
 +# New backtrace command.
 +
 +# Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 3 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +import gdb
 +import gdb.backtrace
 +import itertools
 +from gdb.FrameIterator import FrameIterator
 +from gdb.FrameWrapper import FrameWrapper
 +import sys
 +
 +class ReverseBacktraceParameter (gdb.Parameter):
 +    """The new-backtrace command can show backtraces in 'reverse' order.
 +This means that the innermost frame will be printed last.
 +Note that reverse backtraces are more expensive to compute."""
 +
 +    set_doc = "Enable or disable reverse backtraces."
 +    show_doc = "Show whether backtraces will be printed in reverse order."
 +
 +    def __init__(self):
 +        gdb.Parameter.__init__ (self, "reverse-backtrace",
 +                                gdb.COMMAND_STACK, gdb.PARAM_BOOLEAN)
 +        # Default to compatibility with gdb.
 +        self.value = False
 +
 +class FilteringBacktrace (gdb.Command):
 +    """Print backtrace of all stack frames, or innermost COUNT frames.
 +With a negative argument, print outermost -COUNT frames.
 +Use of the 'full' qualifier also prints the values of the local variables.
 +Use of the 'raw' qualifier avoids any filtering by loadable modules.
 +"""
 +
 +    def __init__ (self):
 +        # FIXME: this is not working quite well enough to replace
 +        # "backtrace" yet.
 +        gdb.Command.__init__ (self, "new-backtrace", gdb.COMMAND_STACK)
 +        self.reverse = ReverseBacktraceParameter()
 +
 +    def reverse_iter (self, iter):
 +        result = []
 +        for item in iter:
 +            result.append (item)
 +        result.reverse()
 +        return result
 +
 +    def final_n (self, iter, x):
 +        result = []
 +        for item in iter:
 +            result.append (item)
 +        return result[x:]
 +
 +    def invoke (self, arg, from_tty):
 +        i = 0
 +        count = 0
 +        filter = True
 +        full = False
 +
 +        for word in arg.split (" "):
 +            if word == '':
 +                continue
 +            elif word == 'raw':
 +                filter = False
 +            elif word == 'full':
 +                full = True
 +            else:
 +                count = int (word)
 +
 +        # FIXME: provide option to start at selected frame
 +        # However, should still number as if starting from newest
 +        newest_frame = gdb.newest_frame()
 +        if sys.version_info.major >= 3:
 +            iter = map (FrameWrapper, FrameIterator (newest_frame))
 +        else:
 +            iter = itertools.imap (FrameWrapper,
 +                                   FrameIterator (newest_frame))
 +        if filter:
 +            iter = gdb.backtrace.create_frame_filter (iter)
 +
 +        # Now wrap in an iterator that numbers the frames.
 +        if sys.version_info.major >= 3:
 +            iter = zip (itertools.count (0), iter)
 +        else:
 +            iter = itertools.izip (itertools.count (0), iter)
 +
 +        # Reverse if the user wanted that.
 +        if self.reverse.value:
 +            iter = self.reverse_iter (iter)
 +
 +        # Extract sub-range user wants.
 +        if count < 0:
 +            iter = self.final_n (iter, count)
 +        elif count > 0:
 +            iter = itertools.islice (iter, 0, count)
 +
 +        for pair in iter:
 +            sys.stdout.write ("#%-2d" % pair[0])
 +            pair[1].describe (sys.stdout, full)
 +
 +FilteringBacktrace()
 diff --git a/gdb/testsuite/gdb.base/help.exp b/gdb/testsuite/gdb.base/help.exp
 --- a/gdb/testsuite/gdb.base/help.exp
 +++ b/gdb/testsuite/gdb.base/help.exp
@@ -129,7 +129,9 @@ gdb_test "apropos apropos" "apropos -- Search for commands matching a REGEXP.*"
 # Test apropos for commands having aliases.
 gdb_test "apropos Print backtrace of all stack frames, or innermost COUNT frames\." \
 -    "backtrace, where, bt -- Print backtrace of all stack frames, or innermost COUNT frames\."
 +    [multi_line \
 +	 "backtrace, where, bt -- Print backtrace of all stack frames, or innermost COUNT frames\." \
 +	 "new-backtrace -- Print backtrace of all stack frames, or innermost COUNT frames\."]
 # Test help for commands having aliases.
 gdb_test "help bt" "backtrace, where, bt\[\r\n\]+Print backtrace of all stack frames, or innermost COUNT frames\..*"
--- a/gdb-gnat-dwarf-crash-3of3.patch
+++ b/gdb-gnat-dwarf-crash-3of3.patch
@ -1,227 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-gnat-dwarf-crash-3of3.patch
 ;; Fix crash of -readnow /usr/lib/debug/usr/bin/gnatbind.debug (BZ 1069211).
 ;;=push+jan
 http://sourceware.org/ml/gdb-patches/2014-02/msg00731.html
 --6TrnltStXW4iwmi0
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Hi,
 PR 16581:
 	GDB crash on inherit_abstract_dies infinite recursion
 	https://sourceware.org/bugzilla/show_bug.cgi?id=16581
 fixed crash from an infinite recursion.  But in rare cases the new code can
 now gdb_assert() due to weird DWARF file.
 I do not yet fully understand why the DWARF is as it is but just GDB should
 never crash due to invalid DWARF anyway.  The "invalid" DWARF I see only in
 Fedora GCC build, not in FSF GCC build, more info at:
 	https://bugzilla.redhat.com/show_bug.cgi?id=1069382
 	http://people.redhat.com/jkratoch/gcc-debuginfo-4.8.2-7.fc20.x86_64-gnatbind.debug
 Thanks,
 Jan
 --6TrnltStXW4iwmi0
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline; filename="complaint.patch"
 gdb/
 2014-02-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
 	* dwarf2read.c (process_die): Change gdb_assert to complaint.
 diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
 --- a/gdb/dwarf2/read.c
 +++ b/gdb/dwarf2/read.c
@@ -10159,6 +10159,13 @@ class process_die_scope
 static void
 process_die (struct die_info *die, struct dwarf2_cu *cu)
 {
 +  if (die->in_process)
 +    {
 +      complaint (_("DIE at 0x%s attempted to be processed twice"),
 +		 sect_offset_str (die->sect_off));
 +      return;
 +    }
 +
   process_die_scope scope (die, cu);
   switch (die->tag)
 diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
@@ -190,6 +190,12 @@ struct linux_nat_target *linux_target;
 /* Does the current host support PTRACE_GETREGSET?  */
 enum tribool have_ptrace_getregset = TRIBOOL_UNKNOWN;
 +#ifdef NEED_DETACH_SIGSTOP
 +/* PID of the inferior stopped by SIGSTOP before attaching (or zero).  */
 +static pid_t pid_was_stopped;
 +
 +#endif
 +
 static unsigned int debug_linux_nat;
 static void
 show_debug_linux_nat (struct ui_file *file, int from_tty,
@@ -1044,6 +1050,9 @@ linux_nat_post_attach_wait (ptid_t ptid, int *signalled)
   if (linux_proc_pid_is_stopped (pid))
     {
       linux_nat_debug_printf ("Attaching to a stopped process");
 +#ifdef NEED_DETACH_SIGSTOP
 +      pid_was_stopped = ptid.pid ();
 +#endif
       /* The process is definitely stopped.  It is in a job control
 	 stop, unless the kernel predates the TASK_STOPPED /
@@ -1359,6 +1368,25 @@ get_detach_signal (struct lwp_info *lp)
       return gdb_signal_to_host (signo);
     }
 +#ifdef NEED_DETACH_SIGSTOP
 +  /* Workaround RHEL-5 kernel which has unreliable PTRACE_DETACH, SIGSTOP (that
 +     many TIDs are left unstopped).  See RH Bug 496732.  */
 +  if (lp->ptid.pid () == pid_was_stopped)
 +    {
 +      int err;
 +
 +      errno = 0;
 +      err = kill_lwp (lp->ptid.lwp (), SIGSTOP);
 +      if (debug_linux_nat)
 +	{
 +	  fprintf_unfiltered (gdb_stdlog,
 +			      "SC:  lwp kill %d %s\n",
 +			      err,
 +			      errno ? safe_strerror (errno) : "ERRNO-OK");
 +	}
 +    }
 +
 +#endif
   return 0;
 }
@@ -1502,6 +1530,10 @@ linux_nat_target::detach (inferior *inf, int from_tty)
       detach_one_lwp (main_lwp, &signo);
       detach_success (inf);
 +
 +#ifdef NEED_DETACH_SIGSTOP
 +      pid_was_stopped = 0;
 +#endif
     }
 }
@@ -1744,6 +1776,16 @@ linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
       return;
     }
 +#ifdef NEED_DETACH_SIGSTOP
 +  /* At this point, we are going to resume the inferior and if we
 +     have attached to a stopped process, we no longer should leave
 +     it as stopped if the user detaches.  PTID variable has PID set to LWP
 +     while we need to check the real PID here.  */
 +
 +  if (!step && lp && pid_was_stopped == lp->ptid.pid ())
 +    pid_was_stopped = 0;
 +
 +#endif
   if (resume_many)
     iterate_over_lwps (ptid, [=] (struct lwp_info *info)
 			     {
@@ -3617,6 +3659,10 @@ linux_nat_target::mourn_inferior ()
   /* Let the arch-specific native code know this process is gone.  */
   linux_target->low_forget_process (pid);
 +#ifdef NEED_DETACH_SIGSTOP
 +
 +  pid_was_stopped = 0;
 +#endif
 }
 /* Convert a native/host siginfo object, into/from the siginfo in the
 diff --git a/gdb/testsuite/gdb.threads/attach-stopped.exp b/gdb/testsuite/gdb.threads/attach-stopped.exp
 --- a/gdb/testsuite/gdb.threads/attach-stopped.exp
 +++ b/gdb/testsuite/gdb.threads/attach-stopped.exp
@@ -56,7 +56,73 @@ proc corefunc { threadtype } {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load ${binfile}
 -    # Verify that we can attach to the stopped process.
 +    # Verify that we can attach to the process by first giving its
 +    # executable name via the file command, and using attach with the
 +    # process ID.
 +
 +    set test "$threadtype: set file, before attach1 to stopped process"
 +    gdb_test_multiple "file $binfile" "$test" {
 +       -re "Load new symbol table from.*y or n. $" {
 +	    gdb_test "y" "Reading symbols from $escapedbinfile\.\.\.*" \
 +		    "$test (re-read)"
 +	}
 +	-re "Reading symbols from $escapedbinfile\.\.\.*$gdb_prompt $" {
 +	    pass "$test"
 +	}
 +    }
 +
 +    set test "$threadtype: attach1 to stopped, after setting file"
 +    gdb_test_multiple "attach $testpid" "$test" {
 +	-re "Attaching to program.*`?$escapedbinfile'?, process $testpid.*$gdb_prompt $" {
 +	    pass "$test"
 +	}
 +    }
 +
 +    # ".*sleep.*clone.*" would fail on s390x as bt stops at START_THREAD there.
 +    if {[string equal $threadtype threaded]} {
 +	gdb_test "thread apply all bt" ".*sleep.*start_thread.*" "$threadtype: attach1 to stopped bt"
 +    } else {
 +	gdb_test "bt" ".*sleep.*main.*" "$threadtype: attach1 to stopped bt"
 +    }
 +
 +    # Exit and detach the process.
 +
 +    gdb_exit
 +
 +    # Avoid some race:
 +    sleep 2
 +
 +    if [catch {open /proc/${testpid}/status r} fileid] {
 +	set line "NOTFOUND"
 +    } else {
 +	while { 1 } {
 +	    if { [gets $fileid line] < 0 } {
 +		set line "EOF"
 +		break
 +	    }
 +	    if {[string match "State:*" $line]} {
 +		break
 +	    }
 +	}
 +	close $fileid;
 +    }
 +
 +    set test "$threadtype: attach1, exit leaves process stopped"
 +    verbose -log "line: $line"
 +    if {[string match "*(stopped)*" $line]} {
 +      pass $test
 +    } else {
 +      fail $test
 +    }
 +
 +    # At this point, the process should still be stopped
 +
 +    gdb_start
 +    gdb_reinitialize_dir $srcdir/$subdir
 +    gdb_load ${binfile}
 +
 +    # Verify that we can attach to the process just by giving the
 +    # process ID.
     set test "$threadtype: attach2 to stopped, after setting file"
     gdb_test_multiple "attach $testpid" "$test" {
--- a/gdb-jit-reader-multilib.patch
+++ b/gdb-jit-reader-multilib.patch
@ -1,46 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-jit-reader-multilib.patch
 ;; Fix jit-reader.h for multi-lib.
 ;;=push+jan
 diff --git a/gdb/configure b/gdb/configure
 --- a/gdb/configure
 +++ b/gdb/configure
@@ -9968,10 +9968,12 @@ _ACEOF
 -if test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
 -  TARGET_PTR="unsigned long"
 -elif test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
 +# Try to keep TARGET_PTR the same across archs so that jit-reader.h file
 +# content is the same for multilib distributions.
 +if test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
   TARGET_PTR="unsigned long long"
 +elif test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
 +  TARGET_PTR="unsigned long"
 elif test "x${ac_cv_sizeof_unsigned___int128}" = "x16"; then
   TARGET_PTR="unsigned __int128"
 else
 diff --git a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
@@ -803,10 +803,12 @@ AC_CHECK_SIZEOF(unsigned long long)
 AC_CHECK_SIZEOF(unsigned long)
 AC_CHECK_SIZEOF(unsigned __int128)
 -if test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
 -  TARGET_PTR="unsigned long"
 -elif test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
 +# Try to keep TARGET_PTR the same across archs so that jit-reader.h file
 +# content is the same for multilib distributions.
 +if test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
   TARGET_PTR="unsigned long long"
 +elif test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
 +  TARGET_PTR="unsigned long"
 elif test "x${ac_cv_sizeof_unsigned___int128}" = "x16"; then
   TARGET_PTR="unsigned __int128"
 else
--- a/gdb-moribund-utrace-workaround.patch
+++ b/gdb-moribund-utrace-workaround.patch
@ -1,25 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-moribund-utrace-workaround.patch
 ;; Workaround non-stop moribund locations exploited by kernel utrace (BZ 590623).
 ;;=push+jan: Currently it is still not fully safe.
 https://bugzilla.redhat.com/show_bug.cgi?id=590623
 http://sources.redhat.com/bugzilla/show_bug.cgi?id=11593
 Bug in FSF GDB exploited by the ptrace-on-utrace interaction.
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
@@ -11948,6 +11948,8 @@ update_global_location_list (enum ugll_insert_mode insert_mode)
 		  = 3 * (thread_count (proc_target) + 1);
 	      else
 		old_loc->events_till_retirement = 1;
 +	      /* Red Hat Bug 590623.  */
 +	      old_loc->events_till_retirement *= 10;
 	      old_loc->owner = NULL;
 	      moribund_locations.push_back (old_loc);
--- a/gdb-rhbz1909902-frame_id_p-assert-1.patch
+++ b/gdb-rhbz1909902-frame_id_p-assert-1.patch
@ -391,7 +391,7 @@ diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
 diff --git a/gdb/infrun.c b/gdb/infrun.c
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
-@@ -9017,8 +9017,10 @@ struct infcall_control_state
+@@ -9006,8 +9006,10 @@ struct infcall_control_state
   enum stop_stack_kind stop_stack_dummy = STOP_NONE;
   int stopped_by_random_signal = 0;
@ -403,7 +403,7 @@ diff --git a/gdb/infrun.c b/gdb/infrun.c
 };
 /* Save all of the information associated with the inferior<==>gdb
-@@ -9047,27 +9049,12 @@ save_infcall_control_state ()
+@@ -9036,27 +9038,12 @@ save_infcall_control_state ()
   inf_status->stop_stack_dummy = stop_stack_dummy;
   inf_status->stopped_by_random_signal = stopped_by_random_signal;
@ -433,7 +433,7 @@ diff --git a/gdb/infrun.c b/gdb/infrun.c
 /* Restore inferior session state to INF_STATUS.  */
 void
-@@ -9095,21 +9082,8 @@ restore_infcall_control_state (struct infcall_control_state *inf_status)
+@@ -9084,21 +9071,8 @@ restore_infcall_control_state (struct infcall_control_state *inf_status)
   if (target_has_stack)
     {
--- a/gdb-rhbz1912985-libstdc++-assert.patch
+++ b/gdb-rhbz1912985-libstdc++-assert.patch
@ -53,7 +53,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
     {
       strncpy (fold_buffer, name.data () + 1, len - 2);
       fold_buffer[len - 2] = '\000';
-@@ -13592,7 +13592,7 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name)
+@@ -13597,7 +13597,7 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name)
 {
   gdb::string_view user_name = lookup_name.name ();
--- a/gdb-rhbz1930528-fix-gnulib-build-error.patch
+++ b/gdb-rhbz1930528-fix-gnulib-build-error.patch
@ -1,54 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Kevin Buettner <kevinb@redhat.com>
 Date: Thu, 18 Feb 2021 23:04:29 -0700
 Subject: gdb-rhbz1930528-fix-gnulib-build-error.patch
 ;; Backport fix for rawhide build error (RH BZ 1930528).
 amd64-linux-siginfo.c: Adjust include order to avoid gnulib error
 On Fedora rawhide, after updating to glibc-2.33, I'm seeing the
 following build failure:
  CXX    nat/amd64-linux-siginfo.o
 In file included from /usr/include/bits/sigstksz.h:24,
                 from /usr/include/signal.h:315,
                 from ../gnulib/import/signal.h:52,
                 from /ironwood1/sourceware-git/rawhide-gnulib/bld/../../worktree-gnulib/gdbserver/../gdb/nat/amd64-linux-siginfo.c:20:
 ../gnulib/import/unistd.h:663:3: error: #error "Please include config.h first."
  663 |  #error "Please include config.h first."
      |   ^~~~~
 glibc-2.33 has changed signal.h to now include <bits/sigstksz.h> which,
 in turn, includes <unistd.h>. For a gdb build, this causes the gnulib
 version of unistd.h to be pulled in first.  The build failure shown
 above happens because gnulib's config.h has not been included before
 the include of <signal.h>.
 The fix is simple - we just rearrange the order of the header file
 includes to make sure that gdbsupport/commondefs.h is included before
 attempting to include signal.h.  Note that gdbsupport/commondefs.h
 includes <gnulib/config.h>.
 Build and regression tested on Fedora 33.  On Fedora rawhide, GDB
 builds again.
 gdb/ChangeLog:
 	* nat/amd64-linux-siginfo.c: Include "gdbsupport/common-defs.h"
 	(which in turn includes <gnulib/config.h>) before include
 	of <signal.h>.
 diff --git a/gdb/nat/amd64-linux-siginfo.c b/gdb/nat/amd64-linux-siginfo.c
 --- a/gdb/nat/amd64-linux-siginfo.c
 +++ b/gdb/nat/amd64-linux-siginfo.c
@@ -17,8 +17,8 @@
    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 <signal.h>
 #include "gdbsupport/common-defs.h"
 +#include <signal.h>
 #include "amd64-linux-siginfo.h"
 #define GDB_SI_SIZE 128
--- a/gdb-rhbz1932645-aarch64-ptrace-header-order.patch
+++ b/gdb-rhbz1932645-aarch64-ptrace-header-order.patch
@ -1,69 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Kevin Buettner <kevinb@redhat.com>
 Date: Wed, 24 Feb 2021 13:19:08 -0700
 Subject: gdb-rhbz1932645-aarch64-ptrace-header-order.patch
 ;; [aarch64] Backport fix for aarch64-linux-hw-point.c build problem
 ;; (RH BZ 1932645).
 Fix aarch64-linux-hw-point.c build problem
 Due to a recent glibc header file change, the file
 nat/aarch64-linux-hw-point.c no longer builds on Fedora rawhide.
 An enum for PTRACE_SYSEMU is now provided by <sys/ptrace.h>.  In the
 past, PTRACE_SYSEMU was defined only in <asm/ptrace.h>.  This is
 what it looks like...
 In <asm/ptrace.h>:
 #define PTRACE_SYSEMU		  31
 In <sys/ptrace.h>:
 enum __ptrace_request
 {
  ...
  PTRACE_SYSEMU = 31,
 #define PT_SYSEMU PTRACE_SYSEMU
  ...
 }
 When <asm/ptrace.h> and <sys/ptrace.h> are both included in a source
 file, we run into the following build problem when the former is
 included before the latter:
 In file included from nat/aarch64-linux-hw-point.c:26:
 /usr/include/sys/ptrace.h:86:3: error: expected identifier before numeric constant
   86 |   PTRACE_SYSEMU = 31,
      |   ^~~~~~~~~~~~~
 (There are more errors after this one too.)
 The file builds without error when <asm/ptrace.h> is included after
 <sys/ptrace.h>.  I found that this is already done in
 nat/aarch64-sve-linux-ptrace.h (which is included by
 nat/aarch64-linux-ptrace.c).
 I've tested this change on Fedora rawhide and Fedora 33, both
 running on an aarch64 machine.
 gdb/ChangeLog:
 	* nat/aarch64-linux-hw-point.c: Include <asm/ptrace.h> after
 	<sys/ptrace.h>.
 diff --git a/gdb/nat/aarch64-linux-hw-point.c b/gdb/nat/aarch64-linux-hw-point.c
 --- a/gdb/nat/aarch64-linux-hw-point.c
 +++ b/gdb/nat/aarch64-linux-hw-point.c
@@ -23,8 +23,8 @@
 #include "aarch64-linux-hw-point.h"
 #include <sys/uio.h>
 -#include <asm/ptrace.h>
 #include <sys/ptrace.h>
 +#include <asm/ptrace.h>
 #include <elf.h>
 /* Number of hardware breakpoints/watchpoints the target supports.
--- a/gdb-rhbz1964167-convert-enum-range_type.patch
+++ b/gdb-rhbz1964167-convert-enum-range_type.patch
@ -0,0 +1,375 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Kevin Buettner <kevinb@redhat.com>
 Date: Mon, 24 May 2021 17:10:28 -0700
 Subject: gdb-rhbz1964167-convert-enum-range_type.patch
 ;; [fortran] Backport Andrew Burgess's commit which changes enum
 ;; range_type into a bit field enum.
 gdb: Convert enum range_type to a bit field enum
 The expression range_type enum represents the following ideas:
  - Lower bound is set to default,
  - Upper bound is set to default,
  - Upper bound is exclusive.
 There are currently 6 entries in the enum to represent the combination
 of all those ideas.
 In a future commit I'd like to add stride information to the range,
 this could in theory appear with any of the existing enum entries, so
 this would take us to 12 enum entries.
 This feels like its getting a little out of hand, so in this commit I
 switch the range_type enum over to being a flags style enum.  There's
 one entry to represent no flags being set, then 3 flags to represent
 the 3 ideas above.  Adding stride information will require adding only
 one more enum flag.
 I've then gone through and updated the code to handle this change.
 There should be no user visible changes after this commit.
 gdb/ChangeLog:
 	* expprint.c (print_subexp_standard): Update to reflect changes to
 	enum range_type.
 	(dump_subexp_body_standard): Likewise.
 	* expression.h (enum range_type): Convert to a bit field enum, and
 	make the enum unsigned.
 	* f-exp.y (subrange): Update to reflect changes to enum
 	range_type.
 	* f-lang.c (value_f90_subarray): Likewise.
 	* parse.c (operator_length_standard): Likewise.
 	* rust-exp.y (rust_parser::convert_ast_to_expression): Likewise.
 	* rust-lang.c (rust_range): Likewise.
 	(rust_compute_range): Likewise.
 	(rust_subscript): Likewise.
 diff --git a/gdb/expprint.c b/gdb/expprint.c
 --- a/gdb/expprint.c
 +++ b/gdb/expprint.c
@@ -584,17 +584,13 @@ print_subexp_standard (struct expression *exp, int *pos,
 	  longest_to_int (exp->elts[pc + 1].longconst);
 	*pos += 2;
 -	if (range_type == NONE_BOUND_DEFAULT_EXCLUSIVE
 -	    || range_type == LOW_BOUND_DEFAULT_EXCLUSIVE)
 +	if (range_type & RANGE_HIGH_BOUND_EXCLUSIVE)
 	  fputs_filtered ("EXCLUSIVE_", stream);
 	fputs_filtered ("RANGE(", stream);
 -	if (range_type == HIGH_BOUND_DEFAULT
 -	    || range_type == NONE_BOUND_DEFAULT
 -	    || range_type == NONE_BOUND_DEFAULT_EXCLUSIVE)
 +	if (!(range_type & RANGE_LOW_BOUND_DEFAULT))
 	  print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
 	fputs_filtered ("..", stream);
 -	if (range_type == LOW_BOUND_DEFAULT
 -	    || range_type == NONE_BOUND_DEFAULT)
 +	if (!(range_type & RANGE_HIGH_BOUND_DEFAULT))
 	  print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
 	fputs_filtered (")", stream);
 	return;
@@ -1114,36 +1110,19 @@ dump_subexp_body_standard (struct expression *exp,
 	  longest_to_int (exp->elts[elt].longconst);
 	elt += 2;
 -	switch (range_type)
 -	  {
 -	  case BOTH_BOUND_DEFAULT:
 -	    fputs_filtered ("Range '..'", stream);
 -	    break;
 -	  case LOW_BOUND_DEFAULT:
 -	    fputs_filtered ("Range '..EXP'", stream);
 -	    break;
 -	  case LOW_BOUND_DEFAULT_EXCLUSIVE:
 -	    fputs_filtered ("ExclusiveRange '..EXP'", stream);
 -	    break;
 -	  case HIGH_BOUND_DEFAULT:
 -	    fputs_filtered ("Range 'EXP..'", stream);
 -	    break;
 -	  case NONE_BOUND_DEFAULT:
 -	    fputs_filtered ("Range 'EXP..EXP'", stream);
 -	    break;
 -	  case NONE_BOUND_DEFAULT_EXCLUSIVE:
 -	    fputs_filtered ("ExclusiveRange 'EXP..EXP'", stream);
 -	    break;
 -	  default:
 -	    fputs_filtered ("Invalid Range!", stream);
 -	    break;
 -	  }
 +	if (range_type & RANGE_HIGH_BOUND_EXCLUSIVE)
 +	  fputs_filtered ("Exclusive", stream);
 +	fputs_filtered ("Range '", stream);
 +	if (!(range_type & RANGE_LOW_BOUND_DEFAULT))
 +	  fputs_filtered ("EXP", stream);
 +	fputs_filtered ("..", stream);
 +	if (!(range_type & RANGE_HIGH_BOUND_DEFAULT))
 +	  fputs_filtered ("EXP", stream);
 +	fputs_filtered ("'", stream);
 -	if (range_type == HIGH_BOUND_DEFAULT
 -	    || range_type == NONE_BOUND_DEFAULT)
 +	if (!(range_type & RANGE_LOW_BOUND_DEFAULT))
 	  elt = dump_subexp (exp, stream, elt);
 -	if (range_type == LOW_BOUND_DEFAULT
 -	    || range_type == NONE_BOUND_DEFAULT)
 +	if (!(range_type & RANGE_HIGH_BOUND_DEFAULT))
 	  elt = dump_subexp (exp, stream, elt);
       }
       break;
 diff --git a/gdb/expression.h b/gdb/expression.h
 --- a/gdb/expression.h
 +++ b/gdb/expression.h
@@ -185,22 +185,22 @@ extern void dump_prefix_expression (struct expression *, struct ui_file *);
    or inclusive.  So we have six sorts of subrange.  This enumeration
    type is to identify this.  */
 -enum range_type
 +enum range_type : unsigned
 {
 -  /* Neither the low nor the high bound was given -- so this refers to
 -     the entire available range.  */
 -  BOTH_BOUND_DEFAULT,
 -  /* The low bound was not given and the high bound is inclusive.  */
 -  LOW_BOUND_DEFAULT,
 -  /* The high bound was not given and the low bound in inclusive.  */
 -  HIGH_BOUND_DEFAULT,
 -  /* Both bounds were given and both are inclusive.  */
 -  NONE_BOUND_DEFAULT,
 -  /* The low bound was not given and the high bound is exclusive.  */
 -  NONE_BOUND_DEFAULT_EXCLUSIVE,
 -  /* Both bounds were given.  The low bound is inclusive and the high
 -     bound is exclusive.  */
 -  LOW_BOUND_DEFAULT_EXCLUSIVE,
 +  /* This is a standard range.  Both the lower and upper bounds are
 +     defined, and the bounds are inclusive.  */
 +  RANGE_STANDARD = 0,
 +
 +  /* The low bound was not given.  */
 +  RANGE_LOW_BOUND_DEFAULT = 1 << 0,
 +
 +  /* The high bound was not given.  */
 +  RANGE_HIGH_BOUND_DEFAULT = 1 << 1,
 +
 +  /* The high bound of this range is exclusive.  */
 +  RANGE_HIGH_BOUND_EXCLUSIVE = 1 << 2,
 };
 +DEF_ENUM_FLAGS_TYPE (enum range_type, range_types);
 +
 #endif /* !defined (EXPRESSION_H) */
 diff --git a/gdb/f-exp.y b/gdb/f-exp.y
 --- a/gdb/f-exp.y
 +++ b/gdb/f-exp.y
@@ -287,26 +287,30 @@ arglist	:	arglist ',' exp   %prec ABOVE_COMMA
 /* There are four sorts of subrange types in F90.  */
 subrange:	exp ':' exp	%prec ABOVE_COMMA
 -			{ write_exp_elt_opcode (pstate, OP_RANGE); 
 -			  write_exp_elt_longcst (pstate, NONE_BOUND_DEFAULT);
 +			{ write_exp_elt_opcode (pstate, OP_RANGE);
 +			  write_exp_elt_longcst (pstate, RANGE_STANDARD);
 			  write_exp_elt_opcode (pstate, OP_RANGE); }
 	;
 subrange:	exp ':'	%prec ABOVE_COMMA
 			{ write_exp_elt_opcode (pstate, OP_RANGE);
 -			  write_exp_elt_longcst (pstate, HIGH_BOUND_DEFAULT);
 +			  write_exp_elt_longcst (pstate,
 +						 RANGE_HIGH_BOUND_DEFAULT);
 			  write_exp_elt_opcode (pstate, OP_RANGE); }
 	;
 subrange:	':' exp	%prec ABOVE_COMMA
 			{ write_exp_elt_opcode (pstate, OP_RANGE);
 -			  write_exp_elt_longcst (pstate, LOW_BOUND_DEFAULT);
 +			  write_exp_elt_longcst (pstate,
 +						 RANGE_LOW_BOUND_DEFAULT);
 			  write_exp_elt_opcode (pstate, OP_RANGE); }
 	;
 subrange:	':'	%prec ABOVE_COMMA
 			{ write_exp_elt_opcode (pstate, OP_RANGE);
 -			  write_exp_elt_longcst (pstate, BOTH_BOUND_DEFAULT);
 +			  write_exp_elt_longcst (pstate,
 +						 (RANGE_LOW_BOUND_DEFAULT
 +						  | RANGE_HIGH_BOUND_DEFAULT));
 			  write_exp_elt_opcode (pstate, OP_RANGE); }
 	;
 diff --git a/gdb/f-lang.c b/gdb/f-lang.c
 --- a/gdb/f-lang.c
 +++ b/gdb/f-lang.c
@@ -131,12 +131,12 @@ value_f90_subarray (struct value *array,
   *pos += 3;
 -  if (range_type == LOW_BOUND_DEFAULT || range_type == BOTH_BOUND_DEFAULT)
 +  if (range_type & RANGE_LOW_BOUND_DEFAULT)
     low_bound = range->bounds ()->low.const_val ();
   else
     low_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
 -  if (range_type == HIGH_BOUND_DEFAULT || range_type == BOTH_BOUND_DEFAULT)
 +  if (range_type & RANGE_HIGH_BOUND_DEFAULT)
     high_bound = range->bounds ()->high.const_val ();
   else
     high_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
 diff --git a/gdb/parse.c b/gdb/parse.c
 --- a/gdb/parse.c
 +++ b/gdb/parse.c
@@ -921,21 +921,13 @@ operator_length_standard (const struct expression *expr, int endpos,
       range_type = (enum range_type)
 	longest_to_int (expr->elts[endpos - 2].longconst);
 -      switch (range_type)
 -	{
 -	case LOW_BOUND_DEFAULT:
 -	case LOW_BOUND_DEFAULT_EXCLUSIVE:
 -	case HIGH_BOUND_DEFAULT:
 -	  args = 1;
 -	  break;
 -	case BOTH_BOUND_DEFAULT:
 -	  args = 0;
 -	  break;
 -	case NONE_BOUND_DEFAULT:
 -	case NONE_BOUND_DEFAULT_EXCLUSIVE:
 -	  args = 2;
 -	  break;
 -	}
 +      /* Assume the range has 2 arguments (low bound and high bound), then
 +	 reduce the argument count if any bounds are set to default.  */
 +      args = 2;
 +      if (range_type & RANGE_LOW_BOUND_DEFAULT)
 +	--args;
 +      if (range_type & RANGE_HIGH_BOUND_DEFAULT)
 +	--args;
       break;
 diff --git a/gdb/rust-exp.y b/gdb/rust-exp.y
 --- a/gdb/rust-exp.y
 +++ b/gdb/rust-exp.y
@@ -2492,24 +2492,29 @@ rust_parser::convert_ast_to_expression (const struct rust_op *operation,
     case OP_RANGE:
       {
 -	enum range_type kind = BOTH_BOUND_DEFAULT;
 +	enum range_type kind = (RANGE_HIGH_BOUND_DEFAULT
 +				| RANGE_LOW_BOUND_DEFAULT);
 	if (operation->left.op != NULL)
 	  {
 	    convert_ast_to_expression (operation->left.op, top);
 -	    kind = HIGH_BOUND_DEFAULT;
 +	    kind &= ~RANGE_LOW_BOUND_DEFAULT;
 	  }
 	if (operation->right.op != NULL)
 	  {
 	    convert_ast_to_expression (operation->right.op, top);
 -	    if (kind == BOTH_BOUND_DEFAULT)
 -	      kind = (operation->inclusive
 -		      ? LOW_BOUND_DEFAULT : LOW_BOUND_DEFAULT_EXCLUSIVE);
 +	    if (kind == (RANGE_HIGH_BOUND_DEFAULT | RANGE_LOW_BOUND_DEFAULT))
 +	      {
 +		kind = RANGE_LOW_BOUND_DEFAULT;
 +		if (!operation->inclusive)
 +		  kind |= RANGE_HIGH_BOUND_EXCLUSIVE;
 +	      }
 	    else
 	      {
 -		gdb_assert (kind == HIGH_BOUND_DEFAULT);
 -		kind = (operation->inclusive
 -			? NONE_BOUND_DEFAULT : NONE_BOUND_DEFAULT_EXCLUSIVE);
 +		gdb_assert (kind == RANGE_HIGH_BOUND_DEFAULT);
 +		kind = RANGE_STANDARD;
 +		if (!operation->inclusive)
 +		  kind |= RANGE_HIGH_BOUND_EXCLUSIVE;
 	      }
 	  }
 	else
 diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
 --- a/gdb/rust-lang.c
 +++ b/gdb/rust-lang.c
@@ -1082,13 +1082,11 @@ rust_range (struct expression *exp, int *pos, enum noside noside)
   kind = (enum range_type) longest_to_int (exp->elts[*pos + 1].longconst);
   *pos += 3;
 -  if (kind == HIGH_BOUND_DEFAULT || kind == NONE_BOUND_DEFAULT
 -      || kind == NONE_BOUND_DEFAULT_EXCLUSIVE)
 +  if (!(kind & RANGE_LOW_BOUND_DEFAULT))
     low = evaluate_subexp (nullptr, exp, pos, noside);
 -  if (kind == LOW_BOUND_DEFAULT || kind == LOW_BOUND_DEFAULT_EXCLUSIVE
 -      || kind == NONE_BOUND_DEFAULT || kind == NONE_BOUND_DEFAULT_EXCLUSIVE)
 +  if (!(kind & RANGE_HIGH_BOUND_DEFAULT))
     high = evaluate_subexp (nullptr, exp, pos, noside);
 -  bool inclusive = (kind == NONE_BOUND_DEFAULT || kind == LOW_BOUND_DEFAULT);
 +  bool inclusive = !(kind & RANGE_HIGH_BOUND_EXCLUSIVE);
   if (noside == EVAL_SKIP)
     return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, 1);
@@ -1171,13 +1169,13 @@ rust_range (struct expression *exp, int *pos, enum noside noside)
 static void
 rust_compute_range (struct type *type, struct value *range,
 		    LONGEST *low, LONGEST *high,
 -		    enum range_type *kind)
 +		    range_types *kind)
 {
   int i;
   *low = 0;
   *high = 0;
 -  *kind = BOTH_BOUND_DEFAULT;
 +  *kind = RANGE_LOW_BOUND_DEFAULT | RANGE_HIGH_BOUND_DEFAULT;
   if (type->num_fields () == 0)
     return;
@@ -1185,15 +1183,15 @@ rust_compute_range (struct type *type, struct value *range,
   i = 0;
   if (strcmp (TYPE_FIELD_NAME (type, 0), "start") == 0)
     {
 -      *kind = HIGH_BOUND_DEFAULT;
 +      *kind = RANGE_HIGH_BOUND_DEFAULT;
       *low = value_as_long (value_field (range, 0));
       ++i;
     }
   if (type->num_fields () > i
       && strcmp (TYPE_FIELD_NAME (type, i), "end") == 0)
     {
 -      *kind = (*kind == BOTH_BOUND_DEFAULT
 -	       ? LOW_BOUND_DEFAULT : NONE_BOUND_DEFAULT);
 +      *kind = (*kind == (RANGE_LOW_BOUND_DEFAULT | RANGE_HIGH_BOUND_DEFAULT)
 +	       ? RANGE_LOW_BOUND_DEFAULT : RANGE_STANDARD);
       *high = value_as_long (value_field (range, i));
       if (rust_inclusive_range_type_p (type))
@@ -1211,7 +1209,7 @@ rust_subscript (struct expression *exp, int *pos, enum noside noside,
   struct type *rhstype;
   LONGEST low, high_bound;
   /* Initialized to appease the compiler.  */
 -  enum range_type kind = BOTH_BOUND_DEFAULT;
 +  range_types kind = RANGE_LOW_BOUND_DEFAULT | RANGE_HIGH_BOUND_DEFAULT;
   LONGEST high = 0;
   int want_slice = 0;
@@ -1308,8 +1306,7 @@ rust_subscript (struct expression *exp, int *pos, enum noside noside,
       else
 	error (_("Cannot subscript non-array type"));
 -      if (want_slice
 -	  && (kind == BOTH_BOUND_DEFAULT || kind == LOW_BOUND_DEFAULT))
 +      if (want_slice && (kind & RANGE_LOW_BOUND_DEFAULT))
 	low = low_bound;
       if (low < 0)
 	error (_("Index less than zero"));
@@ -1327,7 +1324,7 @@ rust_subscript (struct expression *exp, int *pos, enum noside noside,
 	  CORE_ADDR addr;
 	  struct value *addrval, *tem;
 -	  if (kind == BOTH_BOUND_DEFAULT || kind == HIGH_BOUND_DEFAULT)
 +	  if (kind & RANGE_HIGH_BOUND_DEFAULT)
 	    high = high_bound;
 	  if (high < 0)
 	    error (_("High index less than zero"));
--- a/gdb-rhbz1964167-fortran-array-slices-at-prompt.patch
+++ b/gdb-rhbz1964167-fortran-array-slices-at-prompt.patch
--- a/gdb-rhbz1964167-fortran-array-strides-in-expressions.patch
+++ b/gdb-rhbz1964167-fortran-array-strides-in-expressions.patch
@ -0,0 +1,193 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Kevin Buettner <kevinb@redhat.com>
 Date: Mon, 24 May 2021 22:30:32 -0700
 Subject: gdb-rhbz1964167-fortran-array-strides-in-expressions.patch
 ;; [fortran] Backport Andrew Burgess's commit which adds support
 ;; for array strides in expressions.
 gdb/fortran: add support for parsing array strides in expressions
 With this commit GDB now understands the syntax of Fortran array
 strides, a user can type an expression including an array stride, but
 they will only get an error informing them that array strides are not
 supported.
 This alone is an improvement on what we had before in GDB, better to
 give the user a helpful message that a particular feature is not
 supported than to just claim a syntax error.
 Before:
  (gdb) p array (1:10:2, 2:10:2)
  A syntax error in expression, near `:2, 2:10:2)'.
 Now:
  (gdb) p array (1:10:2, 2:10:2)
  Fortran array strides are not currently supported
 Later commits will allow GDB to handle array strides correctly.
 gdb/ChangeLog:
 	* expprint.c (dump_subexp_body_standard): Print RANGE_HAS_STRIDE.
 	* expression.h (enum range_type): Add RANGE_HAS_STRIDE.
 	* f-exp.y (arglist): Allow for a series of subranges.
 	(subrange): Add cases for subranges with strides.
 	* f-lang.c (value_f90_subarray): Catch use of array strides and
 	throw an error.
 	* parse.c (operator_length_standard): Handle RANGE_HAS_STRIDE.
 gdb/testsuite/ChangeLog:
 	* gdb.fortran/array-slices.exp: Add a new test.
 diff --git a/gdb/expprint.c b/gdb/expprint.c
 --- a/gdb/expprint.c
 +++ b/gdb/expprint.c
@@ -1118,12 +1118,16 @@ dump_subexp_body_standard (struct expression *exp,
 	fputs_filtered ("..", stream);
 	if (!(range_flag & RANGE_HIGH_BOUND_DEFAULT))
 	  fputs_filtered ("EXP", stream);
 +	if (range_flag & RANGE_HAS_STRIDE)
 +	  fputs_filtered (":EXP", stream);
 	fputs_filtered ("'", stream);
 	if (!(range_flag & RANGE_LOW_BOUND_DEFAULT))
 	  elt = dump_subexp (exp, stream, elt);
 	if (!(range_flag & RANGE_HIGH_BOUND_DEFAULT))
 	  elt = dump_subexp (exp, stream, elt);
 +	if (range_flag & RANGE_HAS_STRIDE)
 +	  elt = dump_subexp (exp, stream, elt);
       }
       break;
 diff --git a/gdb/expression.h b/gdb/expression.h
 --- a/gdb/expression.h
 +++ b/gdb/expression.h
@@ -199,6 +199,9 @@ enum range_flag : unsigned
   /* The high bound of this range is exclusive.  */
   RANGE_HIGH_BOUND_EXCLUSIVE = 1 << 2,
 +
 +  /* The range has a stride.  */
 +  RANGE_HAS_STRIDE = 1 << 3,
 };
 DEF_ENUM_FLAGS_TYPE (enum range_flag, range_flags);
 diff --git a/gdb/f-exp.y b/gdb/f-exp.y
 --- a/gdb/f-exp.y
 +++ b/gdb/f-exp.y
@@ -284,6 +284,10 @@ arglist	:	arglist ',' exp   %prec ABOVE_COMMA
 			{ pstate->arglist_len++; }
 	;
 +arglist	:	arglist ',' subrange   %prec ABOVE_COMMA
 +			{ pstate->arglist_len++; }
 +	;
 +
 /* There are four sorts of subrange types in F90.  */
 subrange:	exp ':' exp	%prec ABOVE_COMMA
@@ -314,6 +318,38 @@ subrange:	':'	%prec ABOVE_COMMA
 			  write_exp_elt_opcode (pstate, OP_RANGE); }
 	;
 +/* And each of the four subrange types can also have a stride.  */
 +subrange:	exp ':' exp ':' exp	%prec ABOVE_COMMA
 +			{ write_exp_elt_opcode (pstate, OP_RANGE);
 +			  write_exp_elt_longcst (pstate, RANGE_HAS_STRIDE);
 +			  write_exp_elt_opcode (pstate, OP_RANGE); }
 +	;
 +
 +subrange:	exp ':' ':' exp	%prec ABOVE_COMMA
 +			{ write_exp_elt_opcode (pstate, OP_RANGE);
 +			  write_exp_elt_longcst (pstate,
 +						 (RANGE_HIGH_BOUND_DEFAULT
 +						  | RANGE_HAS_STRIDE));
 +			  write_exp_elt_opcode (pstate, OP_RANGE); }
 +	;
 +
 +subrange:	':' exp ':' exp	%prec ABOVE_COMMA
 +			{ write_exp_elt_opcode (pstate, OP_RANGE);
 +			  write_exp_elt_longcst (pstate,
 +						 (RANGE_LOW_BOUND_DEFAULT
 +						  | RANGE_HAS_STRIDE));
 +			  write_exp_elt_opcode (pstate, OP_RANGE); }
 +	;
 +
 +subrange:	':' ':' exp	%prec ABOVE_COMMA
 +			{ write_exp_elt_opcode (pstate, OP_RANGE);
 +			  write_exp_elt_longcst (pstate,
 +						 (RANGE_LOW_BOUND_DEFAULT
 +						  | RANGE_HIGH_BOUND_DEFAULT
 +						  | RANGE_HAS_STRIDE));
 +			  write_exp_elt_opcode (pstate, OP_RANGE); }
 +	;
 +
 complexnum:     exp ',' exp 
                 	{ }                          
         ;
 diff --git a/gdb/f-lang.c b/gdb/f-lang.c
 --- a/gdb/f-lang.c
 +++ b/gdb/f-lang.c
@@ -124,7 +124,7 @@ value_f90_subarray (struct value *array,
 		    struct expression *exp, int *pos, enum noside noside)
 {
   int pc = (*pos) + 1;
 -  LONGEST low_bound, high_bound;
 +  LONGEST low_bound, high_bound, stride;
   struct type *range = check_typedef (value_type (array)->index_type ());
   enum range_flag range_flag
     = (enum range_flag) longest_to_int (exp->elts[pc].longconst);
@@ -141,6 +141,14 @@ value_f90_subarray (struct value *array,
   else
     high_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
 +  if (range_flag & RANGE_HAS_STRIDE)
 +    stride = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
 +  else
 +    stride = 1;
 +
 +  if (stride != 1)
 +    error (_("Fortran array strides are not currently supported"));
 +
   return value_slice (array, low_bound, high_bound - low_bound + 1);
 }
 diff --git a/gdb/parse.c b/gdb/parse.c
 --- a/gdb/parse.c
 +++ b/gdb/parse.c
@@ -924,6 +924,8 @@ operator_length_standard (const struct expression *expr, int endpos,
       /* Assume the range has 2 arguments (low bound and high bound), then
 	 reduce the argument count if any bounds are set to default.  */
       args = 2;
 +      if (range_flag & RANGE_HAS_STRIDE)
 +	++args;
       if (range_flag & RANGE_LOW_BOUND_DEFAULT)
 	--args;
       if (range_flag & RANGE_HIGH_BOUND_DEFAULT)
 diff --git a/gdb/testsuite/gdb.fortran/array-slices.exp b/gdb/testsuite/gdb.fortran/array-slices.exp
 --- a/gdb/testsuite/gdb.fortran/array-slices.exp
 +++ b/gdb/testsuite/gdb.fortran/array-slices.exp
@@ -66,3 +66,19 @@ foreach result $array_contents msg $message_strings {
 }
 gdb_continue_to_breakpoint "continue to Final Breakpoint"
 +
 +# Next test that asking for an array with stride at the CLI gives an
 +# error.
 +clean_restart ${testfile}
 +
 +if ![fortran_runto_main] then {
 +    perror "couldn't run to main"
 +    continue
 +}
 +
 +gdb_breakpoint "show"
 +gdb_continue_to_breakpoint "show"
 +gdb_test "up" ".*"
 +gdb_test "p array (1:10:2, 1:10:2)" \
 +    "Fortran array strides are not currently supported" \
 +    "using array stride gives an error"
--- a/gdb-rhbz1964167-fortran-clean-up-array-expression-evaluation.patch
+++ b/gdb-rhbz1964167-fortran-clean-up-array-expression-evaluation.patch
@ -0,0 +1,209 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Kevin Buettner <kevinb@redhat.com>
 Date: Mon, 24 May 2021 16:53:22 -0700
 Subject: gdb-rhbz1964167-fortran-clean-up-array-expression-evaluation.patch
 ;; [fortran] Backport Andrew Burgess's commit which cleans up
 ;; array/string expression evaluation.
 gdb/fortran: Clean up array/string expression evaluation
 This commit is a refactor of part of the Fortran array and string
 handling code.
 The current code is split into two blocks, linked, weirdly, with a
 goto.  After this commit all the code is moved to its own function,
 and arrays and strings are now handled using the same code; this will
 be useful later when I want to add array stride support where strings
 will want to be treated just like arrays, but is a good clean up even
 without the array stride work, which is why I'm merging it now.
 For now the new function is added as a static within eval.c, even
 though the function is Fortran only.  A following commit will remove
 some of the Fortran specific code from eval.c into one of the Fortran
 specific files, including this new function.
 There should be no user visible changes after this commit.
 gdb/ChangeLog:
 	* eval.c (fortran_value_subarray): New function, content is taken
 	from...
 	(evaluate_subexp_standard): ...here, in two places.  Now arrays
 	and strings both call the new function.
 	(calc_f77_array_dims): Add header comment, handle strings.
 diff --git a/gdb/eval.c b/gdb/eval.c
 --- a/gdb/eval.c
 +++ b/gdb/eval.c
@@ -1260,6 +1260,67 @@ is_integral_or_integral_reference (struct type *type)
 	  && is_integral_type (TYPE_TARGET_TYPE (type)));
 }
 +/* Called from evaluate_subexp_standard to perform array indexing, and
 +   sub-range extraction, for Fortran.  As well as arrays this function
 +   also handles strings as they can be treated like arrays of characters.
 +   ARRAY is the array or string being accessed.  EXP, POS, and NOSIDE are
 +   as for evaluate_subexp_standard, and NARGS is the number of arguments
 +   in this access (e.g. 'array (1,2,3)' would be NARGS 3).  */
 +
 +static struct value *
 +fortran_value_subarray (struct value *array, struct expression *exp,
 +			int *pos, int nargs, enum noside noside)
 +{
 +  if (exp->elts[*pos].opcode == OP_RANGE)
 +    return value_f90_subarray (array, exp, pos, noside);
 +
 +  if (noside == EVAL_SKIP)
 +    {
 +      skip_undetermined_arglist (nargs, exp, pos, noside);
 +      /* Return the dummy value with the correct type.  */
 +      return array;
 +    }
 +
 +  LONGEST subscript_array[MAX_FORTRAN_DIMS];
 +  int ndimensions = 1;
 +  struct type *type = check_typedef (value_type (array));
 +
 +  if (nargs > MAX_FORTRAN_DIMS)
 +    error (_("Too many subscripts for F77 (%d Max)"), MAX_FORTRAN_DIMS);
 +
 +  ndimensions = calc_f77_array_dims (type);
 +
 +  if (nargs != ndimensions)
 +    error (_("Wrong number of subscripts"));
 +
 +  gdb_assert (nargs > 0);
 +
 +  /* Now that we know we have a legal array subscript expression let us
 +     actually find out where this element exists in the array.  */
 +
 +  /* Take array indices left to right.  */
 +  for (int i = 0; i < nargs; i++)
 +    {
 +      /* Evaluate each subscript; it must be a legal integer in F77.  */
 +      value *arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
 +
 +      /* Fill in the subscript array.  */
 +      subscript_array[i] = value_as_long (arg2);
 +    }
 +
 +  /* Internal type of array is arranged right to left.  */
 +  for (int i = nargs; i > 0; i--)
 +    {
 +      struct type *array_type = check_typedef (value_type (array));
 +      LONGEST index = subscript_array[i - 1];
 +
 +      array = value_subscripted_rvalue (array, index,
 +					f77_get_lowerbound (array_type));
 +    }
 +
 +  return array;
 +}
 +
 struct value *
 evaluate_subexp_standard (struct type *expect_type,
 			  struct expression *exp, int *pos,
@@ -1953,33 +2014,8 @@ evaluate_subexp_standard (struct type *expect_type,
       switch (code)
 	{
 	case TYPE_CODE_ARRAY:
 -	  if (exp->elts[*pos].opcode == OP_RANGE)
 -	    return value_f90_subarray (arg1, exp, pos, noside);
 -	  else
 -	    {
 -	      if (noside == EVAL_SKIP)
 -		{
 -		  skip_undetermined_arglist (nargs, exp, pos, noside);
 -		  /* Return the dummy value with the correct type.  */
 -		  return arg1;
 -		}
 -	      goto multi_f77_subscript;
 -	    }
 -
 	case TYPE_CODE_STRING:
 -	  if (exp->elts[*pos].opcode == OP_RANGE)
 -	    return value_f90_subarray (arg1, exp, pos, noside);
 -	  else
 -	    {
 -	      if (noside == EVAL_SKIP)
 -		{
 -		  skip_undetermined_arglist (nargs, exp, pos, noside);
 -		  /* Return the dummy value with the correct type.  */
 -		  return arg1;
 -		}
 -	      arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
 -	      return value_subscript (arg1, value_as_long (arg2));
 -	    }
 +	  return fortran_value_subarray (arg1, exp, pos, nargs, noside);
 	case TYPE_CODE_PTR:
 	case TYPE_CODE_FUNC:
@@ -2400,49 +2436,6 @@ evaluate_subexp_standard (struct type *expect_type,
 	}
       return (arg1);
 -    multi_f77_subscript:
 -      {
 -	LONGEST subscript_array[MAX_FORTRAN_DIMS];
 -	int ndimensions = 1, i;
 -	struct value *array = arg1;
 -
 -	if (nargs > MAX_FORTRAN_DIMS)
 -	  error (_("Too many subscripts for F77 (%d Max)"), MAX_FORTRAN_DIMS);
 -
 -	ndimensions = calc_f77_array_dims (type);
 -
 -	if (nargs != ndimensions)
 -	  error (_("Wrong number of subscripts"));
 -
 -	gdb_assert (nargs > 0);
 -
 -	/* Now that we know we have a legal array subscript expression 
 -	   let us actually find out where this element exists in the array.  */
 -
 -	/* Take array indices left to right.  */
 -	for (i = 0; i < nargs; i++)
 -	  {
 -	    /* Evaluate each subscript; it must be a legal integer in F77.  */
 -	    arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
 -
 -	    /* Fill in the subscript array.  */
 -
 -	    subscript_array[i] = value_as_long (arg2);
 -	  }
 -
 -	/* Internal type of array is arranged right to left.  */
 -	for (i = nargs; i > 0; i--)
 -	  {
 -	    struct type *array_type = check_typedef (value_type (array));
 -	    LONGEST index = subscript_array[i - 1];
 -
 -	    array = value_subscripted_rvalue (array, index,
 -					      f77_get_lowerbound (array_type));
 -	  }
 -
 -	return array;
 -      }
 -
     case BINOP_LOGICAL_AND:
       arg1 = evaluate_subexp (nullptr, exp, pos, noside);
       if (noside == EVAL_SKIP)
@@ -3354,12 +3347,17 @@ parse_and_eval_type (char *p, int length)
   return expr->elts[1].type;
 }
 +/* Return the number of dimensions for a Fortran array or string.  */
 +
 int
 calc_f77_array_dims (struct type *array_type)
 {
   int ndimen = 1;
   struct type *tmp_type;
 +  if ((array_type->code () == TYPE_CODE_STRING))
 +    return 1;
 +
   if ((array_type->code () != TYPE_CODE_ARRAY))
     error (_("Can't get dimensions for a non-array type"));
--- a/gdb-rhbz1964167-fortran-fix-type-format-mismatch-in-f-lang.c.patch
+++ b/gdb-rhbz1964167-fortran-fix-type-format-mismatch-in-f-lang.c.patch
@ -0,0 +1,128 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Kevin Buettner <kevinb@redhat.com>
 Date: Tue, 25 May 2021 17:34:57 -0700
 Subject: gdb-rhbz1964167-fortran-fix-type-format-mismatch-in-f-lang.c.patch
 ;; [fortran] Backport Simon Marchi's commit which fixes a 32-bit build
 ;; problem in gdb/f-lang.c.
 gdb: fix format string warnings in f-lang.c
 I get a bunch of these warnings when compiling for i386 (32-bit):
      CXX    f-lang.o
    /home/simark/src/binutils-gdb/gdb/f-lang.c: In function 'value* fortran_value_subarray(value*, expression*, int*, int, noside)':
    /home/simark/src/binutils-gdb/gdb/f-lang.c:453:48: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'LONGEST' {aka 'long long int'} [-Werror=format=]
      453 |        debug_printf ("|   |   |-> Low bound: %ld\n", lb);
          |                                              ~~^     ~~
          |                                                |     |
          |                                                |     LONGEST {aka long long int}
          |                                                long int
          |                                              %lld
 Fix them by using plongest/pulongest.
 gdb/ChangeLog:
 	* f-lang.c (fortran_value_subarray): Use plongest/pulongest.
 Change-Id: I666ead5593653d5a1a3dab2ffdc72942c928c7d2
 diff --git a/gdb/f-lang.c b/gdb/f-lang.c
 --- a/gdb/f-lang.c
 +++ b/gdb/f-lang.c
@@ -463,21 +463,21 @@ fortran_value_subarray (struct value *array, struct expression *exp,
 	      std::string str = type_to_string (dim_type);
 	      debug_printf ("|   |-> Type: %s\n", str.c_str ());
 	      debug_printf ("|   |-> Array:\n");
 -	      debug_printf ("|   |   |-> Low bound: %ld\n", lb);
 -	      debug_printf ("|   |   |-> High bound: %ld\n", ub);
 -	      debug_printf ("|   |   |-> Bit stride: %ld\n", sd);
 -	      debug_printf ("|   |   |-> Byte stride: %ld\n", sd / 8);
 -	      debug_printf ("|   |   |-> Type size: %ld\n",
 -			    TYPE_LENGTH (dim_type));
 -	      debug_printf ("|   |   '-> Target type size: %ld\n",
 -			    TYPE_LENGTH (target_type));
 +	      debug_printf ("|   |   |-> Low bound: %s\n", plongest (lb));
 +	      debug_printf ("|   |   |-> High bound: %s\n", plongest (ub));
 +	      debug_printf ("|   |   |-> Bit stride: %s\n", plongest (sd));
 +	      debug_printf ("|   |   |-> Byte stride: %s\n", plongest (sd / 8));
 +	      debug_printf ("|   |   |-> Type size: %s\n",
 +			    pulongest (TYPE_LENGTH (dim_type)));
 +	      debug_printf ("|   |   '-> Target type size: %s\n",
 +			    pulongest (TYPE_LENGTH (target_type)));
 	      debug_printf ("|   |-> Accessing:\n");
 -	      debug_printf ("|   |   |-> Low bound: %ld\n",
 -			    low);
 -	      debug_printf ("|   |   |-> High bound: %ld\n",
 -			    high);
 -	      debug_printf ("|   |   '-> Element stride: %ld\n",
 -			    stride);
 +	      debug_printf ("|   |   |-> Low bound: %s\n",
 +			    plongest (low));
 +	      debug_printf ("|   |   |-> High bound: %s\n",
 +			    plongest (high));
 +	      debug_printf ("|   |   '-> Element stride: %s\n",
 +			    plongest (stride));
 	    }
 	  /* Check the user hasn't asked for something invalid.  */
@@ -519,13 +519,17 @@ fortran_value_subarray (struct value *array, struct expression *exp,
 	  if (fortran_array_slicing_debug)
 	    {
 	      debug_printf ("|   '-> Results:\n");
 -	      debug_printf ("|       |-> Offset = %ld\n", offset);
 -	      debug_printf ("|       |-> Elements = %ld\n", e_count);
 -	      debug_printf ("|       |-> Low bound = %ld\n", new_low);
 -	      debug_printf ("|       |-> High bound = %ld\n", new_high);
 -	      debug_printf ("|       |-> Byte stride = %ld\n", new_stride);
 -	      debug_printf ("|       |-> Last element = %ld\n", last_elem);
 -	      debug_printf ("|       |-> Remainder = %ld\n", remainder);
 +	      debug_printf ("|       |-> Offset = %s\n", plongest (offset));
 +	      debug_printf ("|       |-> Elements = %s\n", plongest (e_count));
 +	      debug_printf ("|       |-> Low bound = %s\n", plongest (new_low));
 +	      debug_printf ("|       |-> High bound = %s\n",
 +			    plongest (new_high));
 +	      debug_printf ("|       |-> Byte stride = %s\n",
 +			    plongest (new_stride));
 +	      debug_printf ("|       |-> Last element = %s\n",
 +			    plongest (last_elem));
 +	      debug_printf ("|       |-> Remainder = %s\n",
 +			    plongest (remainder));
 	      debug_printf ("|       '-> Contiguous = %s\n",
 			    (is_dim_contiguous ? "Yes" : "No"));
 	    }
@@ -561,14 +565,16 @@ fortran_value_subarray (struct value *array, struct expression *exp,
 	      std::string str = type_to_string (dim_type);
 	      debug_printf ("|   |-> Type: %s\n", str.c_str ());
 	      debug_printf ("|   |-> Array:\n");
 -	      debug_printf ("|   |   |-> Low bound: %ld\n", lb);
 -	      debug_printf ("|   |   |-> High bound: %ld\n", ub);
 -	      debug_printf ("|   |   |-> Byte stride: %ld\n", sd);
 -	      debug_printf ("|   |   |-> Type size: %ld\n", TYPE_LENGTH (dim_type));
 -	      debug_printf ("|   |   '-> Target type size: %ld\n",
 -			    TYPE_LENGTH (target_type));
 +	      debug_printf ("|   |   |-> Low bound: %s\n", plongest (lb));
 +	      debug_printf ("|   |   |-> High bound: %s\n", plongest (ub));
 +	      debug_printf ("|   |   |-> Byte stride: %s\n", plongest (sd));
 +	      debug_printf ("|   |   |-> Type size: %s\n",
 +			    pulongest (TYPE_LENGTH (dim_type)));
 +	      debug_printf ("|   |   '-> Target type size: %s\n",
 +			    pulongest (TYPE_LENGTH (target_type)));
 	      debug_printf ("|   '-> Accessing:\n");
 -	      debug_printf ("|       '-> Index: %ld\n", index);
 +	      debug_printf ("|       '-> Index: %s\n",
 +			    plongest (index));
 	    }
 	  /* If the array has actual content then check the index is in
@@ -625,7 +631,8 @@ fortran_value_subarray (struct value *array, struct expression *exp,
       debug_printf ("'-> Final result:\n");
       debug_printf ("    |-> Type: %s\n",
 		    type_to_string (array_slice_type).c_str ());
 -      debug_printf ("    |-> Total offset: %ld\n", total_offset);
 +      debug_printf ("    |-> Total offset: %s\n",
 +		    plongest (total_offset));
       debug_printf ("    |-> Base address: %s\n",
 		    core_addr_to_string (value_address (array)));
       debug_printf ("    '-> Contiguous = %s\n",
--- a/gdb-rhbz1964167-fortran-range_type-to-range_flag.patch
+++ b/gdb-rhbz1964167-fortran-range_type-to-range_flag.patch
@ -0,0 +1,224 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Kevin Buettner <kevinb@redhat.com>
 Date: Mon, 24 May 2021 17:15:27 -0700
 Subject: gdb-rhbz1964167-fortran-range_type-to-range_flag.patch
 ;; [fortran] Backport Andrew Burgess's commit which renames enum
 ;; range_type to enum range_flag.
 gdb: rename 'enum range_type' to 'enum range_flag'
 To avoid confusion with other parts of GDB relating to types and
 ranges, rename this enum to make it clearer that it is a set of
 individual flags rather than an enumeration of different types of
 range.
 There should be no user visible changes after this commit.
 gdb/ChangeLog:
 	* expprint.c (print_subexp_standard): Change enum range_type to
 	range_flag and rename variables to match.
 	(dump_subexp_body_standard): Likewise.
 	* expression.h (enum range_type): Rename to...
 	(enum range_flag): ...this.
 	(range_types): Rename to...
 	(range_flags): ...this.
 	* f-lang.c (value_f90_subarray): Change enum range_type to
 	range_flag and rename variables to match.
 	* parse.c (operator_length_standard): Likewise.
 	* rust-exp.y (rust_parser::convert_ast_to_expression): Change enum
 	range_type to range_flag.
 	* rust-lang.c (rust_evaluate_funcall): Likewise.
 	(rust_range): Likewise.
 	(rust_compute_range): Likewise.
 	(rust_subscript): Likewise.
 diff --git a/gdb/expprint.c b/gdb/expprint.c
 --- a/gdb/expprint.c
 +++ b/gdb/expprint.c
@@ -578,19 +578,19 @@ print_subexp_standard (struct expression *exp, int *pos,
     case OP_RANGE:
       {
 -	enum range_type range_type;
 +	enum range_flag range_flag;
 -	range_type = (enum range_type)
 +	range_flag = (enum range_flag)
 	  longest_to_int (exp->elts[pc + 1].longconst);
 	*pos += 2;
 -	if (range_type & RANGE_HIGH_BOUND_EXCLUSIVE)
 +	if (range_flag & RANGE_HIGH_BOUND_EXCLUSIVE)
 	  fputs_filtered ("EXCLUSIVE_", stream);
 	fputs_filtered ("RANGE(", stream);
 -	if (!(range_type & RANGE_LOW_BOUND_DEFAULT))
 +	if (!(range_flag & RANGE_LOW_BOUND_DEFAULT))
 	  print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
 	fputs_filtered ("..", stream);
 -	if (!(range_type & RANGE_HIGH_BOUND_DEFAULT))
 +	if (!(range_flag & RANGE_HIGH_BOUND_DEFAULT))
 	  print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
 	fputs_filtered (")", stream);
 	return;
@@ -1104,25 +1104,25 @@ dump_subexp_body_standard (struct expression *exp,
       break;
     case OP_RANGE:
       {
 -	enum range_type range_type;
 +	enum range_flag range_flag;
 -	range_type = (enum range_type)
 +	range_flag = (enum range_flag)
 	  longest_to_int (exp->elts[elt].longconst);
 	elt += 2;
 -	if (range_type & RANGE_HIGH_BOUND_EXCLUSIVE)
 +	if (range_flag & RANGE_HIGH_BOUND_EXCLUSIVE)
 	  fputs_filtered ("Exclusive", stream);
 	fputs_filtered ("Range '", stream);
 -	if (!(range_type & RANGE_LOW_BOUND_DEFAULT))
 +	if (!(range_flag & RANGE_LOW_BOUND_DEFAULT))
 	  fputs_filtered ("EXP", stream);
 	fputs_filtered ("..", stream);
 -	if (!(range_type & RANGE_HIGH_BOUND_DEFAULT))
 +	if (!(range_flag & RANGE_HIGH_BOUND_DEFAULT))
 	  fputs_filtered ("EXP", stream);
 	fputs_filtered ("'", stream);
 -	if (!(range_type & RANGE_LOW_BOUND_DEFAULT))
 +	if (!(range_flag & RANGE_LOW_BOUND_DEFAULT))
 	  elt = dump_subexp (exp, stream, elt);
 -	if (!(range_type & RANGE_HIGH_BOUND_DEFAULT))
 +	if (!(range_flag & RANGE_HIGH_BOUND_DEFAULT))
 	  elt = dump_subexp (exp, stream, elt);
       }
       break;
 diff --git a/gdb/expression.h b/gdb/expression.h
 --- a/gdb/expression.h
 +++ b/gdb/expression.h
@@ -185,7 +185,7 @@ extern void dump_prefix_expression (struct expression *, struct ui_file *);
    or inclusive.  So we have six sorts of subrange.  This enumeration
    type is to identify this.  */
 -enum range_type : unsigned
 +enum range_flag : unsigned
 {
   /* This is a standard range.  Both the lower and upper bounds are
      defined, and the bounds are inclusive.  */
@@ -201,6 +201,6 @@ enum range_type : unsigned
   RANGE_HIGH_BOUND_EXCLUSIVE = 1 << 2,
 };
 -DEF_ENUM_FLAGS_TYPE (enum range_type, range_types);
 +DEF_ENUM_FLAGS_TYPE (enum range_flag, range_flags);
 #endif /* !defined (EXPRESSION_H) */
 diff --git a/gdb/f-lang.c b/gdb/f-lang.c
 --- a/gdb/f-lang.c
 +++ b/gdb/f-lang.c
@@ -126,17 +126,17 @@ value_f90_subarray (struct value *array,
   int pc = (*pos) + 1;
   LONGEST low_bound, high_bound;
   struct type *range = check_typedef (value_type (array)->index_type ());
 -  enum range_type range_type
 -    = (enum range_type) longest_to_int (exp->elts[pc].longconst);
 +  enum range_flag range_flag
 +    = (enum range_flag) longest_to_int (exp->elts[pc].longconst);
   *pos += 3;
 -  if (range_type & RANGE_LOW_BOUND_DEFAULT)
 +  if (range_flag & RANGE_LOW_BOUND_DEFAULT)
     low_bound = range->bounds ()->low.const_val ();
   else
     low_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
 -  if (range_type & RANGE_HIGH_BOUND_DEFAULT)
 +  if (range_flag & RANGE_HIGH_BOUND_DEFAULT)
     high_bound = range->bounds ()->high.const_val ();
   else
     high_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
 diff --git a/gdb/parse.c b/gdb/parse.c
 --- a/gdb/parse.c
 +++ b/gdb/parse.c
@@ -774,7 +774,7 @@ operator_length_standard (const struct expression *expr, int endpos,
 {
   int oplen = 1;
   int args = 0;
 -  enum range_type range_type;
 +  enum range_flag range_flag;
   int i;
   if (endpos < 1)
@@ -918,15 +918,15 @@ operator_length_standard (const struct expression *expr, int endpos,
     case OP_RANGE:
       oplen = 3;
 -      range_type = (enum range_type)
 +      range_flag = (enum range_flag)
 	longest_to_int (expr->elts[endpos - 2].longconst);
       /* Assume the range has 2 arguments (low bound and high bound), then
 	 reduce the argument count if any bounds are set to default.  */
       args = 2;
 -      if (range_type & RANGE_LOW_BOUND_DEFAULT)
 +      if (range_flag & RANGE_LOW_BOUND_DEFAULT)
 	--args;
 -      if (range_type & RANGE_HIGH_BOUND_DEFAULT)
 +      if (range_flag & RANGE_HIGH_BOUND_DEFAULT)
 	--args;
       break;
 diff --git a/gdb/rust-exp.y b/gdb/rust-exp.y
 --- a/gdb/rust-exp.y
 +++ b/gdb/rust-exp.y
@@ -2492,7 +2492,7 @@ rust_parser::convert_ast_to_expression (const struct rust_op *operation,
     case OP_RANGE:
       {
 -	enum range_type kind = (RANGE_HIGH_BOUND_DEFAULT
 +	unsigned int kind = (RANGE_HIGH_BOUND_DEFAULT
 				| RANGE_LOW_BOUND_DEFAULT);
 	if (operation->left.op != NULL)
 diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
 --- a/gdb/rust-lang.c
 +++ b/gdb/rust-lang.c
@@ -1070,7 +1070,6 @@ rust_evaluate_funcall (struct expression *exp, int *pos, enum noside noside)
 static struct value *
 rust_range (struct expression *exp, int *pos, enum noside noside)
 {
 -  enum range_type kind;
   struct value *low = NULL, *high = NULL;
   struct value *addrval, *result;
   CORE_ADDR addr;
@@ -1079,7 +1078,8 @@ rust_range (struct expression *exp, int *pos, enum noside noside)
   struct type *temp_type;
   const char *name;
 -  kind = (enum range_type) longest_to_int (exp->elts[*pos + 1].longconst);
 +  auto kind
 +    = (enum range_flag) longest_to_int (exp->elts[*pos + 1].longconst);
   *pos += 3;
   if (!(kind & RANGE_LOW_BOUND_DEFAULT))
@@ -1169,7 +1169,7 @@ rust_range (struct expression *exp, int *pos, enum noside noside)
 static void
 rust_compute_range (struct type *type, struct value *range,
 		    LONGEST *low, LONGEST *high,
 -		    range_types *kind)
 +		    range_flags *kind)
 {
   int i;
@@ -1209,7 +1209,7 @@ rust_subscript (struct expression *exp, int *pos, enum noside noside,
   struct type *rhstype;
   LONGEST low, high_bound;
   /* Initialized to appease the compiler.  */
 -  range_types kind = RANGE_LOW_BOUND_DEFAULT | RANGE_HIGH_BOUND_DEFAULT;
 +  range_flags kind = RANGE_LOW_BOUND_DEFAULT | RANGE_HIGH_BOUND_DEFAULT;
   LONGEST high = 0;
   int want_slice = 0;
--- a/gdb-rhbz1964167-fortran-whitespace_array.patch
+++ b/gdb-rhbz1964167-fortran-whitespace_array.patch
@ -0,0 +1,137 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Kevin Buettner <kevinb@redhat.com>
 Date: Mon, 24 May 2021 17:07:36 -0700
 Subject: gdb-rhbz1964167-fortran-whitespace_array.patch
 ;; [fortran] Backport Andrew Burgess's commit which eliminates undesirable
 ;; whitespace when printing arrays.
 gdb/fortran: Change whitespace when printing arrays
 This commit makes the whitespace usage when printing Fortran arrays
 more consistent, and more inline with how we print C arrays.
 Currently a 2 dimensional Fotran array is printed like this, I find
 the marked whitespace unpleasant:
  (( 1, 2, 3) ( 4, 5, 6) )
    ^          ^        ^
 After this commit the same array is printed like this:
  ((1, 2, 3) (4, 5, 6))
 Which seems more inline with how we print C arrays, in the case of C
 arrays we don't add extra whitespace before the first element.
 gdb/ChangeLog:
 	* f-valprint.c (f77_print_array_1): Adjust printing of whitespace
 	for arrays.
 gdb/testsuite/ChangeLog:
 	* gdb.fortran/array-slices.exp: Update expected results.
 	* gdb.fortran/class-allocatable-array.exp: Likewise.
 	* gdb.fortran/multi-dim.exp: Likewise.
 	* gdb.fortran/vla-type.exp: Likewise.
 	* gdb.mi/mi-vla-fortran.exp: Likewise.
 diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
 --- a/gdb/f-valprint.c
 +++ b/gdb/f-valprint.c
@@ -137,14 +137,17 @@ f77_print_array_1 (int nss, int ndimensions, struct type *type,
 	    (TYPE_TARGET_TYPE (type), value_contents_for_printing_const (val)
 	     + offs, addr + offs);
 -	  fprintf_filtered (stream, "( ");
 +	  fprintf_filtered (stream, "(");
 	  f77_print_array_1 (nss + 1, ndimensions, value_type (subarray),
 			     value_contents_for_printing (subarray),
 			     value_embedded_offset (subarray),
 			     value_address (subarray),
 			     stream, recurse, subarray, options, elts);
 	  offs += byte_stride;
 -	  fprintf_filtered (stream, ") ");
 +	  fprintf_filtered (stream, ")");
 +
 +	  if (i < upperbound)
 +	    fprintf_filtered (stream, " ");
 	}
       if (*elts >= options->print_max && i < upperbound)
 	fprintf_filtered (stream, "...");
 diff --git a/gdb/testsuite/gdb.fortran/array-slices.exp b/gdb/testsuite/gdb.fortran/array-slices.exp
 --- a/gdb/testsuite/gdb.fortran/array-slices.exp
 +++ b/gdb/testsuite/gdb.fortran/array-slices.exp
@@ -38,14 +38,14 @@ gdb_breakpoint [gdb_get_line_number "Final Breakpoint"]
 set array_contents \
     [list \
 -	 " = \\(\\( 1, 2, 3, 4, 5, 6, 7, 8, 9, 10\\) \\( 11, 12, 13, 14, 15, 16, 17, 18, 19, 20\\) \\( 21, 22, 23, 24, 25, 26, 27, 28, 29, 30\\) \\( 31, 32, 33, 34, 35, 36, 37, 38, 39, 40\\) \\( 41, 42, 43, 44, 45, 46, 47, 48, 49, 50\\) \\( 51, 52, 53, 54, 55, 56, 57, 58, 59, 60\\) \\( 61, 62, 63, 64, 65, 66, 67, 68, 69, 70\\) \\( 71, 72, 73, 74, 75, 76, 77, 78, 79, 80\\) \\( 81, 82, 83, 84, 85, 86, 87, 88, 89, 90\\) \\( 91, 92, 93, 94, 95, 96, 97, 98, 99, 100\\) \\)" \
 -	 " = \\(\\( 1, 2, 3, 4, 5\\) \\( 11, 12, 13, 14, 15\\) \\( 21, 22, 23, 24, 25\\) \\( 31, 32, 33, 34, 35\\) \\( 41, 42, 43, 44, 45\\) \\)" \
 -	 " = \\(\\( 1, 3, 5, 7, 9\\) \\( 21, 23, 25, 27, 29\\) \\( 41, 43, 45, 47, 49\\) \\( 61, 63, 65, 67, 69\\) \\( 81, 83, 85, 87, 89\\) \\)" \
 -	 " = \\(\\( 1, 4, 7, 10\\) \\( 21, 24, 27, 30\\) \\( 41, 44, 47, 50\\) \\( 61, 64, 67, 70\\) \\( 81, 84, 87, 90\\) \\)" \
 -	 " = \\(\\( 1, 5, 9\\) \\( 31, 35, 39\\) \\( 61, 65, 69\\) \\( 91, 95, 99\\) \\)" \
 -	 " = \\(\\( -26, -25, -24, -23, -22, -21, -20, -19, -18, -17\\) \\( -19, -18, -17, -16, -15, -14, -13, -12, -11, -10\\) \\( -12, -11, -10, -9, -8, -7, -6, -5, -4, -3\\) \\( -5, -4, -3, -2, -1, 0, 1, 2, 3, 4\\) \\( 2, 3, 4, 5, 6, 7, 8, 9, 10, 11\\) \\( 9, 10, 11, 12, 13, 14, 15, 16, 17, 18\\) \\( 16, 17, 18, 19, 20, 21, 22, 23, 24, 25\\) \\( 23, 24, 25, 26, 27, 28, 29, 30, 31, 32\\) \\( 30, 31, 32, 33, 34, 35, 36, 37, 38, 39\\) \\( 37, 38, 39, 40, 41, 42, 43, 44, 45, 46\\) \\)" \
 -	 " = \\(\\( -26, -25, -24, -23, -22, -21\\) \\( -19, -18, -17, -16, -15, -14\\) \\( -12, -11, -10, -9, -8, -7\\) \\)" \
 -	 " = \\(\\( -26, -24, -22, -20, -18\\) \\( -5, -3, -1, 1, 3\\) \\( 16, 18, 20, 22, 24\\) \\( 37, 39, 41, 43, 45\\) \\)" ]
 +	 " = \\(\\(1, 2, 3, 4, 5, 6, 7, 8, 9, 10\\) \\(11, 12, 13, 14, 15, 16, 17, 18, 19, 20\\) \\(21, 22, 23, 24, 25, 26, 27, 28, 29, 30\\) \\(31, 32, 33, 34, 35, 36, 37, 38, 39, 40\\) \\(41, 42, 43, 44, 45, 46, 47, 48, 49, 50\\) \\(51, 52, 53, 54, 55, 56, 57, 58, 59, 60\\) \\(61, 62, 63, 64, 65, 66, 67, 68, 69, 70\\) \\(71, 72, 73, 74, 75, 76, 77, 78, 79, 80\\) \\(81, 82, 83, 84, 85, 86, 87, 88, 89, 90\\) \\(91, 92, 93, 94, 95, 96, 97, 98, 99, 100\\)\\)" \
 +	 " = \\(\\(1, 2, 3, 4, 5\\) \\(11, 12, 13, 14, 15\\) \\(21, 22, 23, 24, 25\\) \\(31, 32, 33, 34, 35\\) \\(41, 42, 43, 44, 45\\)\\)" \
 +	 " = \\(\\(1, 3, 5, 7, 9\\) \\(21, 23, 25, 27, 29\\) \\(41, 43, 45, 47, 49\\) \\(61, 63, 65, 67, 69\\) \\(81, 83, 85, 87, 89\\)\\)" \
 +	 " = \\(\\(1, 4, 7, 10\\) \\(21, 24, 27, 30\\) \\(41, 44, 47, 50\\) \\(61, 64, 67, 70\\) \\(81, 84, 87, 90\\)\\)" \
 +	 " = \\(\\(1, 5, 9\\) \\(31, 35, 39\\) \\(61, 65, 69\\) \\(91, 95, 99\\)\\)" \
 +	 " = \\(\\(-26, -25, -24, -23, -22, -21, -20, -19, -18, -17\\) \\(-19, -18, -17, -16, -15, -14, -13, -12, -11, -10\\) \\(-12, -11, -10, -9, -8, -7, -6, -5, -4, -3\\) \\(-5, -4, -3, -2, -1, 0, 1, 2, 3, 4\\) \\(2, 3, 4, 5, 6, 7, 8, 9, 10, 11\\) \\(9, 10, 11, 12, 13, 14, 15, 16, 17, 18\\) \\(16, 17, 18, 19, 20, 21, 22, 23, 24, 25\\) \\(23, 24, 25, 26, 27, 28, 29, 30, 31, 32\\) \\(30, 31, 32, 33, 34, 35, 36, 37, 38, 39\\) \\(37, 38, 39, 40, 41, 42, 43, 44, 45, 46\\)\\)" \
 +	 " = \\(\\(-26, -25, -24, -23, -22, -21\\) \\(-19, -18, -17, -16, -15, -14\\) \\(-12, -11, -10, -9, -8, -7\\)\\)" \
 +	 " = \\(\\(-26, -24, -22, -20, -18\\) \\(-5, -3, -1, 1, 3\\) \\(16, 18, 20, 22, 24\\) \\(37, 39, 41, 43, 45\\)\\)" ]
 set message_strings \
     [list \
 diff --git a/gdb/testsuite/gdb.fortran/class-allocatable-array.exp b/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
 --- a/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
 +++ b/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
@@ -40,4 +40,4 @@ gdb_continue_to_breakpoint "Break Here"
 # cetainly going to fail.
 gdb_test "print this" " = \\( _data = \[^\r\n\]+, _vptr = \[^\r\n\]+\\)"
 gdb_test "print this%_data" " = \\(PTR TO -> \\( Type test_type \\)\\) \[^\r\n\]+"
 -gdb_test "print this%_data%b" " = \\(\\( 1, 2, 3\\) \\( 4, 5, 6\\) \\)"
 +gdb_test "print this%_data%b" " = \\(\\(1, 2, 3\\) \\(4, 5, 6\\)\\)"
 diff --git a/gdb/testsuite/gdb.fortran/multi-dim.exp b/gdb/testsuite/gdb.fortran/multi-dim.exp
 --- a/gdb/testsuite/gdb.fortran/multi-dim.exp
 +++ b/gdb/testsuite/gdb.fortran/multi-dim.exp
@@ -57,7 +57,7 @@ gdb_test "print foo(3,3,4)" \
     "print an invalid array index (3,3,4)"
 gdb_test "print foo" \
 -    { = \(\( \( 10, 10\) \( 10, 10\) \( 10, 10\) \) \( \( 10, 10\) \( 10, 10\) \( 10, 10\) \) \( \( 10, 10\) \( 10, 10\) \( 10, 10\) \) \( \( 10, 10\) \( 10, 10\) \( 10, 20\) \) \)} \
 +    { = \(\(\(10, 10\) \(10, 10\) \(10, 10\)\) \(\(10, 10\) \(10, 10\) \(10, 10\)\) \(\(10, 10\) \(10, 10\) \(10, 10\)\) \(\(10, 10\) \(10, 10\) \(10, 20\)\)\)} \
     "print full contents of the array"
 gdb_breakpoint [gdb_get_line_number "break-variable"]
 diff --git a/gdb/testsuite/gdb.fortran/vla-type.exp b/gdb/testsuite/gdb.fortran/vla-type.exp
 --- a/gdb/testsuite/gdb.fortran/vla-type.exp
 +++ b/gdb/testsuite/gdb.fortran/vla-type.exp
@@ -66,9 +66,9 @@ gdb_test "ptype twov" \
                      "\\s+$int, allocatable :: ivla1\\\(5,12,99\\\)" \
                      "\\s+$int, allocatable :: ivla2\\\(9,12\\\)" \
                      "End Type two" ]
 -gdb_test "print twov" " = \\\( ivla1 = \\\(\\\( \\\( 1, 1, 1, 1, 1\\\)\
 - \\\( 1, 1, 321, 1, 1\\\)\
 - \\\( 1, 1, 1, 1, 1\\\) .*"
 +gdb_test "print twov" " = \\\( ivla1 = \\\(\\\(\\\(1, 1, 1, 1, 1\\\)\
 + \\\(1, 1, 321, 1, 1\\\)\
 + \\\(1, 1, 1, 1, 1\\\) .*"
 # Check type with attribute at beginn of type
 gdb_breakpoint [gdb_get_line_number "threev-filled"]
 diff --git a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
 --- a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
 +++ b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
@@ -180,7 +180,7 @@ mi_run_cmd
 mi_expect_stop "breakpoint-hit" "vla" "" ".*vla.f90" "$bp_lineno" \
   { "" "disp=\"del\"" } "run to breakpoint at line $bp_lineno"
 mi_gdb_test "590-data-evaluate-expression pvla2" \
 -  "590\\^done,value=\"\\(\\( 2, 2, 2, 2, 2\\) \\( 2, 2, 2, 2, 2\\) \\)\"" \
 +  "590\\^done,value=\"\\(\\(2, 2, 2, 2, 2\\) \\(2, 2, 2, 2, 2\\)\\)\"" \
   "evaluate associated vla"
 mi_create_varobj_checked pvla2_associated pvla2 \
--- a/gdb-rhbz1964167-move-fortran-expr-handling.patch
+++ b/gdb-rhbz1964167-move-fortran-expr-handling.patch
@ -0,0 +1,787 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Kevin Buettner <kevinb@redhat.com>
 Date: Mon, 24 May 2021 17:00:17 -0700
 Subject: gdb-rhbz1964167-move-fortran-expr-handling.patch
 ;; [fortran] Backport Andrew Burgess's commit which moves Fortran
 ;; expression handling to f-lang.c.
 gdb/fortran: Move Fortran expression handling into f-lang.c
 The Fortran specific OP_F77_UNDETERMINED_ARGLIST is currently handled
 in the generic expression handling code.  There's no reason why this
 should be the case, so this commit moves handling of this into Fortran
 specific files.
 There should be no user visible changes after this commit.
 gdb/ChangeLog:
 	* eval.c: Remove 'f-lang.h' include.
 	(value_f90_subarray): Moved to f-lang.c.
 	(eval_call): Renamed to...
 	(evaluate_subexp_do_call): ...this, is no longer static, header
 	comment moved into header file.
 	(evaluate_funcall): Update call to eval_call.
 	(skip_undetermined_arglist): Moved to f-lang.c.
 	(fortran_value_subarray): Likewise.
 	(evaluate_subexp_standard): OP_F77_UNDETERMINED_ARGLIST handling
 	moved to evaluate_subexp_f.
 	(calc_f77_array_dims): Moved to f-lang.c
 	* expprint.c (print_subexp_funcall): New function.
 	(print_subexp_standard): OP_F77_UNDETERMINED_ARGLIST handling
 	moved to print_subexp_f, OP_FUNCALL uses new function.
 	(dump_subexp_body_funcall): New function.
 	(dump_subexp_body_standard): OP_F77_UNDETERMINED_ARGLIST handling
 	moved to dump_subexp_f, OP_FUNCALL uses new function.
 	* expression.h (evaluate_subexp_do_call): Declare.
 	* f-lang.c (value_f90_subarray): Moved from eval.c.
 	(skip_undetermined_arglist): Likewise.
 	(calc_f77_array_dims): Likewise.
 	(fortran_value_subarray): Likewise.
 	(evaluate_subexp_f): Add OP_F77_UNDETERMINED_ARGLIST support.
 	(operator_length_f): Likewise.
 	(print_subexp_f): Likewise.
 	(dump_subexp_body_f): Likewise.
 	* fortran-operator.def (OP_F77_UNDETERMINED_ARGLIST): Move
 	declaration of this operation to here.
 	* parse.c (operator_length_standard): OP_F77_UNDETERMINED_ARGLIST
 	support moved to operator_length_f.
 	* parser-defs.h (dump_subexp_body_funcall): Declare.
 	(print_subexp_funcall): Declare.
 	* std-operator.def (OP_F77_UNDETERMINED_ARGLIST): Moved to
 	fortran-operator.def.
 diff --git a/gdb/eval.c b/gdb/eval.c
 --- a/gdb/eval.c
 +++ b/gdb/eval.c
@@ -26,7 +26,6 @@
 #include "frame.h"
 #include "gdbthread.h"
 #include "language.h"		/* For CAST_IS_CONVERSION.  */
 -#include "f-lang.h"		/* For array bound stuff.  */
 #include "cp-abi.h"
 #include "infcall.h"
 #include "objc-lang.h"
@@ -371,32 +370,6 @@ init_array_element (struct value *array, struct value *element,
   return index;
 }
 -static struct value *
 -value_f90_subarray (struct value *array,
 -		    struct expression *exp, int *pos, enum noside noside)
 -{
 -  int pc = (*pos) + 1;
 -  LONGEST low_bound, high_bound;
 -  struct type *range = check_typedef (value_type (array)->index_type ());
 -  enum range_type range_type
 -    = (enum range_type) longest_to_int (exp->elts[pc].longconst);
 - 
 -  *pos += 3;
 -
 -  if (range_type == LOW_BOUND_DEFAULT || range_type == BOTH_BOUND_DEFAULT)
 -    low_bound = range->bounds ()->low.const_val ();
 -  else
 -    low_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
 -
 -  if (range_type == HIGH_BOUND_DEFAULT || range_type == BOTH_BOUND_DEFAULT)
 -    high_bound = range->bounds ()->high.const_val ();
 -  else
 -    high_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
 -
 -  return value_slice (array, low_bound, high_bound - low_bound + 1);
 -}
 -
 -
 /* Promote value ARG1 as appropriate before performing a unary operation
    on this argument.
    If the result is not appropriate for any particular language then it
@@ -749,17 +722,13 @@ eval_skip_value (expression *exp)
   return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, 1);
 }
 -/* Evaluate a function call.  The function to be called is in
 -   ARGVEC[0] and the arguments passed to the function are in
 -   ARGVEC[1..NARGS].  FUNCTION_NAME is the name of the function, if
 -   known.  DEFAULT_RETURN_TYPE is used as the function's return type
 -   if the return type is unknown.  */
 +/* See expression.h.  */
 -static value *
 -eval_call (expression *exp, enum noside noside,
 -	   int nargs, value **argvec,
 -	   const char *function_name,
 -	   type *default_return_type)
 +value *
 +evaluate_subexp_do_call (expression *exp, enum noside noside,
 +			 int nargs, value **argvec,
 +			 const char *function_name,
 +			 type *default_return_type)
 {
   if (argvec[0] == NULL)
     error (_("Cannot evaluate function -- may be inlined"));
@@ -1230,20 +1199,8 @@ evaluate_funcall (type *expect_type, expression *exp, int *pos,
       /* Nothing to be done; argvec already correctly set up.  */
     }
 -  return eval_call (exp, noside, nargs, argvec, var_func_name, expect_type);
 -}
 -
 -/* Helper for skipping all the arguments in an undetermined argument list.
 -   This function was designed for use in the OP_F77_UNDETERMINED_ARGLIST
 -   case of evaluate_subexp_standard as multiple, but not all, code paths
 -   require a generic skip.  */
 -
 -static void
 -skip_undetermined_arglist (int nargs, struct expression *exp, int *pos,
 -			   enum noside noside)
 -{
 -  for (int i = 0; i < nargs; ++i)
 -    evaluate_subexp (nullptr, exp, pos, noside);
 +  return evaluate_subexp_do_call (exp, noside, nargs, argvec,
 +				  var_func_name, expect_type);
 }
 /* Return true if type is integral or reference to integral */
@@ -1260,67 +1217,6 @@ is_integral_or_integral_reference (struct type *type)
 	  && is_integral_type (TYPE_TARGET_TYPE (type)));
 }
 -/* Called from evaluate_subexp_standard to perform array indexing, and
 -   sub-range extraction, for Fortran.  As well as arrays this function
 -   also handles strings as they can be treated like arrays of characters.
 -   ARRAY is the array or string being accessed.  EXP, POS, and NOSIDE are
 -   as for evaluate_subexp_standard, and NARGS is the number of arguments
 -   in this access (e.g. 'array (1,2,3)' would be NARGS 3).  */
 -
 -static struct value *
 -fortran_value_subarray (struct value *array, struct expression *exp,
 -			int *pos, int nargs, enum noside noside)
 -{
 -  if (exp->elts[*pos].opcode == OP_RANGE)
 -    return value_f90_subarray (array, exp, pos, noside);
 -
 -  if (noside == EVAL_SKIP)
 -    {
 -      skip_undetermined_arglist (nargs, exp, pos, noside);
 -      /* Return the dummy value with the correct type.  */
 -      return array;
 -    }
 -
 -  LONGEST subscript_array[MAX_FORTRAN_DIMS];
 -  int ndimensions = 1;
 -  struct type *type = check_typedef (value_type (array));
 -
 -  if (nargs > MAX_FORTRAN_DIMS)
 -    error (_("Too many subscripts for F77 (%d Max)"), MAX_FORTRAN_DIMS);
 -
 -  ndimensions = calc_f77_array_dims (type);
 -
 -  if (nargs != ndimensions)
 -    error (_("Wrong number of subscripts"));
 -
 -  gdb_assert (nargs > 0);
 -
 -  /* Now that we know we have a legal array subscript expression let us
 -     actually find out where this element exists in the array.  */
 -
 -  /* Take array indices left to right.  */
 -  for (int i = 0; i < nargs; i++)
 -    {
 -      /* Evaluate each subscript; it must be a legal integer in F77.  */
 -      value *arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
 -
 -      /* Fill in the subscript array.  */
 -      subscript_array[i] = value_as_long (arg2);
 -    }
 -
 -  /* Internal type of array is arranged right to left.  */
 -  for (int i = nargs; i > 0; i--)
 -    {
 -      struct type *array_type = check_typedef (value_type (array));
 -      LONGEST index = subscript_array[i - 1];
 -
 -      array = value_subscripted_rvalue (array, index,
 -					f77_get_lowerbound (array_type));
 -    }
 -
 -  return array;
 -}
 -
 struct value *
 evaluate_subexp_standard (struct type *expect_type,
 			  struct expression *exp, int *pos,
@@ -1335,7 +1231,6 @@ evaluate_subexp_standard (struct type *expect_type,
   struct type *type;
   int nargs;
   struct value **argvec;
 -  int code;
   int ix;
   long mem_offset;
   struct type **arg_types;
@@ -1976,84 +1871,6 @@ evaluate_subexp_standard (struct type *expect_type,
     case OP_FUNCALL:
       return evaluate_funcall (expect_type, exp, pos, noside);
 -    case OP_F77_UNDETERMINED_ARGLIST:
 -
 -      /* Remember that in F77, functions, substring ops and 
 -         array subscript operations cannot be disambiguated 
 -         at parse time.  We have made all array subscript operations, 
 -         substring operations as well as function calls  come here 
 -         and we now have to discover what the heck this thing actually was.
 -         If it is a function, we process just as if we got an OP_FUNCALL.  */
 -
 -      nargs = longest_to_int (exp->elts[pc + 1].longconst);
 -      (*pos) += 2;
 -
 -      /* First determine the type code we are dealing with.  */
 -      arg1 = evaluate_subexp (nullptr, exp, pos, noside);
 -      type = check_typedef (value_type (arg1));
 -      code = type->code ();
 -
 -      if (code == TYPE_CODE_PTR)
 -	{
 -	  /* Fortran always passes variable to subroutines as pointer.
 -	     So we need to look into its target type to see if it is
 -	     array, string or function.  If it is, we need to switch
 -	     to the target value the original one points to.  */ 
 -	  struct type *target_type = check_typedef (TYPE_TARGET_TYPE (type));
 -
 -	  if (target_type->code () == TYPE_CODE_ARRAY
 -	      || target_type->code () == TYPE_CODE_STRING
 -	      || target_type->code () == TYPE_CODE_FUNC)
 -	    {
 -	      arg1 = value_ind (arg1);
 -	      type = check_typedef (value_type (arg1));
 -	      code = type->code ();
 -	    }
 -	} 
 -
 -      switch (code)
 -	{
 -	case TYPE_CODE_ARRAY:
 -	case TYPE_CODE_STRING:
 -	  return fortran_value_subarray (arg1, exp, pos, nargs, noside);
 -
 -	case TYPE_CODE_PTR:
 -	case TYPE_CODE_FUNC:
 -	case TYPE_CODE_INTERNAL_FUNCTION:
 -	  /* It's a function call.  */
 -	  /* Allocate arg vector, including space for the function to be
 -	     called in argvec[0] and a terminating NULL.  */
 -	  argvec = (struct value **)
 -	    alloca (sizeof (struct value *) * (nargs + 2));
 -	  argvec[0] = arg1;
 -	  tem = 1;
 -	  for (; tem <= nargs; tem++)
 -	    {
 -	      argvec[tem] = evaluate_subexp_with_coercion (exp, pos, noside);
 -	      /* Arguments in Fortran are passed by address.  Coerce the
 -		 arguments here rather than in value_arg_coerce as otherwise
 -		 the call to malloc to place the non-lvalue parameters in
 -		 target memory is hit by this Fortran specific logic.  This
 -		 results in malloc being called with a pointer to an integer
 -		 followed by an attempt to malloc the arguments to malloc in
 -		 target memory.  Infinite recursion ensues.  */
 -	      if (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC)
 -		{
 -		  bool is_artificial
 -		    = TYPE_FIELD_ARTIFICIAL (value_type (arg1), tem - 1);
 -		  argvec[tem] = fortran_argument_convert (argvec[tem],
 -							  is_artificial);
 -		}
 -	    }
 -	  argvec[tem] = 0;	/* signal end of arglist */
 -	  if (noside == EVAL_SKIP)
 -	    return eval_skip_value (exp);
 -	  return eval_call (exp, noside, nargs, argvec, NULL, expect_type);
 -
 -	default:
 -	  error (_("Cannot perform substring on this type"));
 -	}
 -
     case OP_COMPLEX:
       /* We have a complex number, There should be 2 floating 
          point numbers that compose it.  */
@@ -3346,27 +3163,3 @@ parse_and_eval_type (char *p, int length)
     error (_("Internal error in eval_type."));
   return expr->elts[1].type;
 }
 -
 -/* Return the number of dimensions for a Fortran array or string.  */
 -
 -int
 -calc_f77_array_dims (struct type *array_type)
 -{
 -  int ndimen = 1;
 -  struct type *tmp_type;
 -
 -  if ((array_type->code () == TYPE_CODE_STRING))
 -    return 1;
 -
 -  if ((array_type->code () != TYPE_CODE_ARRAY))
 -    error (_("Can't get dimensions for a non-array type"));
 -
 -  tmp_type = array_type;
 -
 -  while ((tmp_type = TYPE_TARGET_TYPE (tmp_type)))
 -    {
 -      if (tmp_type->code () == TYPE_CODE_ARRAY)
 -	++ndimen;
 -    }
 -  return ndimen;
 -}
 diff --git a/gdb/expprint.c b/gdb/expprint.c
 --- a/gdb/expprint.c
 +++ b/gdb/expprint.c
@@ -53,6 +53,25 @@ print_subexp (struct expression *exp, int *pos,
   exp->language_defn->la_exp_desc->print_subexp (exp, pos, stream, prec);
 }
 +/* See parser-defs.h.  */
 +
 +void
 +print_subexp_funcall (struct expression *exp, int *pos,
 +		      struct ui_file *stream)
 +{
 +  (*pos) += 2;
 +  unsigned nargs = longest_to_int (exp->elts[*pos].longconst);
 +  print_subexp (exp, pos, stream, PREC_SUFFIX);
 +  fputs_filtered (" (", stream);
 +  for (unsigned tem = 0; tem < nargs; tem++)
 +    {
 +      if (tem != 0)
 +	fputs_filtered (", ", stream);
 +      print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
 +    }
 +  fputs_filtered (")", stream);
 +}
 +
 /* Standard implementation of print_subexp for use in language_defn
    vectors.  */
 void
@@ -187,18 +206,7 @@ print_subexp_standard (struct expression *exp, int *pos,
       return;
     case OP_FUNCALL:
 -    case OP_F77_UNDETERMINED_ARGLIST:
 -      (*pos) += 2;
 -      nargs = longest_to_int (exp->elts[pc + 1].longconst);
 -      print_subexp (exp, pos, stream, PREC_SUFFIX);
 -      fputs_filtered (" (", stream);
 -      for (tem = 0; tem < nargs; tem++)
 -	{
 -	  if (tem != 0)
 -	    fputs_filtered (", ", stream);
 -	  print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
 -	}
 -      fputs_filtered (")", stream);
 +      print_subexp_funcall (exp, pos, stream);
       return;
     case OP_NAME:
@@ -796,6 +804,22 @@ dump_subexp_body (struct expression *exp, struct ui_file *stream, int elt)
   return exp->language_defn->la_exp_desc->dump_subexp_body (exp, stream, elt);
 }
 +/* See parser-defs.h.  */
 +
 +int
 +dump_subexp_body_funcall (struct expression *exp,
 +			  struct ui_file *stream, int elt)
 +{
 +  int nargs = longest_to_int (exp->elts[elt].longconst);
 +  fprintf_filtered (stream, "Number of args: %d", nargs);
 +  elt += 2;
 +
 +  for (int i = 1; i <= nargs + 1; i++)
 +    elt = dump_subexp (exp, stream, elt);
 +
 +  return elt;
 +}
 +
 /* Default value for subexp_body in exp_descriptor vector.  */
 int
@@ -931,18 +955,7 @@ dump_subexp_body_standard (struct expression *exp,
       elt += 2;
       break;
     case OP_FUNCALL:
 -    case OP_F77_UNDETERMINED_ARGLIST:
 -      {
 -	int i, nargs;
 -
 -	nargs = longest_to_int (exp->elts[elt].longconst);
 -
 -	fprintf_filtered (stream, "Number of args: %d", nargs);
 -	elt += 2;
 -
 -	for (i = 1; i <= nargs + 1; i++)
 -	  elt = dump_subexp (exp, stream, elt);
 -      }
 +      elt = dump_subexp_body_funcall (exp, stream, elt);
       break;
     case OP_ARRAY:
       {
 diff --git a/gdb/expression.h b/gdb/expression.h
 --- a/gdb/expression.h
 +++ b/gdb/expression.h
@@ -155,6 +155,18 @@ enum noside
 extern struct value *evaluate_subexp_standard
   (struct type *, struct expression *, int *, enum noside);
 +/* Evaluate a function call.  The function to be called is in ARGVEC[0] and
 +   the arguments passed to the function are in ARGVEC[1..NARGS].
 +   FUNCTION_NAME is the name of the function, if known.
 +   DEFAULT_RETURN_TYPE is used as the function's return type if the return
 +   type is unknown.  */
 +
 +extern struct value *evaluate_subexp_do_call (expression *exp,
 +					      enum noside noside,
 +					      int nargs, value **argvec,
 +					      const char *function_name,
 +					      type *default_return_type);
 +
 /* From expprint.c */
 extern void print_expression (struct expression *, struct ui_file *);
 diff --git a/gdb/f-lang.c b/gdb/f-lang.c
 --- a/gdb/f-lang.c
 +++ b/gdb/f-lang.c
@@ -114,6 +114,134 @@ enum f_primitive_types {
   nr_f_primitive_types
 };
 +/* Called from fortran_value_subarray to take a slice of an array or a
 +   string.  ARRAY is the array or string to be accessed.  EXP, POS, and
 +   NOSIDE are as for evaluate_subexp_standard.  Return a value that is a
 +   slice of the array.  */
 +
 +static struct value *
 +value_f90_subarray (struct value *array,
 +		    struct expression *exp, int *pos, enum noside noside)
 +{
 +  int pc = (*pos) + 1;
 +  LONGEST low_bound, high_bound;
 +  struct type *range = check_typedef (value_type (array)->index_type ());
 +  enum range_type range_type
 +    = (enum range_type) longest_to_int (exp->elts[pc].longconst);
 +
 +  *pos += 3;
 +
 +  if (range_type == LOW_BOUND_DEFAULT || range_type == BOTH_BOUND_DEFAULT)
 +    low_bound = range->bounds ()->low.const_val ();
 +  else
 +    low_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
 +
 +  if (range_type == HIGH_BOUND_DEFAULT || range_type == BOTH_BOUND_DEFAULT)
 +    high_bound = range->bounds ()->high.const_val ();
 +  else
 +    high_bound = value_as_long (evaluate_subexp (nullptr, exp, pos, noside));
 +
 +  return value_slice (array, low_bound, high_bound - low_bound + 1);
 +}
 +
 +/* Helper for skipping all the arguments in an undetermined argument list.
 +   This function was designed for use in the OP_F77_UNDETERMINED_ARGLIST
 +   case of evaluate_subexp_standard as multiple, but not all, code paths
 +   require a generic skip.  */
 +
 +static void
 +skip_undetermined_arglist (int nargs, struct expression *exp, int *pos,
 +			   enum noside noside)
 +{
 +  for (int i = 0; i < nargs; ++i)
 +    evaluate_subexp (nullptr, exp, pos, noside);
 +}
 +
 +/* Return the number of dimensions for a Fortran array or string.  */
 +
 +int
 +calc_f77_array_dims (struct type *array_type)
 +{
 +  int ndimen = 1;
 +  struct type *tmp_type;
 +
 +  if ((array_type->code () == TYPE_CODE_STRING))
 +    return 1;
 +
 +  if ((array_type->code () != TYPE_CODE_ARRAY))
 +    error (_("Can't get dimensions for a non-array type"));
 +
 +  tmp_type = array_type;
 +
 +  while ((tmp_type = TYPE_TARGET_TYPE (tmp_type)))
 +    {
 +      if (tmp_type->code () == TYPE_CODE_ARRAY)
 +	++ndimen;
 +    }
 +  return ndimen;
 +}
 +
 +/* Called from evaluate_subexp_standard to perform array indexing, and
 +   sub-range extraction, for Fortran.  As well as arrays this function
 +   also handles strings as they can be treated like arrays of characters.
 +   ARRAY is the array or string being accessed.  EXP, POS, and NOSIDE are
 +   as for evaluate_subexp_standard, and NARGS is the number of arguments
 +   in this access (e.g. 'array (1,2,3)' would be NARGS 3).  */
 +
 +static struct value *
 +fortran_value_subarray (struct value *array, struct expression *exp,
 +			int *pos, int nargs, enum noside noside)
 +{
 +  if (exp->elts[*pos].opcode == OP_RANGE)
 +    return value_f90_subarray (array, exp, pos, noside);
 +
 +  if (noside == EVAL_SKIP)
 +    {
 +      skip_undetermined_arglist (nargs, exp, pos, noside);
 +      /* Return the dummy value with the correct type.  */
 +      return array;
 +    }
 +
 +  LONGEST subscript_array[MAX_FORTRAN_DIMS];
 +  int ndimensions = 1;
 +  struct type *type = check_typedef (value_type (array));
 +
 +  if (nargs > MAX_FORTRAN_DIMS)
 +    error (_("Too many subscripts for F77 (%d Max)"), MAX_FORTRAN_DIMS);
 +
 +  ndimensions = calc_f77_array_dims (type);
 +
 +  if (nargs != ndimensions)
 +    error (_("Wrong number of subscripts"));
 +
 +  gdb_assert (nargs > 0);
 +
 +  /* Now that we know we have a legal array subscript expression let us
 +     actually find out where this element exists in the array.  */
 +
 +  /* Take array indices left to right.  */
 +  for (int i = 0; i < nargs; i++)
 +    {
 +      /* Evaluate each subscript; it must be a legal integer in F77.  */
 +      value *arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
 +
 +      /* Fill in the subscript array.  */
 +      subscript_array[i] = value_as_long (arg2);
 +    }
 +
 +  /* Internal type of array is arranged right to left.  */
 +  for (int i = nargs; i > 0; i--)
 +    {
 +      struct type *array_type = check_typedef (value_type (array));
 +      LONGEST index = subscript_array[i - 1];
 +
 +      array = value_subscripted_rvalue (array, index,
 +					f77_get_lowerbound (array_type));
 +    }
 +
 +  return array;
 +}
 +
 /* Special expression evaluation cases for Fortran.  */
 static struct value *
@@ -285,6 +413,87 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp,
 				   TYPE_LENGTH (type));
       return value_from_longest (builtin_type (exp->gdbarch)->builtin_int,
 				 TYPE_LENGTH (TYPE_TARGET_TYPE (type)));
 +
 +
 +    case OP_F77_UNDETERMINED_ARGLIST:
 +      /* Remember that in F77, functions, substring ops and array subscript
 +         operations cannot be disambiguated at parse time.  We have made
 +         all array subscript operations, substring operations as well as
 +         function calls come here and we now have to discover what the heck
 +         this thing actually was.  If it is a function, we process just as
 +         if we got an OP_FUNCALL.  */
 +      int nargs = longest_to_int (exp->elts[pc + 1].longconst);
 +      (*pos) += 2;
 +
 +      /* First determine the type code we are dealing with.  */
 +      arg1 = evaluate_subexp (nullptr, exp, pos, noside);
 +      type = check_typedef (value_type (arg1));
 +      enum type_code code = type->code ();
 +
 +      if (code == TYPE_CODE_PTR)
 +	{
 +	  /* Fortran always passes variable to subroutines as pointer.
 +	     So we need to look into its target type to see if it is
 +	     array, string or function.  If it is, we need to switch
 +	     to the target value the original one points to.  */
 +	  struct type *target_type = check_typedef (TYPE_TARGET_TYPE (type));
 +
 +	  if (target_type->code () == TYPE_CODE_ARRAY
 +	      || target_type->code () == TYPE_CODE_STRING
 +	      || target_type->code () == TYPE_CODE_FUNC)
 +	    {
 +	      arg1 = value_ind (arg1);
 +	      type = check_typedef (value_type (arg1));
 +	      code = type->code ();
 +	    }
 +	}
 +
 +      switch (code)
 +	{
 +	case TYPE_CODE_ARRAY:
 +	case TYPE_CODE_STRING:
 +	  return fortran_value_subarray (arg1, exp, pos, nargs, noside);
 +
 +	case TYPE_CODE_PTR:
 +	case TYPE_CODE_FUNC:
 +	case TYPE_CODE_INTERNAL_FUNCTION:
 +	  {
 +	    /* It's a function call.  Allocate arg vector, including
 +	    space for the function to be called in argvec[0] and a
 +	    termination NULL.  */
 +	    struct value **argvec = (struct value **)
 +	      alloca (sizeof (struct value *) * (nargs + 2));
 +	    argvec[0] = arg1;
 +	    int tem = 1;
 +	    for (; tem <= nargs; tem++)
 +	      {
 +		argvec[tem] = evaluate_subexp_with_coercion (exp, pos, noside);
 +		/* Arguments in Fortran are passed by address.  Coerce the
 +		   arguments here rather than in value_arg_coerce as
 +		   otherwise the call to malloc to place the non-lvalue
 +		   parameters in target memory is hit by this Fortran
 +		   specific logic.  This results in malloc being called
 +		   with a pointer to an integer followed by an attempt to
 +		   malloc the arguments to malloc in target memory.
 +		   Infinite recursion ensues.  */
 +		if (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC)
 +		  {
 +		    bool is_artificial
 +		      = TYPE_FIELD_ARTIFICIAL (value_type (arg1), tem - 1);
 +		    argvec[tem] = fortran_argument_convert (argvec[tem],
 +							    is_artificial);
 +		  }
 +	      }
 +	    argvec[tem] = 0;	/* signal end of arglist */
 +	    if (noside == EVAL_SKIP)
 +	      return eval_skip_value (exp);
 +	    return evaluate_subexp_do_call (exp, noside, nargs, argvec, NULL,
 +					    expect_type);
 +	  }
 +
 +	default:
 +	  error (_("Cannot perform substring on this type"));
 +	}
     }
   /* Should be unreachable.  */
@@ -318,6 +527,11 @@ operator_length_f (const struct expression *exp, int pc, int *oplenp,
       oplen = 1;
       args = 2;
       break;
 +
 +    case OP_F77_UNDETERMINED_ARGLIST:
 +      oplen = 3;
 +      args = 1 + longest_to_int (exp->elts[pc - 2].longconst);
 +      break;
     }
   *oplenp = oplen;
@@ -390,6 +604,10 @@ print_subexp_f (struct expression *exp, int *pos,
     case BINOP_FORTRAN_MODULO:
       print_binop_subexp_f (exp, pos, stream, prec, "MODULO");
       return;
 +
 +    case OP_F77_UNDETERMINED_ARGLIST:
 +      print_subexp_funcall (exp, pos, stream);
 +      return;
     }
 }
@@ -432,6 +650,9 @@ dump_subexp_body_f (struct expression *exp,
     case BINOP_FORTRAN_MODULO:
       operator_length_f (exp, (elt + 1), &oplen, &nargs);
       break;
 +
 +    case OP_F77_UNDETERMINED_ARGLIST:
 +      return dump_subexp_body_funcall (exp, stream, elt);
     }
   elt += oplen;
 diff --git a/gdb/fortran-operator.def b/gdb/fortran-operator.def
 --- a/gdb/fortran-operator.def
 +++ b/gdb/fortran-operator.def
@@ -17,6 +17,14 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 +/* This is EXACTLY like OP_FUNCALL but is semantically different.
 +   In F77, array subscript expressions, substring expressions and
 +   function calls are all exactly the same syntactically.  They
 +   may only be disambiguated at runtime.  Thus this operator,
 +   which indicates that we have found something of the form
 +   <name> ( <stuff> ).  */
 +OP (OP_F77_UNDETERMINED_ARGLIST)
 +
 /* Single operand builtins.  */
 OP (UNOP_FORTRAN_KIND)
 OP (UNOP_FORTRAN_FLOOR)
 diff --git a/gdb/parse.c b/gdb/parse.c
 --- a/gdb/parse.c
 +++ b/gdb/parse.c
@@ -817,7 +817,6 @@ operator_length_standard (const struct expression *expr, int endpos,
       break;
     case OP_FUNCALL:
 -    case OP_F77_UNDETERMINED_ARGLIST:
       oplen = 3;
       args = 1 + longest_to_int (expr->elts[endpos - 2].longconst);
       break;
 diff --git a/gdb/parser-defs.h b/gdb/parser-defs.h
 --- a/gdb/parser-defs.h
 +++ b/gdb/parser-defs.h
@@ -338,6 +338,13 @@ extern int dump_subexp (struct expression *, struct ui_file *, int);
 extern int dump_subexp_body_standard (struct expression *, 
 				      struct ui_file *, int);
 +/* Dump (to STREAM) a function call like expression at position ELT in the
 +   expression array EXP.  Return a new value for ELT just after the
 +   function call expression.  */
 +
 +extern int dump_subexp_body_funcall (struct expression *exp,
 +				     struct ui_file *stream, int elt);
 +
 extern void operator_length (const struct expression *, int, int *, int *);
 extern void operator_length_standard (const struct expression *, int, int *,
@@ -440,6 +447,15 @@ extern void print_subexp (struct expression *, int *, struct ui_file *,
 extern void print_subexp_standard (struct expression *, int *, 
 				   struct ui_file *, enum precedence);
 +/* Print a function call like expression to STREAM.  This is called as a
 +   helper function by which point the expression node identifying this as a
 +   function call has already been stripped off and POS should point to the
 +   number of function call arguments.  EXP is the object containing the
 +   list of expression elements.  */
 +
 +extern void print_subexp_funcall (struct expression *exp, int *pos,
 +				  struct ui_file *stream);
 +
 /* Function used to avoid direct calls to fprintf
    in the code generated by the bison parser.  */
 diff --git a/gdb/std-operator.def b/gdb/std-operator.def
 --- a/gdb/std-operator.def
 +++ b/gdb/std-operator.def
@@ -168,14 +168,6 @@ OP (OP_FUNCALL)
    pointer.  This is an Objective C message.  */
 OP (OP_OBJC_MSGCALL)
 -/* This is EXACTLY like OP_FUNCALL but is semantically different.
 -   In F77, array subscript expressions, substring expressions and
 -   function calls are all exactly the same syntactically.  They
 -   may only be disambiguated at runtime.  Thus this operator,
 -   which indicates that we have found something of the form
 -   <name> ( <stuff> ).  */
 -OP (OP_F77_UNDETERMINED_ARGLIST)
 -
 /* OP_COMPLEX takes a type in the following element, followed by another
    OP_COMPLEX, making three exp_elements.  It is followed by two double
    args, and converts them into a complex number of the given type.  */
--- a/gdb-vla-intel-fix-print-char-array.patch
+++ b/gdb-vla-intel-fix-print-char-array.patch
@ -1,59 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Sergio Durigan Junior <sergiodj@redhat.com>
 Date: Thu, 7 Dec 2017 16:20:31 -0500
 Subject: gdb-vla-intel-fix-print-char-array.patch
 ;; Revert upstream commit 469412dd9ccc4de5874fd3299b105833f36b34cd
 Revert commit (only the part touching gdb/f-valprint.c):
  commit 469412dd9ccc4de5874fd3299b105833f36b34cd
  Author: Christoph Weinmann <christoph.t.weinmann@intel.com>
  Date:   Fri Sep 8 15:11:47 2017 +0200
      Remove C/C++ relevant code in Fortran specific file.
      Remove code relevant for printing C/C++ Integer values in a
      Fortran specific file to unify printing of Fortran values.
      This does not change the output.
 And adjust its testcase.
 diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
 --- a/gdb/f-valprint.c
 +++ b/gdb/f-valprint.c
@@ -310,7 +310,21 @@ f_value_print_inner (struct value *val, struct ui_file *stream, int recurse,
 	  value_print_scalar_formatted (val, &opts, 0, stream);
 	}
       else
 -	value_print_scalar_formatted (val, options, 0, stream);
 +	{
 +	  value_print_scalar_formatted (val, options, 0, stream);
 +	  /* C and C++ has no single byte int type, char is used instead.
 +	     Since we don't know whether the value is really intended to
 +	     be used as an integer or a character, print the character
 +	     equivalent as well.  */
 +	  if (TYPE_LENGTH (type) == 1)
 +	    {
 +	      LONGEST c;
 +
 +	      fputs_filtered (" ", stream);
 +	      c = unpack_long (type, valaddr);
 +	      LA_PRINT_CHAR ((unsigned char) c, type, stream);
 +	    }
 +	}
       break;
     case TYPE_CODE_STRUCT:
 diff --git a/gdb/testsuite/gdb.fortran/printing-types.exp b/gdb/testsuite/gdb.fortran/printing-types.exp
 --- a/gdb/testsuite/gdb.fortran/printing-types.exp
 +++ b/gdb/testsuite/gdb.fortran/printing-types.exp
@@ -30,7 +30,7 @@ if {![fortran_runto_main]} then {
 gdb_breakpoint [gdb_get_line_number "write"]
 gdb_continue_to_breakpoint "write"
 -gdb_test "print oneByte"	" = 1"
 +gdb_test "print oneByte"	" = 1 \'\\\\001\'"
 gdb_test "print twobytes"	" = 2"
 gdb_test "print chvalue"	" = \'a\'"
 gdb_test "print logvalue"	" = \.TRUE\."
--- a/gdb-vla-intel-fortran-strides.patch
+++ b/gdb-vla-intel-fortran-strides.patch
--- a/gdb-vla-intel-stringbt-fix.patch
+++ b/gdb-vla-intel-stringbt-fix.patch
@ -1,167 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Jan Kratochvil <jan.kratochvil@redhat.com>
 Date: Fri, 1 Aug 2014 23:02:17 +0200
 Subject: gdb-vla-intel-stringbt-fix.patch
 ;;=push+jan
 http://sourceware.org/ml/gdb-patches/2014-08/msg00025.html
 On Fri, 01 Aug 2014 09:20:19 +0200, Keven Boell wrote:
 > I just tried it on Fedora 20 i686.  Applied the patch, you mentioned, on top of
 > the Fortran VLA series and executed your dynamic-other-frame test.  Everything
 > is working fine here, I cannot reproduce the crash.
 I have it reproducible on Fedora 20 i686 with plain
 CFLAGS=-g ./configure;make;cd gdb/testsuite;make site.exp;runtest gdb.fortran/dynamic-other-frame.exp
 Besides that I have updated the testcase with
 	gdb_test_no_output "set print frame-arguments all"
 so that there is no longer needed the patch:
 	[patch] Display Fortran strings in backtraces
 	https://sourceware.org/ml/gdb-patches/2014-07/msg00709.html
 The fix below has no regressions for me.  Unfortunately I do not see why you
 cannot reproduce it.
 Thanks,
 Jan
 diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c
 --- a/gdb/dwarf2/loc.c
 +++ b/gdb/dwarf2/loc.c
@@ -2249,6 +2249,20 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
   ctx.per_cu = per_cu;
   ctx.obj_address = 0;
 +frame_id old_frame_id (get_frame_id (deprecated_safe_get_selected_frame ()));
 +class RestoreCall {
 +private:
 +  const std::function<void ()> func;
 +public:
 +  RestoreCall(std::function<void ()> func_):func(func_) {}
 +  ~RestoreCall() { func(); }
 +} restore_frame([=]() {
 +  frame_info *old_frame (frame_find_by_id (old_frame_id));
 +  if (old_frame != NULL)
 +    select_frame (old_frame);
 +});
 +if (frame != NULL) select_frame (frame);
 +
   scoped_value_mark free_values;
   ctx.gdbarch = per_objfile->objfile->arch ();
 diff --git a/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f90 b/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f90
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f90
@@ -0,0 +1,24 @@
 +! Copyright 2010 Free Software Foundation, Inc.
 +!
 +! This program is free software; you can redistribute it and/or modify
 +! it under the terms of the GNU General Public License as published by
 +! the Free Software Foundation; either version 2 of the License, or
 +! (at your option) any later version.
 +!
 +! This program is distributed in the hope that it will be useful,
 +! but WITHOUT ANY WARRANTY; without even the implied warranty of
 +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +! GNU General Public License for more details.
 +!
 +! You should have received a copy of the GNU General Public License
 +! along with this program; if not, write to the Free Software
 +! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +!
 +! Ihis file is the Fortran source file for dynamic.exp.
 +! Original file written by Jakub Jelinek <jakub@redhat.com>.
 +! Modified for the GDB testcase by Jan Kratochvil <jan.kratochvil@redhat.com>.
 +
 +subroutine bar
 +  real :: dummy
 +  dummy = 1
 +end subroutine bar
 diff --git a/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp b/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp
@@ -0,0 +1,39 @@
 +# Copyright 2010 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 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 "dynamic-other-frame"
 +set srcfile1 ${testfile}.f90
 +set srcfile2 ${testfile}-stub.f90
 +set objfile2 [standard_output_file ${testfile}-stub.o]
 +set executable ${testfile}
 +set binfile [standard_output_file ${executable}]
 +
 +if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${objfile2}" object {f90}] != ""
 +     || [gdb_compile "${srcdir}/${subdir}/${srcfile1} ${objfile2}" "${binfile}" executable {debug f90}] != "" } {
 +    untested "Couldn't compile ${srcfile1} or ${srcfile2}"
 +    return -1
 +}
 +
 +clean_restart ${executable}
 +
 +gdb_test_no_output "set print frame-arguments all"
 +
 +if ![runto bar_] then {
 +    perror "couldn't run to bar_"
 +    continue
 +}
 +
 +gdb_test "bt" {foo \(string='hello'.*}
 diff --git a/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90 b/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90
@@ -0,0 +1,36 @@
 +! Copyright 2010 Free Software Foundation, Inc.
 +!
 +! This program is free software; you can redistribute it and/or modify
 +! it under the terms of the GNU General Public License as published by
 +! the Free Software Foundation; either version 2 of the License, or
 +! (at your option) any later version.
 +!
 +! This program is distributed in the hope that it will be useful,
 +! but WITHOUT ANY WARRANTY; without even the implied warranty of
 +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +! GNU General Public License for more details.
 +!
 +! You should have received a copy of the GNU General Public License
 +! along with this program; if not, write to the Free Software
 +! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +!
 +! Ihis file is the Fortran source file for dynamic.exp.
 +! Original file written by Jakub Jelinek <jakub@redhat.com>.
 +! Modified for the GDB testcase by Jan Kratochvil <jan.kratochvil@redhat.com>.
 +
 +subroutine foo (string)
 +  interface
 +    subroutine bar
 +    end subroutine
 +  end interface
 +  character string*(*)
 +  call bar                                ! stop-here
 +end subroutine foo
 +program test
 +  interface
 +    subroutine foo (string)
 +    character string*(*)
 +    end subroutine
 +  end interface
 +  call foo ('hello')
 +end
--- a/gdb-vla-intel-tests.patch
+++ b/gdb-vla-intel-tests.patch
@ -1,149 +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-vla-intel-tests.patch
 ;;=fedoratest
 diff --git a/gdb/testsuite/gdb.fortran/vla-func.exp b/gdb/testsuite/gdb.fortran/vla-func.exp
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.fortran/vla-func.exp
@@ -0,0 +1,61 @@
 +# Copyright 2014 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 3 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +standard_testfile ".f90"
 +
 +if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 +    {debug f90 quiet}] } {
 +    return -1
 +}
 +
 +if ![runto MAIN__] then {
 +    perror "couldn't run to breakpoint MAIN__"
 +    continue
 +}
 +
 +# Check VLA passed to first Fortran function.
 +gdb_breakpoint [gdb_get_line_number "func1-vla-passed"]
 +gdb_continue_to_breakpoint "func1-vla-passed"
 +gdb_test "print vla" " = \\( *\\( *22, *22, *22,\[()22, .\]*\\)" \
 +  "print vla (func1)"
 +gdb_test "ptype vla" "type = integer\\\(kind=4\\\), allocatable \\\(10,10\\\)" \
 +  "ptype vla (func1)"
 +
 +gdb_breakpoint [gdb_get_line_number "func1-vla-modified"]
 +gdb_continue_to_breakpoint "func1-vla-modified"
 +gdb_test "print vla(5,5)" " = 55" "print vla(5,5) (func1)"
 +gdb_test "print vla(7,7)" " = 77" "print vla(5,5) (func1)"
 +
 +# Check if the values are correct after returning from func1
 +gdb_breakpoint [gdb_get_line_number "func1-returned"]
 +gdb_continue_to_breakpoint "func1-returned"
 +gdb_test "print ret" " = .TRUE." "print ret after func1 returned"
 +
 +# Check VLA passed to second Fortran function
 +gdb_breakpoint [gdb_get_line_number "func2-vla-passed"]
 +gdb_continue_to_breakpoint "func2-vla-passed"
 +gdb_test "print vla" \
 +  " = \\\(44, 44, 44, 44, 44, 44, 44, 44, 44, 44\\\)" \
 +  "print vla (func2)"
 +gdb_test "ptype vla" "type = integer\\\(kind=4\\\) \\\(10\\\)" \
 +  "ptype vla (func2)"
 +
 +# Check if the returned VLA has the correct values and ptype.
 +gdb_breakpoint [gdb_get_line_number "func2-returned"]
 +gdb_continue_to_breakpoint "func2-returned"
 +gdb_test "print vla3" " = \\\(1, 2, 44, 4, 44, 44, 44, 8, 44, 44\\\)" \
 +  "print vla3 (after func2)"
 +gdb_test "ptype vla3" "type = integer\\\(kind=4\\\), allocatable \\\(10\\\)" \
 +  "ptype vla3 (after func2)"
 diff --git a/gdb/testsuite/gdb.fortran/vla-func.f90 b/gdb/testsuite/gdb.fortran/vla-func.f90
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.fortran/vla-func.f90
@@ -0,0 +1,71 @@
 +! Copyright 2014 Free Software Foundation, Inc.
 +!
 +! This program is free software; you can redistribute it and/or modify
 +! it under the terms of the GNU General Public License as published by
 +! the Free Software Foundation; either version 2 of the License, or
 +! (at your option) any later version.
 +!
 +! This program is distributed in the hope that it will be useful,
 +! but WITHOUT ANY WARRANTY; without even the implied warranty of
 +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +! GNU General Public License for more details.
 +!
 +! You should have received a copy of the GNU General Public License
 +! along with this program; if not, write to the Free Software
 +! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +
 +logical function func1 (vla)
 +  implicit none
 +  integer, allocatable :: vla (:, :)
 +  func1 = allocated(vla)
 +  vla(5,5) = 55               ! func1-vla-passed
 +  vla(7,7) = 77
 +  return                      ! func1-vla-modified
 +end function func1
 +
 +function func2(vla)
 +  implicit none
 +  integer :: vla (:)
 +  integer :: func2(size(vla))
 +  integer :: k
 +
 +  vla(1) = 1                    ! func2-vla-passed
 +  vla(2) = 2
 +  vla(4) = 4
 +  vla(8) = 8
 +
 +  func2 = vla
 +end function func2
 +
 +program vla_func
 +  implicit none
 +  interface
 +    logical function func1 (vla)
 +      integer, allocatable :: vla (:, :)
 +    end function
 +  end interface
 +  interface
 +    function func2 (vla)
 +      integer :: vla (:)
 +      integer func2(size(vla))
 +    end function
 +  end interface
 +
 +  logical :: ret
 +  integer, allocatable :: vla1 (:, :)
 +  integer, allocatable :: vla2 (:)
 +  integer, allocatable :: vla3 (:)
 +
 +  ret = .FALSE.
 +
 +  allocate (vla1 (10,10))
 +  vla1(:,:) = 22
 +
 +  allocate (vla2 (10))
 +  vla2(:) = 44
 +
 +  ret = func1(vla1)
 +  vla3 = func2(vla2)          ! func1-returned
 +
 +  ret = .TRUE.                ! func2-returned
 +end program vla_func
--- a/gdb.spec
+++ b/gdb.spec
@ -1,4 +1,3 @@
 %global _without_python 1
 # rpmbuild parameters:
 # --with testsuite: Run the testsuite (biarch if possible).  Default is without.
 # --with buildisa: Use %%{?_isa} for BuildRequires
@ -34,11 +33,11 @@ Name: %{?scl_prefix}gdb
 # See timestamp of source gnulib installed into gnulib/ .
 %global snapgnulib 20200630
 %global tarname gdb-%{version}
-Version: 10.1
+Version: 10.2
 # 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: 19%{?dist}
+Release: 1%{?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.
@ -196,16 +195,6 @@ Source7: v%{libipt_version}.tar.gz
 #=fedora
 Patch1142: v1.5-libipt-static.patch
 ## [testsuite] Fix false selftest.exp FAIL from system readline-6.3+ (Patrick Palka).
 ##=fedoratest
 #Patch1075: gdb-testsuite-readline63-sigint.patch
 ##=fedoratest
 Patch1119: gdb-testsuite-readline63-sigint-revert.patch
 # Fix broken configure tests compromised by LTO
 #push=Should be pushed upstream.
 Patch2000: gdb-config.patch
 # Include the auto-generated file containing the "Patch:" directives.
 # See README.local-patches for more details.
 Patch9998: _gdb.spec.Patch.include
@ -481,23 +470,6 @@ find -name "*.info*"|xargs rm -f
 # See README.local-patches for more details.
 %include %{PATCH9999}
 %if 0%{!?el6:1}
 for i in \
  gdb/python/lib/gdb/FrameWrapper.py \
  gdb/python/lib/gdb/backtrace.py \
  gdb/python/lib/gdb/command/backtrace.py \
  ;do
  test -e $i
  : >$i
 done
 %endif
 %if 0%{?rhel:1} && 0%{?rhel} <= 7
 %patch1119 -p1
 %endif
 %patch2000 -p1
 # The above patches twiddle a .m4 file for configure, so update the affected
 # configure files
 pushd libiberty
@ -795,8 +767,6 @@ perl -i.relocatable -pe 's/^(D\[".*_RELOCATABLE"\]=" )1(")$/${1}0$2/' gdb/config
 %make_build CFLAGS="$CFLAGS $FPROFILE_CFLAGS" LDFLAGS="$LDFLAGS $FPROFILE_CFLAGS" V=1
 ! grep '_RELOCATABLE.*1' gdb/config.h
 grep '^#define HAVE_LIBSELINUX 1$' gdb/config.h
 grep '^#define HAVE_SELINUX_SELINUX_H 1$' gdb/config.h
 if [ "$fprofile" = "-fprofile" ]
 then
@ -1078,13 +1048,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/gdb/system-gdbinit/elinos.py
 rm -f $RPM_BUILD_ROOT%{_datadir}/gdb/system-gdbinit/wrs-linux.py
 rmdir $RPM_BUILD_ROOT%{_datadir}/gdb/system-gdbinit
 # Patch848: gdb-dts-rhel6-python-compat.patch
 %if 0%{!?el6:1}
 rm -f $RPM_BUILD_ROOT%{_datadir}/gdb/python/gdb/FrameWrapper.py
 rm -f $RPM_BUILD_ROOT%{_datadir}/gdb/python/gdb/backtrace.py
 rm -f $RPM_BUILD_ROOT%{_datadir}/gdb/python/gdb/command/backtrace.py
 %endif
 %files
 # File must begin with "/": {GFDL,COPYING3,COPYING,COPYING.LIB,COPYING3.LIB}
 %if 0%{!?el6:1}
@ -1191,6 +1154,43 @@ fi
 %endif
 %changelog
 * Thu Jun 03 2021 Kevin Buettner <kevinb@redhat.com> - 10.2-1
 - Rebase to FSF GDB 10.2.
 - Drop gdb-6.3-test-pie-20050107.patch.
 - Drop gdb-6.3-test-self-20050110.patch.
 - Drop gdb-6.5-bz218379-ppc-solib-trampoline-test.patch.
 - Drop gdb-6.6-buildid-locate-core-as-arg.patch.
 - Drop gdb-6.8-quit-never-aborts.patch.
 - Drop gdb-archer-pie-addons-keep-disabled.patch.
 - Drop gdb-archer-pie-addons.patch.
 - Drop gdb-archer-vla-tests.patch.
 - Drop gdb-archer.patch.
 - Drop gdb-attach-fail-reasons-5of5.patch.
 - Drop gdb-btrobust.patch.
 - Drop gdb-bz1219747-attach-kills.patch.
 - Drop gdb-bz533176-fortran-omp-step.patch.
 - Drop gdb-dts-rhel6-python-compat.patch.
 - Drop gdb-gnat-dwarf-crash-3of3.patch.
 - Drop gdb-jit-reader-multilib.patch.
 - Drop gdb-moribund-utrace-workaround.patch.
 - Drop gdb-rhbz1930528-fix-gnulib-build-error.patch.
 - Drop gdb-rhbz1932645-aarch64-ptrace-header-order.patch.
 - Drop gdb-vla-intel-fix-print-char-array.patch.
 - Drop gdb-vla-intel-fortran-strides.patch.
 - Drop gdb-vla-intel-stringbt-fix.patch.
 - Drop gdb-vla-intel-tests.patch.
 - Drop process_psymtab_comp_unit-type-unit.patch.
 - Drop gdb-testsuite-readline63-sigint-revert.patch.
 - Drop gdb-config.patch.
 - Add following upstream patches for Fortran stride / slice support:
  gdb-rhbz1964167-convert-enum-range_type.patch
  gdb-rhbz1964167-fortran-array-slices-at-prompt.patch
  gdb-rhbz1964167-fortran-array-strides-in-expressions.patch
  gdb-rhbz1964167-fortran-clean-up-array-expression-evaluation.patch
  gdb-rhbz1964167-fortran-range_type-to-range_flag.patch
  gdb-rhbz1964167-fortran-whitespace_array.patch
  gdb-rhbz1964167-move-fortran-expr-handling.patch
 * Tue Jun 01 2021 Python Maint <python-maint@redhat.com>
 - Bootstrap for Python 3.10
--- a/process_psymtab_comp_unit-type-unit.patch
+++ b/process_psymtab_comp_unit-type-unit.patch
@ -1,65 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Keith Seitz <keiths@redhat.com>
 Date: Tue, 23 Mar 2021 11:17:28 -0700
 Subject: process_psymtab_comp_unit-type-unit.patch
 ;; Backport "Handle DW_TAG_type_unit in process_symtab_unit"
 ;; (Tom de Vries)
  commit e77b0004dd114d6ddf3bb92b521b2854341f3f85
  Author: Tom de Vries <tdevries@suse.de>
  Date:   Fri Feb 5 17:47:07 2021 +0100
 [gdb/symtab] Handle DW_TAG_type_unit in process_psymtab_comp_unit
 When running test-case gdb.cp/cpexprs-debug-types.exp with target board
 unix/gdb:debug_flags=-gdwarf-5, I run into:
 ...
 (gdb) file cpexprs-debug-types^M
 Reading symbols from cpexprs-debug-types...^M
 ERROR: Couldn't load cpexprs-debug-types into GDB (eof).
 ERROR: Couldn't send delete breakpoints to GDB.
 ERROR: GDB process no longer exists
 GDB process exited with wait status 23054 exp9 0 0 CHILDKILLED SIGABRT SIGABRT
 ...
 We're running into this abort in process_psymtab_comp_unit:
 ...
  switch (reader.comp_unit_die->tag)
    {
    case DW_TAG_compile_unit:
      this_cu->unit_type = DW_UT_compile;
      break;
    case DW_TAG_partial_unit:
      this_cu->unit_type = DW_UT_partial;
      break;
    default:
      abort ();
    }
 ...
 because reader.comp_unit_die->tag == DW_TAG_type_unit.
 Fix this by adding a DW_TAG_type_unit case.
 Tested on x86_64-linux.
 gdb/ChangeLog:
 2021-02-05  Tom de Vries  <tdevries@suse.de>
 	PR symtab/27333
 	* dwarf2/read.c (process_psymtab_comp_unit): Handle DW_TAG_type_unit.
 diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
 --- a/gdb/dwarf2/read.c
 +++ b/gdb/dwarf2/read.c
@@ -7715,6 +7715,9 @@ process_psymtab_comp_unit (dwarf2_per_cu_data *this_cu,
     case DW_TAG_partial_unit:
       this_cu->unit_type = DW_UT_partial;
       break;
 +    case DW_TAG_type_unit:
 +      this_cu->unit_type = DW_UT_type;
 +      break;
     default:
       abort ();
     }
--- a/2
+++ b/2
@ -1,3 +1,3 @@
 SHA512 (gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz) = a8b1c54dd348cfeb37da73f968742896be3dd13a4215f8d8519870c2abea915f5176c3fa6989ddd10f20020a16f0fab20cbae68ee8d58a82234d8778023520f8
 SHA512 (gdb-10.1.tar.xz) = 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537
 SHA512 (v2.0.4.tar.gz) = 596d2dac25fdbd3e5660d7e1feeb7e8d5d359d1d0e19b62ef593449037df236db1d4d98820f0031061b5573ed67797a85a77fb9991e215abaabc4bfe16ceaec8
 SHA512 (gdb-10.2.tar.xz) = 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa
--- a/testing-custom-inputrc.patch
+++ b/testing-custom-inputrc.patch
@ -28,7 +28,7 @@ Subject: testing-custom-inputrc.patch
 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
-@@ -5084,13 +5084,14 @@ proc default_gdb_init { test_file_name } {
+@@ -5135,13 +5135,14 @@ proc default_gdb_init { test_file_name } {
     setenv LC_CTYPE C
     setenv LANG C
`@ -1 +1 @@`
	`606e3fd147ed9a00df165e46f30fe5c46dcda345`	`ce35d7163e779b1321058b22f005c70ce1524b25`