Rebase to FSF GDB 8.2.50.20181114 (8.3pre).

Drop gdb-6.3-ppc64syscall-20040622.patch. Drop gdb-6.3-ppc64displaysymbol-20041124.patch. Drop gdb-6.8-watchpoint-conditionals-test.patch.
2018-11-14 16:12:07 -05:00 · 2018-11-14 16:12:07 -05:00 · 6ee43aeabb
parent 4336687790
commit 6ee43aeabb
31 changed files with 269 additions and 522 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,3 @@
 /gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz
 /v2.0.tar.gz
-/gdb-8.2.50.20181016.tar.xz
+/gdb-8.2.50.20181114.tar.xz
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@ -12,478 +12,465 @@ Patch003: gdb-vla-intel-fortran-vla-strings.patch
 #=push+jan
 Patch004: gdb-vla-intel-stringbt-fix.patch
 # Better parse 64-bit PPC system call prologues.
 #=push: Write new testcase.
 Patch005: gdb-6.3-ppc64syscall-20040622.patch
 # Include the pc's section when doing a symbol lookup so that the
 # correct symbol is found.
 #=push: Write new testcase.
 Patch006: gdb-6.3-ppc64displaysymbol-20041124.patch
 # Add a wrapper script to GDB that implements pstack using the
 # --readnever option.
 #=push
-Patch007: gdb-6.3-gstack-20050411.patch
+Patch005: gdb-6.3-gstack-20050411.patch
 # VSYSCALL and PIE
 #=fedoratest
-Patch008: gdb-6.3-test-pie-20050107.patch
+Patch006: gdb-6.3-test-pie-20050107.patch
 # Get selftest working with sep-debug-info
 #=fedoratest
-Patch009: gdb-6.3-test-self-20050110.patch
+Patch007: gdb-6.3-test-self-20050110.patch
 # Test support of multiple destructors just like multiple constructors
 #=fedoratest
-Patch010: gdb-6.3-test-dtorfix-20050121.patch
+Patch008: gdb-6.3-test-dtorfix-20050121.patch
 # Fix to support executable moving
 #=fedoratest
-Patch011: gdb-6.3-test-movedir-20050125.patch
+Patch009: gdb-6.3-test-movedir-20050125.patch
 # Test sibling threads to set threaded watchpoints for x86 and x86-64
 #=fedoratest
-Patch012: gdb-6.3-threaded-watchpoints2-20050225.patch
+Patch010: gdb-6.3-threaded-watchpoints2-20050225.patch
 # Notify observers that the inferior has been created
 #=fedoratest
-Patch013: gdb-6.3-inferior-notification-20050721.patch
+Patch011: gdb-6.3-inferior-notification-20050721.patch
 # Verify printing of inherited members test
 #=fedoratest
-Patch014: gdb-6.3-inheritancetest-20050726.patch
+Patch012: gdb-6.3-inheritancetest-20050726.patch
 # Add readnever option
 #=push
-Patch015: gdb-6.3-readnever-20050907.patch
+Patch013: gdb-6.3-readnever-20050907.patch
 # Support TLS symbols (+`errno' suggestion if no pthread is found) (BZ 185337).
 #=push+jan: It should be replaced by Infinity project.
-Patch016: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
+Patch014: 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.
-Patch017: gdb-6.5-sharedlibrary-path.patch
+Patch015: 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.
-Patch018: gdb-6.5-BEA-testsuite.patch
+Patch016: gdb-6.5-BEA-testsuite.patch
 # Testcase for deadlocking on last address space byte; for corrupted backtraces.
 #=fedoratest
-Patch019: gdb-6.5-last-address-space-byte-test.patch
+Patch017: gdb-6.5-last-address-space-byte-test.patch
 # Fix readline segfault on excessively long hand-typed lines.
 #=fedoratest
-Patch020: gdb-6.5-readline-long-line-crash-test.patch
+Patch018: gdb-6.5-readline-long-line-crash-test.patch
 # Fix bogus 0x0 unwind of the thread's topmost function clone(3) (BZ 216711).
 #=fedora
-Patch021: gdb-6.5-bz216711-clone-is-outermost.patch
+Patch019: gdb-6.5-bz216711-clone-is-outermost.patch
 # Test sideeffects of skipping ppc .so libs trampolines (BZ 218379).
 #=fedoratest
-Patch022: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
+Patch020: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
 # Fix lockup on trampoline vs. its function lookup; unreproducible (BZ 218379).
 #=fedora
-Patch023: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
+Patch021: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
 # Find symbols properly at their original (included) file (BZ 109921).
 #=fedoratest
-Patch024: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
+Patch022: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
 # Update PPC unwinding patches to their upstream variants (BZ 140532).
 #=fedoratest
-Patch025: gdb-6.3-bz140532-ppc-unwinding-test.patch
+Patch023: gdb-6.3-bz140532-ppc-unwinding-test.patch
 # Testcase for exec() from threaded program (BZ 202689).
 #=fedoratest
-Patch026: gdb-6.3-bz202689-exec-from-pthread-test.patch
+Patch024: gdb-6.3-bz202689-exec-from-pthread-test.patch
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 #=fedoratest
-Patch027: gdb-6.6-bz230000-power6-disassembly-test.patch
+Patch025: gdb-6.6-bz230000-power6-disassembly-test.patch
 # Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
 #=fedoratest
-Patch028: gdb-6.6-bz229517-gcore-without-terminal.patch
+Patch026: gdb-6.6-bz229517-gcore-without-terminal.patch
 # Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
 #=fedoratest
-Patch029: gdb-6.6-testsuite-timeouts.patch
+Patch027: gdb-6.6-testsuite-timeouts.patch
 # Support for stepping over PPC atomic instruction sequences (BZ 237572).
 #=fedoratest
-Patch030: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
+Patch028: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
 # Make upstream `set scheduler-locking step' as default.
 #=push+jan: How much is scheduler-locking relevant after non-stop?
-Patch031: gdb-6.6-scheduler_locking-step-is-default.patch
+Patch029: gdb-6.6-scheduler_locking-step-is-default.patch
 # Test kernel VDSO decoding while attaching to an i386 process.
 #=fedoratest
-Patch032: gdb-6.3-attach-see-vdso-test.patch
+Patch030: gdb-6.3-attach-see-vdso-test.patch
 # Test leftover zombie process (BZ 243845).
 #=fedoratest
-Patch033: gdb-6.5-bz243845-stale-testing-zombie-test.patch
+Patch031: gdb-6.5-bz243845-stale-testing-zombie-test.patch
 # New locating of the matching binaries from the pure core file (build-id).
 #=push+jan
-Patch034: gdb-6.6-buildid-locate.patch
+Patch032: 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
-Patch035: gdb-6.6-buildid-locate-solib-missing-ids.patch
+Patch033: gdb-6.6-buildid-locate-solib-missing-ids.patch
 #=push+jan
-Patch036: gdb-6.6-buildid-locate-rpm.patch
+Patch034: 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.
-Patch037: gdb-6.7-charsign-test.patch
+Patch035: gdb-6.7-charsign-test.patch
 # Test PPC hiding of call-volatile parameter register.
 #=fedoratest
-Patch038: gdb-6.7-ppc-clobbered-registers-O2-test.patch
+Patch036: gdb-6.7-ppc-clobbered-registers-O2-test.patch
 # Testsuite fixes for more stable/comparable results.
 #=fedoratest
-Patch039: gdb-6.7-testsuite-stable-results.patch
+Patch037: gdb-6.7-testsuite-stable-results.patch
 # Test ia64 memory leaks of the code using libunwind.
 #=fedoratest
-Patch040: gdb-6.5-ia64-libunwind-leak-test.patch
+Patch038: gdb-6.5-ia64-libunwind-leak-test.patch
 # Test hiding unexpected breakpoints on intentional step commands.
 #=fedoratest
-Patch041: gdb-6.5-missed-trap-on-step-test.patch
+Patch039: gdb-6.5-missed-trap-on-step-test.patch
 # Test gcore memory and time requirements for large inferiors.
 #=fedoratest
-Patch042: gdb-6.5-gcore-buffer-limit-test.patch
+Patch040: 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.
-Patch043: gdb-6.3-mapping-zero-inode-test.patch
+Patch041: gdb-6.3-mapping-zero-inode-test.patch
 # Test a crash on `focus cmd', `focus prev' commands.
 #=fedoratest
-Patch044: gdb-6.3-focus-cmd-prev-test.patch
+Patch042: gdb-6.3-focus-cmd-prev-test.patch
 # Test various forms of threads tracking across exec() (BZ 442765).
 #=fedoratest
-Patch045: gdb-6.8-bz442765-threaded-exec-test.patch
+Patch043: gdb-6.8-bz442765-threaded-exec-test.patch
 # Test a crash on libraries missing the .text section.
 #=fedoratest
-Patch046: gdb-6.5-section-num-fixup-test.patch
+Patch044: gdb-6.5-section-num-fixup-test.patch
 # Fix register assignments with no GDB stack frames (BZ 436037).
 #=push+jan: This fix is incorrect.
-Patch047: gdb-6.8-bz436037-reg-no-longer-active.patch
+Patch045: gdb-6.8-bz436037-reg-no-longer-active.patch
 # Test the watchpoints conditionals works.
 #=fedoratest
 Patch048: gdb-6.8-watchpoint-conditionals-test.patch
 # Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 #=fedoratest
-Patch049: gdb-6.8-bz466901-backtrace-full-prelinked.patch
+Patch046: gdb-6.8-bz466901-backtrace-full-prelinked.patch
 # New test for step-resume breakpoint placed in multiple threads at once.
 #=fedoratest
-Patch050: gdb-simultaneous-step-resume-breakpoint-test.patch
+Patch047: 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@.*>
-Patch051: gdb-core-open-vdso-warning.patch
+Patch048: gdb-core-open-vdso-warning.patch
 # Fix syscall restarts for amd64->i386 biarch.
 #=push+jan
-Patch052: gdb-x86_64-i386-syscall-restart.patch
+Patch049: gdb-x86_64-i386-syscall-restart.patch
 # Fix stepping with OMP parallel Fortran sections (BZ 533176).
 #=push+jan: It requires some better DWARF annotations.
-Patch053: gdb-bz533176-fortran-omp-step.patch
+Patch050: gdb-bz533176-fortran-omp-step.patch
 # Fix regression by python on ia64 due to stale current frame.
 #=push+jan
-Patch054: gdb-follow-child-stale-parent.patch
+Patch051: gdb-follow-child-stale-parent.patch
 # Workaround ccache making lineno non-zero for command-line definitions.
 #=fedoratest: ccache is rarely used and it is even fixed now.
-Patch055: gdb-ccache-workaround.patch
+Patch052: gdb-ccache-workaround.patch
 #=push+jan: May get obsoleted by Tom's unrelocated objfiles patch.
-Patch056: gdb-archer-pie-addons.patch
+Patch053: gdb-archer-pie-addons.patch
 #=push+jan: Breakpoints disabling matching should not be based on address.
-Patch057: gdb-archer-pie-addons-keep-disabled.patch
+Patch054: gdb-archer-pie-addons-keep-disabled.patch
 # Testcase for "Do not make up line information" fix by Daniel Jacobowitz.
 #=fedoratest
-Patch058: gdb-lineno-makeup-test.patch
+Patch055: gdb-lineno-makeup-test.patch
 # Test power7 ppc disassembly.
 #=fedoratest
-Patch059: gdb-ppc-power7-test.patch
+Patch056: gdb-ppc-power7-test.patch
 # Fix i386+x86_64 rwatch+awatch before run, regression against 6.8 (BZ 541866).
 # Fix i386 rwatch+awatch before run (BZ 688788, on top of BZ 541866).
 #=push+jan: It should be fixed properly instead.
-Patch060: gdb-bz541866-rwatch-before-run.patch
+Patch057: gdb-bz541866-rwatch-before-run.patch
 # Workaround non-stop moribund locations exploited by kernel utrace (BZ 590623).
 #=push+jan: Currently it is still not fully safe.
-Patch061: gdb-moribund-utrace-workaround.patch
+Patch058: gdb-moribund-utrace-workaround.patch
 # Fix follow-exec for C++ programs (bugreported by Martin Stransky).
 #=fedoratest
-Patch062: gdb-archer-next-over-throw-cxx-exec.patch
+Patch059: gdb-archer-next-over-throw-cxx-exec.patch
 # Backport DWARF-4 support (BZ 601887, Tom Tromey).
 #=fedoratest
-Patch063: gdb-bz601887-dwarf4-rh-test.patch
+Patch060: gdb-bz601887-dwarf4-rh-test.patch
 #=push+jan
-Patch064: gdb-6.6-buildid-locate-core-as-arg.patch
+Patch061: gdb-6.6-buildid-locate-core-as-arg.patch
 # Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
 #=push+jan
-Patch065: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+Patch062: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
 #=fedoratest
-Patch066: gdb-test-bt-cfi-without-die.patch
+Patch063: gdb-test-bt-cfi-without-die.patch
 # Out of memory is just an error, not fatal (uninitialized VLS vars, BZ 568248).
 #=push+jan: Inferior objects should be read in parts, then this patch gets obsoleted.
-Patch067: gdb-bz568248-oom-is-error.patch
+Patch064: gdb-bz568248-oom-is-error.patch
 # Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
 #=fedoratest
-Patch068: gdb-bz634108-solib_address.patch
+Patch065: gdb-bz634108-solib_address.patch
 # New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435).
 #=fedoratest
-Patch069: gdb-test-pid0-core.patch
+Patch066: gdb-test-pid0-core.patch
 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch070: gdb-test-dw2-aranges.patch
+Patch067: gdb-test-dw2-aranges.patch
 # [archer-keiths-expr-cumulative+upstream] Import C++ testcases.
 #=fedoratest
-Patch071: gdb-test-expr-cumulative-archer.patch
+Patch068: gdb-test-expr-cumulative-archer.patch
 # Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
 #=fedoratest
-Patch072: gdb-physname-pr11734-test.patch
+Patch069: gdb-physname-pr11734-test.patch
 # Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
 #=fedoratest
-Patch073: gdb-physname-pr12273-test.patch
+Patch070: gdb-physname-pr12273-test.patch
 # Test GDB opcodes/ disassembly of Intel Ivy Bridge instructions (BZ 696890).
 #=fedoratest
-Patch074: gdb-test-ivy-bridge.patch
+Patch071: gdb-test-ivy-bridge.patch
 # Hack for proper PIE run of the testsuite.
 #=fedoratest
-Patch075: gdb-runtest-pie-override.patch
+Patch072: gdb-runtest-pie-override.patch
 # Print reasons for failed attach/spawn incl. SELinux deny_ptrace (BZ 786878).
 #=push+jan
-Patch076: gdb-attach-fail-reasons-5of5.patch
+Patch073: gdb-attach-fail-reasons-5of5.patch
 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedora: Compatibility with RHELs (unchecked which ones).
-Patch077: gdb-glibc-strstr-workaround.patch
+Patch074: gdb-glibc-strstr-workaround.patch
 # Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789).
 #=fedoratest
-Patch078: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
+Patch075: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch079: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch076: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch080: gdb-rhbz795424-bitpos-20of25.patch
+Patch077: gdb-rhbz795424-bitpos-20of25.patch
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch081: gdb-rhbz795424-bitpos-21of25.patch
+Patch078: gdb-rhbz795424-bitpos-21of25.patch
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch082: gdb-rhbz795424-bitpos-22of25.patch
+Patch079: gdb-rhbz795424-bitpos-22of25.patch
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch083: gdb-rhbz795424-bitpos-23of25.patch
+Patch080: gdb-rhbz795424-bitpos-23of25.patch
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch084: gdb-rhbz795424-bitpos-25of25.patch
+Patch081: gdb-rhbz795424-bitpos-25of25.patch
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch085: gdb-rhbz795424-bitpos-25of25-test.patch
+Patch082: gdb-rhbz795424-bitpos-25of25-test.patch
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch086: gdb-rhbz795424-bitpos-lazyvalue.patch
+Patch083: gdb-rhbz795424-bitpos-lazyvalue.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
-Patch087: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch084: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
 # Fix crash of -readnow /usr/lib/debug/usr/bin/gnatbind.debug (BZ 1069211).
 #=push+jan
-Patch088: gdb-gnat-dwarf-crash-3of3.patch
+Patch085: gdb-gnat-dwarf-crash-3of3.patch
 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch089: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch086: 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
-Patch090: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch087: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 #=fedoratest
-Patch091: gdb-archer-vla-tests.patch
+Patch088: gdb-archer-vla-tests.patch
 #=fedoratest
-Patch092: gdb-vla-intel-tests.patch
+Patch089: gdb-vla-intel-tests.patch
 # Continue backtrace even if a frame filter throws an exception (Phil Muldoon).
 #=push
-Patch093: gdb-btrobust.patch
+Patch090: gdb-btrobust.patch
 # Display Fortran strings in backtraces.
 #=fedoratest
-Patch094: gdb-fortran-frame-string.patch
+Patch091: gdb-fortran-frame-string.patch
 # Fix Python GIL with gdb.execute("continue") (Phil Muldoon, BZ 1116957).
 #=push
-Patch095: gdb-python-gil.patch
+Patch092: gdb-python-gil.patch
 # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 # crash.' (RH BZ 1156192).
 #=fedoratest
-Patch096: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch093: gdb-rhbz1156192-recursive-dlopen-test.patch
 # Fix jit-reader.h for multi-lib.
 #=push+jan
-Patch097: gdb-jit-reader-multilib.patch
+Patch094: gdb-jit-reader-multilib.patch
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch098: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch095: 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
-Patch099: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+Patch096: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
 # Test 'info type-printers' Python error (RH BZ 1350436).
 #=fedoratest
-Patch100: gdb-rhbz1350436-type-printers-error.patch
+Patch097: gdb-rhbz1350436-type-printers-error.patch
 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch101: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch098: 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
-Patch102: gdb-bz1219747-attach-kills.patch
+Patch099: gdb-bz1219747-attach-kills.patch
 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch103: gdb-fedora-libncursesw.patch
+Patch100: gdb-fedora-libncursesw.patch
 # Test clflushopt instruction decode (for RH BZ 1262471).
 #=fedoratest
-Patch104: gdb-opcodes-clflushopt-test.patch
+Patch101: gdb-opcodes-clflushopt-test.patch
 # [rhel6] DTS backward Python compatibility API (BZ 1020004, Phil Muldoon).
 #=fedora
-Patch105: gdb-dts-rhel6-python-compat.patch
+Patch102: gdb-dts-rhel6-python-compat.patch
 # [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
 #=push+jan
-Patch106: gdb-6.6-buildid-locate-rpm-scl.patch
+Patch103: gdb-6.6-buildid-locate-rpm-scl.patch
 # Work around readline-6.2 incompatibility not asking for --more-- (BZ 701131).
 #=fedora
-Patch107: gdb-readline62-ask-more-rh.patch
+Patch104: gdb-readline62-ask-more-rh.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 .
-Patch108: gdb-6.8-quit-never-aborts.patch
+Patch105: gdb-6.8-quit-never-aborts.patch
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch109: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch106: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch110: gdb-container-rh-pkg.patch
+Patch107: gdb-container-rh-pkg.patch
 # New test for Python "Cannot locate object file for block" (for RH BZ 1325795).
 #=fedoratest
-Patch111: gdb-rhbz1325795-framefilters-test.patch
+Patch108: gdb-rhbz1325795-framefilters-test.patch
 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch112: gdb-linux_perf-bundle.patch
+Patch109: gdb-linux_perf-bundle.patch
 # Fix gdb-headless /usr/bin/ executables (BZ 1390251).
 #=fedora
-Patch113: gdb-libexec-add-index.patch
+Patch110: gdb-libexec-add-index.patch
 # New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
 #=fedoratest
-Patch114: gdb-rhbz1398387-tab-crash-test.patch
+Patch111: gdb-rhbz1398387-tab-crash-test.patch
 # [testsuite] Fix false selftest.exp FAIL from system readline-6.3+ (Patrick Palka).
 #=fedoratest
-Patch115: gdb-testsuite-readline63-sigint.patch
+Patch112: gdb-testsuite-readline63-sigint.patch
 # Python patches of: http://sourceware.org/gdb/wiki/ProjectArcher
 #=push
-Patch116: gdb-archer.patch
+Patch113: gdb-archer.patch
 # Revert upstream commit 469412dd9ccc4de5874fd3299b105833f36b34cd
-Patch117: gdb-vla-intel-fix-print-char-array.patch
+Patch114: gdb-vla-intel-fix-print-char-array.patch
 # [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
 # =fedoratest
-Patch118: gdb-rhbz1553104-s390x-arch12-test.patch
+Patch115: gdb-rhbz1553104-s390x-arch12-test.patch
 # This patch is needed to compile GDB after -Werror=narrowing has
 # been enabled by default.
 # Author: Sergio Durigan Junior.
-Patch119: gdb-rhbz795424-bitpos-arrayview.patch
+Patch116: gdb-rhbz795424-bitpos-arrayview.patch
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@ -114,6 +114,3 @@
 %patch114 -p1
 %patch115 -p1
 %patch116 -p1
 %patch117 -p1
 %patch118 -p1
 %patch119 -p1
--- a/2
+++ b/2
@ -1 +1 @@
-d53eec4ef86cf85841ceaec7db99753827f2beee
+dd9168931facd539a585b88d7b7c6c04c8c065c2
--- a/3
+++ b/3
@ -2,8 +2,6 @@ gdb-6.3-rh-testversion-20041202.patch
 gdb-vla-intel-fortran-strides.patch
 gdb-vla-intel-fortran-vla-strings.patch
 gdb-vla-intel-stringbt-fix.patch
 gdb-6.3-ppc64syscall-20040622.patch
 gdb-6.3-ppc64displaysymbol-20041124.patch
 gdb-6.3-gstack-20050411.patch
 gdb-6.3-test-pie-20050107.patch
 gdb-6.3-test-self-20050110.patch
@ -45,7 +43,6 @@ gdb-6.3-focus-cmd-prev-test.patch
 gdb-6.8-bz442765-threaded-exec-test.patch
 gdb-6.5-section-num-fixup-test.patch
 gdb-6.8-bz436037-reg-no-longer-active.patch
 gdb-6.8-watchpoint-conditionals-test.patch
 gdb-6.8-bz466901-backtrace-full-prelinked.patch
 gdb-simultaneous-step-resume-breakpoint-test.patch
 gdb-core-open-vdso-warning.patch
--- a/gdb-6.3-gstack-20050411.patch
+++ b/gdb-6.3-gstack-20050411.patch
@ -16,7 +16,7 @@ Subject: gdb-6.3-gstack-20050411.patch
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
-@@ -1734,7 +1734,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
+@@ -1739,7 +1739,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
 install: all
 	@$(MAKE) $(FLAGS_TO_PASS) install-only
@ -25,7 +25,7 @@ diff --git a/gdb/Makefile.in b/gdb/Makefile.in
 	transformed_name=`t='$(program_transform_name)'; \
 			  echo gdb | sed -e "$$t"` ; \
 		if test "x$$transformed_name" = x; then \
-@@ -1783,7 +1783,25 @@ install-guile:
+@@ -1788,7 +1788,25 @@ install-guile:
 install-python:
 	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_DATADIR)/python/gdb
@ -52,7 +52,7 @@ diff --git a/gdb/Makefile.in b/gdb/Makefile.in
 	transformed_name=`t='$(program_transform_name)'; \
 			  echo gdb | sed -e $$t` ; \
 		if test "x$$transformed_name" = x; then \
-@@ -1806,6 +1824,18 @@ uninstall: force $(CONFIG_UNINSTALL)
+@@ -1811,6 +1829,18 @@ uninstall: force $(CONFIG_UNINSTALL)
 	fi
 	@$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
--- a/gdb-6.3-ppc64displaysymbol-20041124.patch
+++ b/gdb-6.3-ppc64displaysymbol-20041124.patch
@ -1,32 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Andrew Cagney <cagney@gnu.org>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-ppc64displaysymbol-20041124.patch
 ;; Include the pc's section when doing a symbol lookup so that the
 ;; correct symbol is found.
 ;;=push: Write new testcase.
 2004-11-24  Andrew Cagney  <cagney@gnu.org>
 	* printcmd.c (build_address_symbolic): Find a section for the
 	address.
 diff --git a/gdb/printcmd.c b/gdb/printcmd.c
 --- a/gdb/printcmd.c
 +++ b/gdb/printcmd.c
@@ -587,6 +587,14 @@ build_address_symbolic (struct gdbarch *gdbarch,
 	  addr = overlay_mapped_address (addr, section);
 	}
     }
 +  /* To ensure that the symbol returned belongs to the correct setion
 +     (and that the last [random] symbol from the previous section
 +     isn't returned) try to find the section containing PC.  First try
 +     the overlay code (which by default returns NULL); and second try
 +     the normal section code (which almost always succeeds).  */
 +  section = find_pc_overlay (addr);
 +  if (section == NULL)
 +    section = find_pc_section (addr);
   /* First try to find the address in the symbol table, then
      in the minsyms.  Take the closest one.  */
--- a/gdb-6.3-ppc64syscall-20040622.patch
+++ b/gdb-6.3-ppc64syscall-20040622.patch
@ -1,118 +0,0 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Andrew Cagney <cagney@gnu.org>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-ppc64syscall-20040622.patch
 ;; Better parse 64-bit PPC system call prologues.
 ;;=push: Write new testcase.
 2004-06-22  Andrew Cagney  <cagney@gnu.org>
 	* rs6000-tdep.c (struct rs6000_framedata): Add field "func_start".
 	(skip_prologue): Delete local variable "orig_pc", use
 	"func_start".  Add local variable "num_skip_linux_syscall_insn",
 	use to skip over first half of a GNU/Linux syscall and update
 	"func_start".
 diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
 --- a/gdb/rs6000-tdep.c
 +++ b/gdb/rs6000-tdep.c
@@ -134,6 +134,7 @@ static const char *powerpc_vector_abi_string = "auto";
 struct rs6000_framedata
   {
 +    CORE_ADDR func_start;	/* True function start.  */
     int offset;			/* total size of frame --- the distance
 				   by which we decrement sp to allocate
 				   the frame */
@@ -1426,7 +1427,6 @@ static CORE_ADDR
 skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
 	       struct rs6000_framedata *fdata)
 {
 -  CORE_ADDR orig_pc = pc;
   CORE_ADDR last_prologue_pc = pc;
   CORE_ADDR li_found_pc = 0;
   gdb_byte buf[4];
@@ -1445,12 +1445,14 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
   int minimal_toc_loaded = 0;
   int prev_insn_was_prologue_insn = 1;
   int num_skip_non_prologue_insns = 0;
 +  int num_skip_ppc64_gnu_linux_syscall_insn = 0;
   int r0_contains_arg = 0;
   const struct bfd_arch_info *arch_info = gdbarch_bfd_arch_info (gdbarch);
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   memset (fdata, 0, sizeof (struct rs6000_framedata));
 +  fdata->func_start = pc;
   fdata->saved_gpr = -1;
   fdata->saved_fpr = -1;
   fdata->saved_vr = -1;
@@ -1484,6 +1486,55 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
 	break;
       op = extract_unsigned_integer (buf, 4, byte_order);
 +      /* A PPC64 GNU/Linux system call function is split into two
 +	 sub-functions: a non-threaded fast-path (__NAME_nocancel)
 +	 which does not use a frame; and a threaded slow-path
 +	 (Lpseudo_cancel) that does create a frame.  Ref:
 +	 nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
 +
 +	 *INDENT-OFF*
 +	 NAME:
 +	 	SINGLE_THREAD_P
 +	 	bne- .Lpseudo_cancel
 +	 __NAME_nocancel:
 +	 	li r0,162
 +	 	sc
 +	 	bnslr+
 +	 	b 0x7fe014ef64 <.__syscall_error>
 +	 Lpseudo_cancel:
 +	 	stdu r1,-128(r1)
 +	 	...
 +	 *INDENT-ON*
 +
 +	 Unfortunatly, because the latter case uses a local label (not
 +	 in the symbol table) a PC in "Lpseudo_cancel" appears to be
 +	 in "__NAME_nocancel".  The following code recognizes this,
 +	 adjusting FUNC_START to point to where "Lpseudo_cancel"
 +	 should be, and parsing the prologue sequence as if
 +	 "Lpseudo_cancel" was the entry point.  */
 +
 +      if (((op & 0xffff0000) == 0x38000000 /* li r0,N */
 +	   && pc == fdata->func_start + 0
 +	   && num_skip_ppc64_gnu_linux_syscall_insn == 0)
 +	  || (op == 0x44000002 /* sc */
 +	      && pc == fdata->func_start + 4
 +	      && num_skip_ppc64_gnu_linux_syscall_insn == 1)
 +	  || (op == 0x4ca30020 /* bnslr+ */
 +	      && pc == fdata->func_start + 8
 +	      && num_skip_ppc64_gnu_linux_syscall_insn == 2))
 +	{
 +	  num_skip_ppc64_gnu_linux_syscall_insn++;
 +	  continue;
 +	}
 +      else if ((op & 0xfc000003) == 0x48000000 /* b __syscall_error */
 +	       && pc == fdata->func_start + 12
 +	       && num_skip_ppc64_gnu_linux_syscall_insn == 3)
 +	{
 +	  num_skip_ppc64_gnu_linux_syscall_insn = -1;
 +	  fdata->func_start = pc;
 +	  continue;
 +	}
 +
       if ((op & 0xfc1fffff) == 0x7c0802a6)
 	{			/* mflr Rx */
 	  /* Since shared library / PIC code, which needs to get its
@@ -1673,9 +1724,9 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
 	     we have no line table information or the line info tells
 	     us that the subroutine call is not part of the line
 	     associated with the prologue.  */
 -	  if ((pc - orig_pc) > 8)
 +	  if ((pc - fdata->func_start) > 8)
 	    {
 -	      struct symtab_and_line prologue_sal = find_pc_line (orig_pc, 0);
 +	      struct symtab_and_line prologue_sal = find_pc_line (fdata->func_start, 0);
 	      struct symtab_and_line this_sal = find_pc_line (pc, 0);
 	      if ((prologue_sal.line == 0)
--- a/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
+++ b/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
@ -44,7 +44,7 @@ glibc-debuginfo-2.7-2.x86_64: /usr/lib/debug/lib64/libc.so.6.debug:
 diff --git a/gdb/printcmd.c b/gdb/printcmd.c
 --- a/gdb/printcmd.c
 +++ b/gdb/printcmd.c
-@@ -1190,6 +1190,10 @@ print_command_1 (const char *exp, int voidprint)
+@@ -1182,6 +1182,10 @@ print_command_1 (const char *exp, int voidprint)
   if (exp && *exp)
     {
--- a/gdb-6.5-bz216711-clone-is-outermost.patch
+++ b/gdb-6.5-bz216711-clone-is-outermost.patch
@ -127,7 +127,7 @@ diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
 diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
 --- a/gdb/amd64-tdep.c
 +++ b/gdb/amd64-tdep.c
-@@ -2595,6 +2595,7 @@ amd64_frame_unwind_stop_reason (struct frame_info *this_frame,
+@@ -2600,6 +2600,7 @@ amd64_frame_unwind_stop_reason (struct frame_info *this_frame,
 {
   struct amd64_frame_cache *cache =
     amd64_frame_cache (this_frame, this_cache);
@ -135,7 +135,7 @@ diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
   if (!cache->base_p)
     return UNWIND_UNAVAILABLE;
-@@ -2603,6 +2604,10 @@ amd64_frame_unwind_stop_reason (struct frame_info *this_frame,
+@@ -2608,6 +2609,10 @@ amd64_frame_unwind_stop_reason (struct frame_info *this_frame,
   if (cache->base == 0)
     return UNWIND_OUTERMOST;
@ -146,7 +146,7 @@ diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
   return UNWIND_NO_REASON;
 }
-@@ -2737,6 +2742,7 @@ amd64_sigtramp_frame_this_id (struct frame_info *this_frame,
+@@ -2742,6 +2747,7 @@ amd64_sigtramp_frame_this_id (struct frame_info *this_frame,
 {
   struct amd64_frame_cache *cache =
     amd64_sigtramp_frame_cache (this_frame, this_cache);
@ -154,7 +154,7 @@ diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
   if (!cache->base_p)
     (*this_id) = frame_id_build_unavailable_stack (get_frame_pc (this_frame));
-@@ -2745,6 +2751,11 @@ amd64_sigtramp_frame_this_id (struct frame_info *this_frame,
+@@ -2750,6 +2756,11 @@ amd64_sigtramp_frame_this_id (struct frame_info *this_frame,
       /* This marks the outermost frame.  */
       return;
     }
--- a/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
+++ b/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
@ -11,7 +11,7 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
 diff --git a/gdb/symtab.c b/gdb/symtab.c
 --- a/gdb/symtab.c
 +++ b/gdb/symtab.c
-@@ -3166,6 +3166,13 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
+@@ -3167,6 +3167,13 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
 	     SYMBOL_LINKAGE_NAME (msymbol)); */
 	  ;
 	/* fall through */
--- a/gdb-6.6-buildid-locate-core-as-arg.patch
+++ b/gdb-6.6-buildid-locate-core-as-arg.patch
@ -155,7 +155,7 @@ diff --git a/gdb/main.c b/gdb/main.c
 static void
 captured_main_1 (struct captured_main_args *context)
 {
-@@ -884,6 +913,8 @@ captured_main_1 (struct captured_main_args *context)
+@@ -888,6 +917,8 @@ captured_main_1 (struct captured_main_args *context)
 	{
 	  symarg = argv[optind];
 	  execarg = argv[optind];
@ -164,7 +164,7 @@ diff --git a/gdb/main.c b/gdb/main.c
 	  optind++;
 	}
-@@ -1034,12 +1065,25 @@ captured_main_1 (struct captured_main_args *context)
+@@ -1038,12 +1069,25 @@ captured_main_1 (struct captured_main_args *context)
       && symarg != NULL
       && strcmp (execarg, symarg) == 0)
     {
--- a/gdb-6.6-buildid-locate-rpm-scl.patch
+++ b/gdb-6.6-buildid-locate-rpm-scl.patch
@ -99,7 +99,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -3468,6 +3468,16 @@ read_gdb_index_from_buffer (struct objfile *objfile,
+@@ -3469,6 +3469,16 @@ read_gdb_index_from_buffer (struct objfile *objfile,
      "set use-deprecated-index-sections on".  */
   if (version < 6 && !deprecated_ok)
     {
@ -116,7 +116,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
       static int warning_printed = 0;
       if (!warning_printed)
 	{
-@@ -3479,6 +3489,10 @@ to use the section anyway."),
+@@ -3480,6 +3490,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
@ -977,7 +977,7 @@ diff --git a/gdb/corelow.c b/gdb/corelow.c
 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
 --- a/gdb/doc/gdb.texinfo
 +++ b/gdb/doc/gdb.texinfo
-@@ -19835,6 +19835,27 @@ information files.
+@@ -19937,6 +19937,27 @@ information files.
 @end table
@ -1008,7 +1008,7 @@ diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
 diff --git a/gdb/dwarf-index-cache.c b/gdb/dwarf-index-cache.c
 --- a/gdb/dwarf-index-cache.c
 +++ b/gdb/dwarf-index-cache.c
-@@ -140,7 +140,7 @@ index_cache::store (struct dwarf2_per_objfile *dwarf2_per_objfile)
+@@ -93,7 +93,7 @@ index_cache::store (struct dwarf2_per_objfile *dwarf2_per_objfile)
   if (!enabled ())
     return;
@ -1020,7 +1020,7 @@ diff --git a/gdb/dwarf-index-cache.c b/gdb/dwarf-index-cache.c
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -2694,7 +2694,7 @@ dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile)
+@@ -2695,7 +2695,7 @@ dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile)
     }
   if (dwz_bfd == NULL)
@ -1029,7 +1029,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
   if (dwz_bfd == NULL)
     error (_("could not find '.gnu_debugaltlink' file for %s"),
-@@ -6198,7 +6198,7 @@ get_gdb_index_contents_from_section (objfile *obj, T *section_owner)
+@@ -6199,7 +6199,7 @@ get_gdb_index_contents_from_section (objfile *obj, T *section_owner)
 static gdb::array_view<const gdb_byte>
 get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_objfile *dwarf2_obj)
 {
@ -1038,7 +1038,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
   if (build_id == nullptr)
     return {};
-@@ -6211,7 +6211,7 @@ get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_objfile *dwarf2_obj)
+@@ -6212,7 +6212,7 @@ get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_objfile *dwarf2_obj)
 static gdb::array_view<const gdb_byte>
 get_gdb_index_contents_from_cache_dwz (objfile *obj, dwz_file *dwz)
 {
@ -1089,7 +1089,7 @@ diff --git a/gdb/objfiles.h b/gdb/objfiles.h
 diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c
 --- a/gdb/python/py-objfile.c
 +++ b/gdb/python/py-objfile.c
-@@ -132,7 +132,7 @@ objfpy_get_build_id (PyObject *self, void *closure)
+@@ -133,7 +133,7 @@ objfpy_get_build_id (PyObject *self, void *closure)
   TRY
     {
@ -1098,7 +1098,7 @@ diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c
     }
   CATCH (except, RETURN_MASK_ALL)
     {
-@@ -549,7 +549,7 @@ objfpy_lookup_objfile_by_build_id (const char *build_id)
+@@ -550,7 +550,7 @@ objfpy_lookup_objfile_by_build_id (const char *build_id)
       /* Don't return separate debug files.  */
       if (objfile->separate_debug_objfile_backlink != NULL)
 	continue;
@ -1238,7 +1238,7 @@ diff --git a/gdb/testsuite/gdb.base/new-ui-pending-input.exp b/gdb/testsuite/gdb
 diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
 --- a/gdb/testsuite/lib/gdb.exp
 +++ b/gdb/testsuite/lib/gdb.exp
-@@ -1695,6 +1695,16 @@ proc default_gdb_start { } {
+@@ -1706,6 +1706,16 @@ proc default_gdb_start { } {
 	    warning "Couldn't set the width to 0."
 	}
     }
--- a/gdb-6.6-scheduler_locking-step-is-default.patch
+++ b/gdb-6.6-scheduler_locking-step-is-default.patch
@ -9,7 +9,7 @@ Subject: gdb-6.6-scheduler_locking-step-is-default.patch
 diff --git a/gdb/infrun.c b/gdb/infrun.c
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
-@@ -2193,7 +2193,7 @@ static const char *const scheduler_enums[] = {
+@@ -2195,7 +2195,7 @@ static const char *const scheduler_enums[] = {
   schedlock_replay,
   NULL
 };
--- a/gdb-6.8-watchpoint-conditionals-test.patch
+++ b/gdb-6.8-watchpoint-conditionals-test.patch
@ -1,90 +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-watchpoint-conditionals-test.patch
 ;; Test the watchpoints conditionals works.
 ;;=fedoratest
 For:
 http://sourceware.org/ml/gdb-patches/2008-04/msg00379.html
 http://sourceware.org/ml/gdb-cvs/2008-04/msg00104.html
 diff --git a/gdb/testsuite/gdb.base/watchpoint-cond.c b/gdb/testsuite/gdb.base/watchpoint-cond.c
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/watchpoint-cond.c
@@ -0,0 +1,31 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2008 Free Software Foundation, Inc.
 +
 +   This program is free software; you can redistribute it and/or modify
 +   it under the terms of the GNU General Public License as published by
 +   the Free Software Foundation; either version 3 of the License, or
 +   (at your option) any later version.
 +
 +   This program is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
 +
 +   You should have received a copy of the GNU General Public License
 +   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +   Please email any bugs, comments, and/or additions to this file to:
 +   bug-gdb@prep.ai.mit.edu  */
 +
 +int
 +main (int argc, char **argv)
 +{
 +  static int i = 0; /* `static' to start initialized.  */
 +  int j = 2;
 +
 +  for (j = 0; j < 30; j++)
 +    i = 30 - j;
 +
 +  return 0;
 +}
 diff --git a/gdb/testsuite/gdb.base/watchpoint-cond.exp b/gdb/testsuite/gdb.base/watchpoint-cond.exp
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/watchpoint-cond.exp
@@ -0,0 +1,37 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 3 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +set testfile watchpoint-cond
 +set srcfile ${testfile}.c
 +set binfile [standard_output_file ${testfile}]
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1
 +}
 +
 +# Get things started.
 +
 +gdb_exit
 +gdb_start
 +gdb_reinitialize_dir $srcdir/$subdir
 +gdb_load ${binfile}
 +
 +if { [runto_main] < 0 } {
 +    untested watchpoint-cond
 +    return -1
 +}
 +
 +gdb_test "watch i if i < 20" "atchpoint \[0-9\]+: i"
 +gdb_test "cont" "atchpoint \[0-9\]+: i.*Old value = 20.*New value = 19.*"
--- a/gdb-archer.patch
+++ b/gdb-archer.patch
@ -17,7 +17,7 @@ tromey/python
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
-@@ -2094,6 +2094,12 @@ stamp-h: $(srcdir)/config.in config.status
+@@ -2099,6 +2099,12 @@ stamp-h: $(srcdir)/config.in config.status
 	  CONFIG_LINKS= \
 	  $(SHELL) config.status
@ -121,7 +121,7 @@ diff --git a/gdb/main.c b/gdb/main.c
 {
   int argc = context->argc;
   char **argv = context->argv;
-@@ -694,10 +695,14 @@ captured_main_1 (struct captured_main_args *context)
+@@ -698,10 +699,14 @@ captured_main_1 (struct captured_main_args *context)
       {"args", no_argument, &set_args, 1},
       {"l", required_argument, 0, 'l'},
       {"return-child-result", no_argument, &return_child_result, 1},
@ -137,7 +137,7 @@ diff --git a/gdb/main.c b/gdb/main.c
       {
 	int option_index;
-@@ -715,6 +720,9 @@ captured_main_1 (struct captured_main_args *context)
+@@ -719,6 +724,9 @@ captured_main_1 (struct captured_main_args *context)
 	  case 0:
 	    /* Long option that just sets a flag.  */
 	    break;
@ -147,7 +147,7 @@ diff --git a/gdb/main.c b/gdb/main.c
 	  case OPT_SE:
 	    symarg = optarg;
 	    execarg = optarg;
-@@ -889,7 +897,31 @@ captured_main_1 (struct captured_main_args *context)
+@@ -893,7 +901,31 @@ captured_main_1 (struct captured_main_args *context)
   /* Now that gdb_init has created the initial inferior, we're in
      position to set args for that inferior.  */
@ -180,7 +180,7 @@ diff --git a/gdb/main.c b/gdb/main.c
     {
       /* The remaining options are the command-line options for the
 	 inferior.  The first one is the sym/exec file, and the rest
-@@ -1190,7 +1222,8 @@ captured_main_1 (struct captured_main_args *context)
+@@ -1194,7 +1226,8 @@ captured_main_1 (struct captured_main_args *context)
   /* Read in the old history after all the command files have been
      read.  */
@ -190,7 +190,7 @@ diff --git a/gdb/main.c b/gdb/main.c
   if (batch_flag)
     {
-@@ -1206,24 +1239,37 @@ static void
+@@ -1210,24 +1243,37 @@ static void
 captured_main (void *data)
 {
   struct captured_main_args *context = (struct captured_main_args *) data;
@ -241,7 +241,7 @@ diff --git a/gdb/main.c b/gdb/main.c
     }
   /* No exit -- exit is through quit_command.  */
 }
-@@ -1266,6 +1312,12 @@ print_gdb_help (struct ui_file *stream)
+@@ -1270,6 +1316,12 @@ print_gdb_help (struct ui_file *stream)
   fputs_unfiltered (_("\
 This is the GNU debugger.  Usage:\n\n\
     gdb [options] [executable-file [core-file or process-id]]\n\
@ -254,7 +254,7 @@ diff --git a/gdb/main.c b/gdb/main.c
     gdb [options] --args executable-file [inferior-arguments ...]\n\n\
 "), stream);
   fputs_unfiltered (_("\
-@@ -1311,6 +1363,13 @@ Output and user interface control:\n\n\
+@@ -1315,6 +1367,13 @@ Output and user interface control:\n\n\
 #endif
   fputs_unfiltered (_("\
   --dbx              DBX compatibility mode.\n\
--- a/gdb-attach-fail-reasons-5of5.patch
+++ b/gdb-attach-fail-reasons-5of5.patch
@ -55,7 +55,7 @@ diff --git a/gdb/config.in b/gdb/config.in
 /* Define to 1 if you have the <libunwind-ia64.h> header file. */
 #undef HAVE_LIBUNWIND_IA64_H
-@@ -393,6 +396,9 @@
+@@ -390,6 +393,9 @@
 /* Define to 1 if you have the `scm_new_smob' function. */
 #undef HAVE_SCM_NEW_SMOB
--- a/gdb-bz1219747-attach-kills.patch
+++ b/gdb-bz1219747-attach-kills.patch
@ -80,7 +80,7 @@ gdb/testsuite/ChangeLog
 diff --git a/gdb/main.c b/gdb/main.c
 --- a/gdb/main.c
 +++ b/gdb/main.c
-@@ -1120,7 +1120,10 @@ captured_main_1 (struct captured_main_args *context)
+@@ -1124,7 +1124,10 @@ captured_main_1 (struct captured_main_args *context)
 	{
 	  ret = catch_command_errors (attach_command, pid_or_core_arg,
 				      !batch_flag);
--- a/gdb-bz533176-fortran-omp-step.patch
+++ b/gdb-bz533176-fortran-omp-step.patch
@ -30,7 +30,7 @@ debugging problem of GOMP outside of the scope of this Bug.
 diff --git a/gdb/infrun.c b/gdb/infrun.c
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
-@@ -6691,6 +6691,16 @@ process_event_stop_test (struct execution_control_state *ecs)
+@@ -6693,6 +6693,16 @@ process_event_stop_test (struct execution_control_state *ecs)
       if (ecs->event_thread->control.step_over_calls == STEP_OVER_ALL)
 	{
@ -47,7 +47,7 @@ diff --git a/gdb/infrun.c b/gdb/infrun.c
 	  /* We're doing a "next".
 	     Normal (forward) execution: set a breakpoint at the
-@@ -6724,6 +6734,7 @@ process_event_stop_test (struct execution_control_state *ecs)
+@@ -6726,6 +6736,7 @@ process_event_stop_test (struct execution_control_state *ecs)
 	  keep_going (ecs);
 	  return;
--- a/gdb-container-rh-pkg.patch
+++ b/gdb-container-rh-pkg.patch
@ -9,7 +9,7 @@ Subject: gdb-container-rh-pkg.patch
 diff --git a/gdb/remote.c b/gdb/remote.c
 --- a/gdb/remote.c
 +++ b/gdb/remote.c
-@@ -14008,7 +14008,17 @@ remote_target::pid_to_exec_file (int pid)
+@@ -13999,7 +13999,17 @@ remote_target::pid_to_exec_file (int pid)
   char *annex = NULL;
   if (packet_support (PACKET_qXfer_exec_file) != PACKET_ENABLE)
--- a/gdb-glibc-strstr-workaround.patch
+++ b/gdb-glibc-strstr-workaround.patch
@ -9,7 +9,7 @@ Subject: gdb-glibc-strstr-workaround.patch
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -21458,6 +21458,26 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
+@@ -21490,6 +21490,26 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
       /* Cache this symbol's name and the name's demangled form (if any).  */
       SYMBOL_SET_LANGUAGE (sym, cu->language, &objfile->objfile_obstack);
       linkagename = dwarf2_physname (name, die, cu);
--- a/gdb-gnat-dwarf-crash-3of3.patch
+++ b/gdb-gnat-dwarf-crash-3of3.patch
@ -42,7 +42,7 @@ gdb/
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -10585,6 +10585,13 @@ private:
+@@ -10581,6 +10581,13 @@ private:
 static void
 process_die (struct die_info *die, struct dwarf2_cu *cu)
 {
--- a/gdb-rhbz795424-bitpos-20of25.patch
+++ b/gdb-rhbz795424-bitpos-20of25.patch
@ -557,7 +557,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 					     struct type *);
 static struct value *assign_aggregate (struct value *, struct value *, 
-@@ -692,7 +693,7 @@ coerce_unspec_val_to_type (struct value *val, struct type *type)
+@@ -703,7 +704,7 @@ coerce_unspec_val_to_type (struct value *val, struct type *type)
 }
 static const gdb_byte *
@ -566,7 +566,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 {
   if (valaddr == NULL)
     return NULL;
-@@ -701,7 +702,7 @@ cond_offset_host (const gdb_byte *valaddr, long offset)
+@@ -712,7 +713,7 @@ cond_offset_host (const gdb_byte *valaddr, long offset)
 }
 static CORE_ADDR
@ -575,7 +575,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 {
   if (address == 0)
     return 0;
-@@ -1743,7 +1744,7 @@ desc_bounds (struct value *arr)
+@@ -1754,7 +1755,7 @@ desc_bounds (struct value *arr)
 /* If TYPE is the type of an array-descriptor (fat pointer),  the bit
    position of the field containing the address of the bounds data.  */
@ -584,7 +584,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 fat_pntr_bounds_bitpos (struct type *type)
 {
   return TYPE_FIELD_BITPOS (desc_base_type (type), 1);
-@@ -1809,7 +1810,7 @@ desc_data (struct value *arr)
+@@ -1820,7 +1821,7 @@ desc_data (struct value *arr)
 /* If TYPE is the type of an array-descriptor (fat pointer), the bit
    position of the field containing the address of the data.  */
@ -593,7 +593,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 fat_pntr_data_bitpos (struct type *type)
 {
   return TYPE_FIELD_BITPOS (desc_base_type (type), 0);
-@@ -1844,7 +1845,7 @@ desc_one_bound (struct value *bounds, int i, int which)
+@@ -1855,7 +1856,7 @@ desc_one_bound (struct value *bounds, int i, int which)
    of the Ith lower bound stored in it, if WHICH is 0, and the Ith upper
    bound, if WHICH is 1.  The first bound is I=1.  */
@ -602,7 +602,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 desc_bound_bitpos (struct type *type, int i, int which)
 {
   return TYPE_FIELD_BITPOS (desc_base_type (type), 2 * i + which - 2);
-@@ -2034,7 +2035,7 @@ ada_type_of_array (struct value *arr, int bounds)
+@@ -2045,7 +2046,7 @@ ada_type_of_array (struct value *arr, int bounds)
 	         zero, and does not need to be recomputed.  */
 	      if (lo < hi)
 		{
@ -611,7 +611,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 		        (hi - lo + 1) * TYPE_FIELD_BITSIZE (elt_type, 0);
 		  TYPE_LENGTH (array_type) = (array_bitsize + 7) / 8;
-@@ -2194,7 +2195,7 @@ decode_packed_array_bitsize (struct type *type)
+@@ -2205,7 +2206,7 @@ decode_packed_array_bitsize (struct type *type)
    the length is arbitrary.  */
 static struct type *
@ -620,7 +620,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 {
   struct type *new_elt_type;
   struct type *new_type;
-@@ -2248,7 +2249,7 @@ decode_constrained_packed_array_type (struct type *type)
+@@ -2259,7 +2260,7 @@ decode_constrained_packed_array_type (struct type *type)
   char *name;
   const char *tail;
   struct type *shadow_type;
@ -629,7 +629,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
   if (!raw_name)
     raw_name = ada_type_name (desc_base_type (type));
-@@ -2319,7 +2320,8 @@ decode_constrained_packed_array (struct value *arr)
+@@ -2330,7 +2331,8 @@ decode_constrained_packed_array (struct value *arr)
  	 array with no wrapper.  In order to interpret the value through
  	 the (left-justified) packed array type we just built, we must
  	 first left-justify it.  */
@ -639,7 +639,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
       ULONGEST mod;
       mod = ada_modulus (value_type (arr)) - 1;
-@@ -2547,7 +2549,7 @@ ada_unpack_from_contents (const gdb_byte *src, int bit_offset, int bit_size,
+@@ -2558,7 +2560,7 @@ ada_unpack_from_contents (const gdb_byte *src, int bit_offset, int bit_size,
 struct value *
 ada_value_primitive_packed_val (struct value *obj, const gdb_byte *valaddr,
@ -648,7 +648,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
                                 struct type *type)
 {
   struct value *v;
-@@ -2617,7 +2619,7 @@ ada_value_primitive_packed_val (struct value *obj, const gdb_byte *valaddr,
+@@ -2628,7 +2630,7 @@ ada_value_primitive_packed_val (struct value *obj, const gdb_byte *valaddr,
   if (obj != NULL)
     {
@ -657,7 +657,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
       set_value_component_location (v, obj);
       set_value_bitpos (v, bit_offset + value_bitpos (obj));
-@@ -2663,7 +2665,7 @@ ada_value_primitive_packed_val (struct value *obj, const gdb_byte *valaddr,
+@@ -2674,7 +2676,7 @@ ada_value_primitive_packed_val (struct value *obj, const gdb_byte *valaddr,
    not overlap.  */
 static void
 move_bits (gdb_byte *target, int targ_offset, const gdb_byte *source,
@ -666,7 +666,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 {
   unsigned int accum, mask;
   int accum_bits, chunk_size;
-@@ -2753,7 +2755,7 @@ ada_value_assign (struct value *toval, struct value *fromval)
+@@ -2764,7 +2766,7 @@ ada_value_assign (struct value *toval, struct value *fromval)
     {
       int len = (value_bitpos (toval)
 		 + bits + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT;
@ -675,7 +675,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
       gdb_byte *buffer = (gdb_byte *) alloca (len);
       struct value *val;
       CORE_ADDR to_addr = value_address (toval);
-@@ -2804,7 +2806,7 @@ value_assign_to_component (struct value *container, struct value *component,
+@@ -2815,7 +2817,7 @@ value_assign_to_component (struct value *container, struct value *component,
     (LONGEST)  (value_address (component) - value_address (container));
   int bit_offset_in_container =
     value_bitpos (component) - value_bitpos (container);
@ -684,7 +684,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
   val = value_cast (value_type (component), val);
-@@ -4502,7 +4504,7 @@ ensure_lval (struct value *val)
+@@ -4513,7 +4515,7 @@ ensure_lval (struct value *val)
   if (VALUE_LVAL (val) == not_lval
       || VALUE_LVAL (val) == lval_internalvar)
     {
@ -693,7 +693,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
       const CORE_ADDR addr =
         value_as_long (value_allocate_space_in_inferior (len));
-@@ -4586,7 +4588,7 @@ static CORE_ADDR
+@@ -4597,7 +4599,7 @@ static CORE_ADDR
 value_pointer (struct value *value, struct type *type)
 {
   struct gdbarch *gdbarch = get_type_arch (type);
@ -702,7 +702,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
   gdb_byte *buf = (gdb_byte *) alloca (len);
   CORE_ADDR addr;
-@@ -6694,7 +6696,7 @@ value_tag_from_contents_and_address (struct type *type,
+@@ -6705,7 +6707,7 @@ value_tag_from_contents_and_address (struct type *type,
 				     const gdb_byte *valaddr,
                                      CORE_ADDR address)
 {
@ -711,7 +711,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
   struct type *tag_type;
   if (find_struct_field ("_tag", type, 0, &tag_type, &tag_byte_offset,
-@@ -7187,7 +7189,7 @@ ada_in_variant (LONGEST val, struct type *type, int field_num)
+@@ -7198,7 +7200,7 @@ ada_in_variant (LONGEST val, struct type *type, int field_num)
    only in that it can handle packed values of arbitrary type.  */
 static struct value *
@ -720,7 +720,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
                            struct type *arg_type)
 {
   struct type *type;
-@@ -7199,7 +7201,7 @@ ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
+@@ -7210,7 +7212,7 @@ ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
   if (TYPE_FIELD_BITSIZE (arg_type, fieldno) != 0)
     {
@ -729,7 +729,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
       int bit_size = TYPE_FIELD_BITSIZE (arg_type, fieldno);
       return ada_value_primitive_packed_val (arg1, value_contents (arg1),
-@@ -7276,9 +7278,9 @@ ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
+@@ -7287,9 +7289,9 @@ ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
    Returns 1 if found, 0 otherwise.  */
 static int
@ -741,7 +741,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 		   int *index_p)
 {
   int i;
-@@ -7297,8 +7299,8 @@ find_struct_field (const char *name, struct type *type, int offset,
+@@ -7308,8 +7310,8 @@ find_struct_field (const char *name, struct type *type, int offset,
   for (i = 0; i < TYPE_NFIELDS (type); i += 1)
     {
@ -752,7 +752,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
       const char *t_field_name = TYPE_FIELD_NAME (type, i);
       if (t_field_name == NULL)
-@@ -7400,7 +7402,7 @@ num_visible_fields (struct type *type)
+@@ -7411,7 +7413,7 @@ num_visible_fields (struct type *type)
    long explanation in find_struct_field's function documentation.  */
 static struct value *
@ -761,7 +761,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
                          struct type *type)
 {
   int i;
-@@ -7448,7 +7450,7 @@ ada_search_struct_field (const char *name, struct value *arg, int offset,
+@@ -7459,7 +7461,7 @@ ada_search_struct_field (const char *name, struct value *arg, int offset,
           int j;
           struct type *field_type = ada_check_typedef (TYPE_FIELD_TYPE (type,
 									i));
@ -770,7 +770,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
           for (j = 0; j < TYPE_NFIELDS (field_type); j += 1)
             {
-@@ -7480,8 +7482,8 @@ ada_search_struct_field (const char *name, struct value *arg, int offset,
+@@ -7491,8 +7493,8 @@ ada_search_struct_field (const char *name, struct value *arg, int offset,
   return NULL;
 }
@ -781,7 +781,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 /* Return field #INDEX in ARG, where the index is that returned by
-@@ -7490,7 +7492,7 @@ static struct value *ada_index_struct_field_1 (int *, struct value *,
+@@ -7501,7 +7503,7 @@ static struct value *ada_index_struct_field_1 (int *, struct value *,
  * If found, return value, else return NULL.  */
 static struct value *
@ -790,7 +790,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 			struct type *type)
 {
   return ada_index_struct_field_1 (&index, arg, offset, type);
-@@ -7502,7 +7504,7 @@ ada_index_struct_field (int index, struct value *arg, int offset,
+@@ -7513,7 +7515,7 @@ ada_index_struct_field (int index, struct value *arg, int offset,
  * *INDEX_P.  */
 static struct value *
@ -799,7 +799,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 			  struct type *type)
 {
   int i;
-@@ -7593,7 +7595,8 @@ ada_value_struct_elt (struct value *arg, const char *name, int no_err)
+@@ -7604,7 +7606,8 @@ ada_value_struct_elt (struct value *arg, const char *name, int no_err)
     v = ada_search_struct_field (name, arg, 0, t);
   else
     {
@ -809,7 +809,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
       struct type *field_type;
       CORE_ADDR address;
-@@ -7942,8 +7945,8 @@ ada_coerce_ref (struct value *val0)
+@@ -7953,8 +7956,8 @@ ada_coerce_ref (struct value *val0)
 /* Return OFF rounded upward if necessary to a multiple of
    ALIGNMENT (a power of 2).  */
@ -820,7 +820,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 {
   return (off + alignment - 1) & ~(alignment - 1);
 }
-@@ -8333,10 +8336,9 @@ ada_template_to_fixed_record_type_1 (struct type *type,
+@@ -8344,10 +8347,9 @@ ada_template_to_fixed_record_type_1 (struct type *type,
   struct value *mark = value_mark ();
   struct value *dval;
   struct type *rtype;
@ -833,7 +833,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
   int f;
   /* Compute the number of fields in this record type that are going
-@@ -8413,7 +8415,7 @@ ada_template_to_fixed_record_type_1 (struct type *type,
+@@ -8424,7 +8426,7 @@ ada_template_to_fixed_record_type_1 (struct type *type,
 	     that follow this one.  */
 	  if (ada_is_aligner_type (field_type))
 	    {
@ -842,7 +842,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 	      field_valaddr = cond_offset_host (field_valaddr, field_offset);
 	      field_address = cond_offset_target (field_address, field_offset);
-@@ -8549,11 +8551,11 @@ ada_template_to_fixed_record_type_1 (struct type *type,
+@@ -8560,11 +8562,11 @@ ada_template_to_fixed_record_type_1 (struct type *type,
   if (TYPE_LENGTH (type) <= 0)
     {
       if (TYPE_NAME (rtype))
@ -858,7 +858,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
     }
   else
     {
-@@ -9017,7 +9019,8 @@ to_fixed_array_type (struct type *type0, struct value *dval,
+@@ -9028,7 +9030,8 @@ to_fixed_array_type (struct type *type0, struct value *dval,
 	 type was a regular (non-packed) array type.  As a result, the
 	 bitsize of the array elements needs to be set again, and the array
 	 length needs to be recomputed based on that bitsize.  */
@ -1072,7 +1072,7 @@ diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
 diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
 --- a/gdb/amd64-tdep.c
 +++ b/gdb/amd64-tdep.c
-@@ -727,7 +727,7 @@ amd64_return_value (struct gdbarch *gdbarch, struct value *function,
+@@ -732,7 +732,7 @@ amd64_return_value (struct gdbarch *gdbarch, struct value *function,
 		    gdb_byte *readbuf, const gdb_byte *writebuf)
 {
   enum amd64_reg_class theclass[2];
@ -1081,7 +1081,7 @@ diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
   static int integer_regnum[] = { AMD64_RAX_REGNUM, AMD64_RDX_REGNUM };
   static int sse_regnum[] = { AMD64_XMM0_REGNUM, AMD64_XMM1_REGNUM };
   int integer_reg = 0;
-@@ -844,10 +844,10 @@ amd64_return_value (struct gdbarch *gdbarch, struct value *function,
+@@ -849,10 +849,10 @@ amd64_return_value (struct gdbarch *gdbarch, struct value *function,
       gdb_assert (regnum != -1);
       if (readbuf)
@ -1634,7 +1634,7 @@ diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -2032,11 +2032,11 @@ dwarf2_complex_location_expr_complaint (void)
+@@ -2033,11 +2033,11 @@ dwarf2_complex_location_expr_complaint (void)
 }
 static void
@ -1650,7 +1650,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 }
 static void
-@@ -15092,8 +15092,8 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
+@@ -15104,8 +15104,8 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
 	         object, and then subtract off the number of bits of
 	         the field itself.  The result is the bit offset of
 	         the LSB of the field.  */
@ -1707,7 +1707,7 @@ diff --git a/gdb/eval.c b/gdb/eval.c
   struct type **arg_types;
   pc = (*pos)++;
-@@ -1735,7 +1736,7 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -1734,7 +1735,7 @@ evaluate_subexp_standard (struct type *expect_type,
 	  struct type *range_type = TYPE_INDEX_TYPE (type);
 	  struct type *element_type = TYPE_TARGET_TYPE (type);
 	  struct value *array = allocate_value (expect_type);
@ -1802,7 +1802,7 @@ diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
 diff --git a/gdb/findvar.c b/gdb/findvar.c
 --- a/gdb/findvar.c
 +++ b/gdb/findvar.c
-@@ -823,7 +823,7 @@ struct value *
+@@ -821,7 +821,7 @@ struct value *
 default_value_from_register (struct gdbarch *gdbarch, struct type *type,
                              int regnum, struct frame_id frame_id)
 {
@ -1811,7 +1811,7 @@ diff --git a/gdb/findvar.c b/gdb/findvar.c
   struct value *value = allocate_value (type);
   struct frame_info *frame;
-@@ -867,7 +867,7 @@ read_frame_register_value (struct value *value, struct frame_info *frame)
+@@ -865,7 +865,7 @@ read_frame_register_value (struct value *value, struct frame_info *frame)
   LONGEST offset = 0;
   LONGEST reg_offset = value_offset (value);
   int regnum = VALUE_REGNUM (value);
@ -1820,7 +1820,7 @@ diff --git a/gdb/findvar.c b/gdb/findvar.c
   gdb_assert (VALUE_LVAL (value) == lval_register);
-@@ -882,7 +882,7 @@ read_frame_register_value (struct value *value, struct frame_info *frame)
+@@ -880,7 +880,7 @@ read_frame_register_value (struct value *value, struct frame_info *frame)
   while (len > 0)
     {
       struct value *regval = get_frame_register_value (frame, regnum);
@ -2134,7 +2134,7 @@ diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
 diff --git a/gdb/language.c b/gdb/language.c
 --- a/gdb/language.c
 +++ b/gdb/language.c
-@@ -766,7 +766,7 @@ unk_lang_printchar (int c, struct type *type, struct ui_file *stream)
+@@ -765,7 +765,7 @@ unk_lang_printchar (int c, struct type *type, struct ui_file *stream)
 static void
 unk_lang_printstr (struct ui_file *stream, struct type *type,
@ -2143,7 +2143,7 @@ diff --git a/gdb/language.c b/gdb/language.c
 		   const char *encoding, int force_ellipses,
 		   const struct value_print_options *options)
 {
-@@ -785,7 +785,7 @@ unk_lang_print_type (struct type *type, const char *varstring,
+@@ -784,7 +784,7 @@ unk_lang_print_type (struct type *type, const char *varstring,
 static void
 unk_lang_val_print (struct type *type,
@ -2577,7 +2577,7 @@ diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
 diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
 --- a/gdb/ppc-linux-nat.c
 +++ b/gdb/ppc-linux-nat.c
-@@ -1300,7 +1300,7 @@ ppc_linux_nat_target::can_use_hw_breakpoint (enum bptype type, int cnt, int ot)
+@@ -1716,7 +1716,7 @@ ppc_linux_nat_target::can_use_hw_breakpoint (enum bptype type, int cnt, int ot)
 }
 int
@ -2589,7 +2589,7 @@ diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
 diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
 --- a/gdb/ppc-linux-tdep.c
 +++ b/gdb/ppc-linux-tdep.c
-@@ -1705,7 +1705,7 @@ ppc_init_linux_record_tdep (struct linux_record_tdep *record_tdep,
+@@ -2265,7 +2265,7 @@ ppc_init_linux_record_tdep (struct linux_record_tdep *record_tdep,
 const struct floatformat **
 ppc_floatformat_for_type (struct gdbarch *gdbarch,
@ -2622,7 +2622,7 @@ diff --git a/gdb/printcmd.c b/gdb/printcmd.c
 diff --git a/gdb/procfs.c b/gdb/procfs.c
 --- a/gdb/procfs.c
 +++ b/gdb/procfs.c
-@@ -3367,7 +3367,7 @@ procfs_target::remove_watchpoint (CORE_ADDR addr, int len,
+@@ -3368,7 +3368,7 @@ procfs_target::remove_watchpoint (CORE_ADDR addr, int len,
 }
 int
@ -2634,7 +2634,7 @@ diff --git a/gdb/procfs.c b/gdb/procfs.c
 diff --git a/gdb/regcache.c b/gdb/regcache.c
 --- a/gdb/regcache.c
 +++ b/gdb/regcache.c
-@@ -795,7 +795,7 @@ regcache::cooked_write (int regnum, const gdb_byte *buf)
+@@ -792,7 +792,7 @@ regcache::cooked_write (int regnum, const gdb_byte *buf)
 /* See regcache.h.  */
 enum register_status
@ -2643,7 +2643,7 @@ diff --git a/gdb/regcache.c b/gdb/regcache.c
 			      gdb_byte *out, bool is_raw)
 {
   int reg_size = register_size (arch (), regnum);
-@@ -862,7 +862,7 @@ reg_buffer::raw_collect_part (int regnum, int offset, int len,
+@@ -859,7 +859,7 @@ reg_buffer::raw_collect_part (int regnum, int offset, int len,
 /* See regcache.h.  */
 enum register_status
@ -2652,7 +2652,7 @@ diff --git a/gdb/regcache.c b/gdb/regcache.c
 		      const gdb_byte *in, bool is_raw)
 {
   int reg_size = register_size (arch (), regnum);
-@@ -933,7 +933,7 @@ reg_buffer::raw_supply_part (int regnum, int offset, int len,
+@@ -930,7 +930,7 @@ reg_buffer::raw_supply_part (int regnum, int offset, int len,
 }
 enum register_status
@ -2661,7 +2661,7 @@ diff --git a/gdb/regcache.c b/gdb/regcache.c
 				  gdb_byte *buf)
 {
   assert_regnum (regnum);
-@@ -943,7 +943,7 @@ readable_regcache::raw_read_part (int regnum, int offset, int len,
+@@ -940,7 +940,7 @@ readable_regcache::raw_read_part (int regnum, int offset, int len,
 /* See regcache.h.  */
 void
@ -2670,7 +2670,7 @@ diff --git a/gdb/regcache.c b/gdb/regcache.c
 			  const gdb_byte *buf)
 {
   assert_regnum (regnum);
-@@ -953,7 +953,7 @@ regcache::raw_write_part (int regnum, int offset, int len,
+@@ -950,7 +950,7 @@ regcache::raw_write_part (int regnum, int offset, int len,
 /* See regcache.h.  */
 enum register_status
@ -2679,7 +2679,7 @@ diff --git a/gdb/regcache.c b/gdb/regcache.c
 				     gdb_byte *buf)
 {
   gdb_assert (regnum >= 0 && regnum < m_descr->nr_cooked_registers);
-@@ -963,7 +963,7 @@ readable_regcache::cooked_read_part (int regnum, int offset, int len,
+@@ -960,7 +960,7 @@ readable_regcache::cooked_read_part (int regnum, int offset, int len,
 /* See regcache.h.  */
 void
@ -2825,7 +2825,7 @@ diff --git a/gdb/spu-multiarch.c b/gdb/spu-multiarch.c
 diff --git a/gdb/stack.c b/gdb/stack.c
 --- a/gdb/stack.c
 +++ b/gdb/stack.c
-@@ -192,7 +192,7 @@ print_stack_frame (struct frame_info *frame, int print_level,
+@@ -194,7 +194,7 @@ print_stack_frame (struct frame_info *frame, int print_level,
    argument (not just the first nameless argument).  */
 static void
@ -2834,7 +2834,7 @@ diff --git a/gdb/stack.c b/gdb/stack.c
 			   int first, struct ui_file *stream)
 {
   struct gdbarch *gdbarch = get_frame_arch (frame);
-@@ -542,7 +542,7 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
+@@ -544,7 +544,7 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
   /* Offset of next stack argument beyond the one we have seen that is
      at the highest offset, or -1 if we haven't come to a stack
      argument yet.  */
@ -2843,7 +2843,7 @@ diff --git a/gdb/stack.c b/gdb/stack.c
   /* Number of ints of arguments that we have printed so far.  */
   int args_printed = 0;
   /* True if we should print arguments, false otherwise.  */
-@@ -571,8 +571,8 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
+@@ -573,8 +573,8 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
 	    case LOC_ARG:
 	    case LOC_REF_ARG:
 	      {
@ -2854,7 +2854,7 @@ diff --git a/gdb/stack.c b/gdb/stack.c
 		/* Compute address of next argument by adding the size of
 		   this argument and rounding to an int boundary.  */
-@@ -707,7 +707,7 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
+@@ -709,7 +709,7 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
      enough about the stack to find them.  */
   if (num != -1)
     {
@ -2946,7 +2946,7 @@ diff --git a/gdb/target.c b/gdb/target.c
 static void default_rcmd (struct target_ops *, const char *, struct ui_file *);
-@@ -3184,7 +3184,7 @@ target_fileio_read_stralloc (struct inferior *inf, const char *filename)
+@@ -3190,7 +3190,7 @@ target_fileio_read_stralloc (struct inferior *inf, const char *filename)
 static int
 default_region_ok_for_hw_watchpoint (struct target_ops *self,
@ -3237,7 +3237,7 @@ diff --git a/gdb/valprint.c b/gdb/valprint.c
 		   struct ui_file *stream, int recurse,
 		   struct value *original_value,
 		   const struct value_print_options *options,
-@@ -1773,7 +1773,7 @@ print_decimal_chars (struct ui_file *stream, const gdb_byte *valaddr,
+@@ -1774,7 +1774,7 @@ print_decimal_chars (struct ui_file *stream, const gdb_byte *valaddr,
 void
 print_hex_chars (struct ui_file *stream, const gdb_byte *valaddr,
@ -3246,7 +3246,7 @@ diff --git a/gdb/valprint.c b/gdb/valprint.c
 		 bool zero_pad)
 {
   const gdb_byte *p;
-@@ -1926,17 +1926,17 @@ val_print_array_elements (struct type *type,
+@@ -1927,17 +1927,17 @@ val_print_array_elements (struct type *type,
 			  int recurse,
 			  struct value *val,
 			  const struct value_print_options *options,
@ -3269,7 +3269,7 @@ diff --git a/gdb/valprint.c b/gdb/valprint.c
   LONGEST low_bound, high_bound;
   LONGEST low_pos, high_pos;
-@@ -2026,7 +2026,7 @@ val_print_array_elements (struct type *type,
+@@ -2027,7 +2027,7 @@ val_print_array_elements (struct type *type,
 		     address, stream, recurse + 1, val, options,
 		     current_language);
 	  annotate_elt_rep (reps);
@ -3278,7 +3278,7 @@ diff --git a/gdb/valprint.c b/gdb/valprint.c
 	  annotate_elt_rep_end ();
 	  i = rep1 - 1;
-@@ -2668,7 +2668,7 @@ print_converted_chars_to_obstack (struct obstack *obstack,
+@@ -2669,7 +2669,7 @@ print_converted_chars_to_obstack (struct obstack *obstack,
 void
 generic_printstr (struct ui_file *stream, struct type *type, 
--- a/gdb-rhbz795424-bitpos-21of25.patch
+++ b/gdb-rhbz795424-bitpos-21of25.patch
@ -90,7 +90,7 @@ diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
 diff --git a/gdb/defs.h b/gdb/defs.h
 --- a/gdb/defs.h
 +++ b/gdb/defs.h
-@@ -668,4 +668,6 @@ DEF_ENUM_FLAGS_TYPE (enum user_selected_what_flag, user_selected_what);
+@@ -669,4 +669,6 @@ DEF_ENUM_FLAGS_TYPE (enum user_selected_what_flag, user_selected_what);
 #include "utils.h"
--- a/gdb-rhbz795424-bitpos-22of25.patch
+++ b/gdb-rhbz795424-bitpos-22of25.patch
@ -278,7 +278,7 @@ diff --git a/gdb/nat/aarch64-linux-hw-point.h b/gdb/nat/aarch64-linux-hw-point.h
 diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
 --- a/gdb/ppc-linux-nat.c
 +++ b/gdb/ppc-linux-nat.c
-@@ -282,7 +282,7 @@ struct ppc_linux_nat_target final : public linux_nat_target
+@@ -284,7 +284,7 @@ struct ppc_linux_nat_target final : public linux_nat_target
   int remove_hw_breakpoint (struct gdbarch *, struct bp_target_info *)
     override;
@ -287,7 +287,7 @@ diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
   int insert_watchpoint (CORE_ADDR, int, enum target_hw_bp_type,
 			 struct expression *) override;
-@@ -300,9 +300,9 @@ struct ppc_linux_nat_target final : public linux_nat_target
+@@ -302,9 +302,9 @@ struct ppc_linux_nat_target final : public linux_nat_target
   bool stopped_data_address (CORE_ADDR *) override;
@ -299,7 +299,7 @@ diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
     override;
   int masked_watch_num_registers (CORE_ADDR, CORE_ADDR) override;
-@@ -1649,11 +1649,11 @@ can_use_watchpoint_cond_accel (void)
+@@ -2065,11 +2065,11 @@ can_use_watchpoint_cond_accel (void)
    CONDITION_VALUE will hold the value which should be put in the
    DVC register.  */
 static void
@ -314,7 +314,7 @@ diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
   CORE_ADDR addr_end_data, addr_end_dvc;
   /* The DVC register compares bytes within fixed-length windows which
-@@ -1741,7 +1741,7 @@ num_memory_accesses (const std::vector<value_ref_ptr> &chain)
+@@ -2157,7 +2157,7 @@ num_memory_accesses (const std::vector<value_ref_ptr> &chain)
    of the constant.  */
 static int
 check_condition (CORE_ADDR watch_addr, struct expression *cond,
@ -323,7 +323,7 @@ diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
 {
   int pc = 1, num_accesses_left, num_accesses_right;
   struct value *left_val, *right_val;
-@@ -1792,7 +1792,8 @@ check_condition (CORE_ADDR watch_addr, struct expression *cond,
+@@ -2208,7 +2208,8 @@ check_condition (CORE_ADDR watch_addr, struct expression *cond,
    the condition expression, thus only triggering the watchpoint when it is
    true.  */
 bool
@ -333,7 +333,7 @@ diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
 						      int rw,
 						      struct expression *cond)
 {
-@@ -1810,7 +1811,7 @@ ppc_linux_nat_target::can_accel_watchpoint_condition (CORE_ADDR addr, int len,
+@@ -2226,7 +2227,7 @@ ppc_linux_nat_target::can_accel_watchpoint_condition (CORE_ADDR addr, int len,
 static void
 create_watchpoint_request (struct ppc_hw_breakpoint *p, CORE_ADDR addr,
@ -342,7 +342,7 @@ diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
 			   struct expression *cond, int insert)
 {
   if (len == 1
-@@ -2076,7 +2077,7 @@ ppc_linux_nat_target::stopped_by_watchpoint ()
+@@ -2492,7 +2493,7 @@ ppc_linux_nat_target::stopped_by_watchpoint ()
 bool
 ppc_linux_nat_target::watchpoint_addr_within_range (CORE_ADDR addr,
 						    CORE_ADDR start,
@ -354,7 +354,7 @@ diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
 diff --git a/gdb/procfs.c b/gdb/procfs.c
 --- a/gdb/procfs.c
 +++ b/gdb/procfs.c
-@@ -1540,7 +1540,7 @@ procfs_address_to_host_pointer (CORE_ADDR addr)
+@@ -1541,7 +1541,7 @@ procfs_address_to_host_pointer (CORE_ADDR addr)
 }
 static int
@ -363,7 +363,7 @@ diff --git a/gdb/procfs.c b/gdb/procfs.c
 {
   struct {
     procfs_ctl_t cmd;
-@@ -3231,7 +3231,7 @@ procfs_target::pid_to_exec_file (int pid)
+@@ -3232,7 +3232,7 @@ procfs_target::pid_to_exec_file (int pid)
 /* Insert a watchpoint.  */
 static int
@ -526,7 +526,7 @@ diff --git a/gdb/target.c b/gdb/target.c
 static int default_region_ok_for_hw_watchpoint (struct target_ops *,
 						CORE_ADDR, LONGEST);
-@@ -3192,7 +3192,7 @@ default_region_ok_for_hw_watchpoint (struct target_ops *self,
+@@ -3198,7 +3198,7 @@ default_region_ok_for_hw_watchpoint (struct target_ops *self,
 static int
 default_watchpoint_addr_within_range (struct target_ops *target,
 				      CORE_ADDR addr,
--- a/gdb-rhbz795424-bitpos-23of25.patch
+++ b/gdb-rhbz795424-bitpos-23of25.patch
@ -192,7 +192,7 @@ diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
 diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
 --- a/gdb/amd64-tdep.c
 +++ b/gdb/amd64-tdep.c
-@@ -878,8 +878,8 @@ amd64_push_arguments (struct regcache *regcache, int nargs,
+@@ -883,8 +883,8 @@ amd64_push_arguments (struct regcache *regcache, int nargs,
   };
   struct value **stack_args = XALLOCAVEC (struct value *, nargs);
   int num_stack_args = 0;
@ -203,7 +203,7 @@ diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
   int integer_reg = 0;
   int sse_reg = 0;
   int i;
-@@ -891,7 +891,7 @@ amd64_push_arguments (struct regcache *regcache, int nargs,
+@@ -896,7 +896,7 @@ amd64_push_arguments (struct regcache *regcache, int nargs,
   for (i = 0; i < nargs; i++)
     {
       struct type *type = value_type (args[i]);
@ -212,7 +212,7 @@ diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
       enum amd64_reg_class theclass[2];
       int needed_integer_regs = 0;
       int needed_sse_regs = 0;
-@@ -955,7 +955,7 @@ amd64_push_arguments (struct regcache *regcache, int nargs,
+@@ -960,7 +960,7 @@ amd64_push_arguments (struct regcache *regcache, int nargs,
 	      gdb_assert (regnum != -1);
 	      memset (buf, 0, sizeof buf);
@ -236,7 +236,7 @@ diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
 diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
 --- a/gdb/arm-tdep.c
 +++ b/gdb/arm-tdep.c
-@@ -3468,7 +3468,7 @@ arm_vfp_cprc_reg_char (enum arm_vfp_cprc_base_type b)
+@@ -3472,7 +3472,7 @@ arm_vfp_cprc_reg_char (enum arm_vfp_cprc_base_type b)
    array).  Vector types are not currently supported, matching the
    generic AAPCS support.  */
@ -245,7 +245,7 @@ diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
 arm_vfp_cprc_sub_candidate (struct type *t,
 			    enum arm_vfp_cprc_base_type *base_type)
 {
-@@ -3551,7 +3551,7 @@ arm_vfp_cprc_sub_candidate (struct type *t,
+@@ -3555,7 +3555,7 @@ arm_vfp_cprc_sub_candidate (struct type *t,
 	  }
 	else
 	  {
@ -254,7 +254,7 @@ diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
 	    unsigned unitlen;
 	    count = arm_vfp_cprc_sub_candidate (TYPE_TARGET_TYPE (t),
-@@ -3574,12 +3574,12 @@ arm_vfp_cprc_sub_candidate (struct type *t,
+@@ -3578,12 +3578,12 @@ arm_vfp_cprc_sub_candidate (struct type *t,
     case TYPE_CODE_STRUCT:
       {
@ -269,7 +269,7 @@ diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
 	    if (!field_is_static (&TYPE_FIELD (t, i)))
 	      sub_count = arm_vfp_cprc_sub_candidate (TYPE_FIELD_TYPE (t, i),
-@@ -3603,13 +3603,15 @@ arm_vfp_cprc_sub_candidate (struct type *t,
+@@ -3607,13 +3607,15 @@ arm_vfp_cprc_sub_candidate (struct type *t,
     case TYPE_CODE_UNION:
       {
@ -288,7 +288,7 @@ diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
 	    if (sub_count == -1)
 	      return -1;
 	    count = (count > sub_count ? count : sub_count);
-@@ -3645,7 +3647,7 @@ arm_vfp_call_candidate (struct type *t, enum arm_vfp_cprc_base_type *base_type,
+@@ -3649,7 +3651,7 @@ arm_vfp_call_candidate (struct type *t, enum arm_vfp_cprc_base_type *base_type,
 			int *count)
 {
   enum arm_vfp_cprc_base_type b = VFP_CPRC_UNKNOWN;
@ -297,7 +297,7 @@ diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
   if (c <= 0 || c > 4)
     return 0;
   *base_type = b;
-@@ -3726,7 +3728,7 @@ arm_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
+@@ -3730,7 +3732,7 @@ arm_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
   for (argnum = 0; argnum < nargs; argnum++)
     {
@ -905,7 +905,7 @@ diff --git a/gdb/rl78-tdep.c b/gdb/rl78-tdep.c
 diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c
 --- a/gdb/rs6000-aix-tdep.c
 +++ b/gdb/rs6000-aix-tdep.c
-@@ -177,9 +177,9 @@ rs6000_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
+@@ -290,9 +290,9 @@ rs6000_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   int ii;
@ -917,7 +917,7 @@ diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c
   gdb_byte tmp_buffer[50];
   int f_argno = 0;		/* current floating point argno */
   int wordsize = gdbarch_tdep (gdbarch)->wordsize;
-@@ -307,7 +307,7 @@ ran_out_of_registers_for_arguments:
+@@ -420,7 +420,7 @@ ran_out_of_registers_for_arguments:
   if ((argno < nargs) || argbytes)
     {
@ -1171,7 +1171,7 @@ diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
 diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -1625,8 +1625,7 @@ xtensa_store_return_value (struct type *type,
+@@ -1615,8 +1615,7 @@ xtensa_store_return_value (struct type *type,
       if (len > (callsize > 8 ? 8 : 16))
 	internal_error (__FILE__, __LINE__,
@ -1181,7 +1181,7 @@ diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
       areg = arreg_number (gdbarch,
 			   gdbarch_tdep (gdbarch)->a0_base + 2 + callsize, wb);
-@@ -1699,18 +1698,19 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
+@@ -1689,18 +1688,19 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
 			CORE_ADDR struct_addr)
 {
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -1204,7 +1204,7 @@ diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
       int regno;		/* regno if in register.  */
     } u;
   };
-@@ -1733,9 +1733,10 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
+@@ -1723,9 +1723,10 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
         {
 	  struct value *arg = args[i];
 	  struct type *arg_type = check_typedef (value_type (arg));
@ -1218,7 +1218,7 @@ diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
 	  switch (TYPE_CODE (arg_type))
 	    {
 	    case TYPE_CODE_INT:
-@@ -1804,8 +1805,8 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
+@@ -1794,8 +1795,8 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
 	  info->align = TYPE_LENGTH (builtin_type (gdbarch)->builtin_long);
 	  break;
 	}
@ -1228,7 +1228,7 @@ diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
       /* Align size and onstack_size.  */
       size = (size + info->align - 1) & ~(info->align - 1);
-@@ -1850,7 +1851,7 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
+@@ -1840,7 +1841,7 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
       if (info->onstack)
 	{
@ -1237,7 +1237,7 @@ diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
 	  CORE_ADDR offset = sp + info->u.offset;
 	  /* Odd-sized structs are aligned to the lower side of a memory
-@@ -1866,7 +1867,7 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
+@@ -1856,7 +1857,7 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
 	}
       else
 	{
--- a/gdb-vla-intel-fortran-strides.patch
+++ b/gdb-vla-intel-fortran-strides.patch
@ -143,7 +143,7 @@ diff --git a/gdb/dwarf2loc.h b/gdb/dwarf2loc.h
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -17720,7 +17720,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17752,7 +17752,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
   struct type *base_type, *orig_base_type;
   struct type *range_type;
   struct attribute *attr;
@ -152,7 +152,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
   int low_default_is_valid;
   int high_bound_is_count = 0;
   const char *name;
-@@ -17740,7 +17740,9 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17772,7 +17772,9 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
   low.kind = PROP_CONST;
   high.kind = PROP_CONST;
@ -162,7 +162,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
   /* Set LOW_DEFAULT_IS_VALID if current language and DWARF version allow
      omitting DW_AT_lower_bound.  */
-@@ -17773,6 +17775,14 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17805,6 +17807,14 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
       break;
     }
@ -177,7 +177,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
   attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
   if (attr)
     attr_to_dynamic_prop (attr, die, cu, &low);
-@@ -17865,7 +17875,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17897,7 +17907,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
       && !TYPE_UNSIGNED (base_type) && (high.data.const_val & negative_mask))
     high.data.const_val |= negative_mask;
@ -553,7 +553,7 @@ diff --git a/gdb/eval.c b/gdb/eval.c
 struct value *
 evaluate_subexp_standard (struct type *expect_type,
 			  struct expression *exp, int *pos,
-@@ -1946,33 +2228,8 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -1945,33 +2227,8 @@ evaluate_subexp_standard (struct type *expect_type,
       switch (code)
 	{
 	case TYPE_CODE_ARRAY:
@ -588,7 +588,7 @@ diff --git a/gdb/eval.c b/gdb/eval.c
 	case TYPE_CODE_PTR:
 	case TYPE_CODE_FUNC:
-@@ -2369,49 +2626,6 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -2368,49 +2625,6 @@ evaluate_subexp_standard (struct type *expect_type,
 	}
       return (arg1);
@ -638,7 +638,7 @@ diff --git a/gdb/eval.c b/gdb/eval.c
     case BINOP_LOGICAL_AND:
       arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
       if (noside == EVAL_SKIP)
-@@ -3331,6 +3545,9 @@ calc_f77_array_dims (struct type *array_type)
+@@ -3330,6 +3544,9 @@ calc_f77_array_dims (struct type *array_type)
   int ndimen = 1;
   struct type *tmp_type;
--- a/gdb-vla-intel-fortran-vla-strings.patch
+++ b/gdb-vla-intel-fortran-vla-strings.patch
@ -33,7 +33,7 @@ git diff --stat -p gdb/master...gdb/users/bheckel/fortran-vla-strings
 diff --git a/gdb/NEWS b/gdb/NEWS
 --- a/gdb/NEWS
 +++ b/gdb/NEWS
-@@ -239,6 +239,8 @@ SH-5/SH64 running OpenBSD 	SH-5/SH64 support in sh*-*-openbsd*
+@@ -265,6 +265,8 @@ SH-5/SH64 running OpenBSD 	SH-5/SH64 support in sh*-*-openbsd*
 *** Changes in GDB 8.1
@ -77,7 +77,7 @@ diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -1800,7 +1800,8 @@ static void read_signatured_type (struct signatured_type *);
+@@ -1801,7 +1801,8 @@ static void read_signatured_type (struct signatured_type *);
 static int attr_to_dynamic_prop (const struct attribute *attr,
 				 struct die_info *die, struct dwarf2_cu *cu,
@ -87,7 +87,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 /* memory allocation interface */
-@@ -13748,7 +13749,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -13757,7 +13758,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
     {
       newobj->static_link
 	= XOBNEW (&objfile->objfile_obstack, struct dynamic_prop);
@ -96,7 +96,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
     }
   cu->list_in_scope = cu->builder->get_local_symbols ();
-@@ -16483,7 +16484,8 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -16495,7 +16496,8 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
       byte_stride_prop
 	= (struct dynamic_prop *) alloca (sizeof (struct dynamic_prop));
@ -106,7 +106,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
       if (!stride_ok)
 	{
 	  complaint (_("unable to read array DW_AT_byte_stride "
-@@ -17244,29 +17246,90 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17256,29 +17258,90 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
   struct gdbarch *gdbarch = get_objfile_arch (objfile);
   struct type *type, *range_type, *index_type, *char_type;
   struct attribute *attr;
@ -208,7 +208,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
   char_type = language_string_char_type (cu->language_defn, gdbarch);
   type = create_string_type (NULL, char_type, range_type);
-@@ -17614,7 +17677,8 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17646,7 +17709,8 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu)
 static int
 attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
@ -218,7 +218,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 {
   struct dwarf2_property_baton *baton;
   struct obstack *obstack
-@@ -17625,14 +17689,33 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
+@@ -17657,14 +17721,33 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
   if (attr_form_is_block (attr))
     {
@ -256,7 +256,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
     }
   else if (attr_form_is_ref (attr))
     {
-@@ -17665,8 +17748,28 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
+@@ -17697,8 +17780,28 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
 		baton = XOBNEW (obstack, struct dwarf2_property_baton);
 		baton->referenced_type = die_type (target_die, target_cu);
 		baton->locexpr.per_cu = cu->per_cu;
@ -287,7 +287,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 		prop->data.baton = baton;
 		prop->kind = PROP_LOCEXPR;
 		gdb_assert (prop->data.baton != NULL);
-@@ -17777,7 +17880,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17809,7 +17912,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
   attr = dwarf2_attr (die, DW_AT_byte_stride, cu);
   if (attr)
@ -296,7 +296,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
         complaint (_("Missing DW_AT_byte_stride "
 		     "- DIE at 0x%s [in module %s]"),
 		   sect_offset_str (die->sect_off),
-@@ -17785,7 +17888,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17817,7 +17920,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
   attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
   if (attr)
@ -305,7 +305,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
   else if (!low_default_is_valid)
     complaint (_("Missing DW_AT_lower_bound "
 				      "- DIE at %s [in module %s]"),
-@@ -17794,10 +17897,10 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17826,10 +17929,10 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
   struct attribute *attr_ub, *attr_count;
   attr = attr_ub = dwarf2_attr (die, DW_AT_upper_bound, cu);
@ -318,7 +318,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 	{
 	  /* If bounds are constant do the final calculation here.  */
 	  if (low.kind == PROP_CONST && high.kind == PROP_CONST)
-@@ -25353,7 +25456,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -25386,7 +25489,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
   attr = dwarf2_attr (die, DW_AT_allocated, cu);
   if (attr_form_is_block (attr))
     {
@ -327,7 +327,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
         add_dyn_prop (DYN_PROP_ALLOCATED, prop, type);
     }
   else if (attr != NULL)
-@@ -25367,7 +25470,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -25400,7 +25503,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
   attr = dwarf2_attr (die, DW_AT_associated, cu);
   if (attr_form_is_block (attr))
     {
@ -336,7 +336,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
         add_dyn_prop (DYN_PROP_ASSOCIATED, prop, type);
     }
   else if (attr != NULL)
-@@ -25379,7 +25482,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -25412,7 +25515,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
   /* Read DW_AT_data_location and set in type.  */
   attr = dwarf2_attr (die, DW_AT_data_location, cu);
--- a/gdb.spec
+++ b/gdb.spec
@ -18,7 +18,7 @@
 Name: %{?scl_prefix}gdb
 # Freeze it when GDB gets branched
-%global snapsrc    20181016
+%global snapsrc    20181114
 # See timestamp of source gnulib installed into gdb/gnulib/ .
 %global snapgnulib 20161115
 %global tarname gdb-%{version}
@ -26,7 +26,7 @@ Version: 8.2.50.%{snapsrc}
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 7%{?dist}
+Release: 8%{?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
 Group: Development/Debuggers
@ -1028,6 +1028,12 @@ fi
 %endif
 %changelog
 * Wed Nov 14 2018 Sergio Durigan Junior <sergiodj@redhat.com> - 8.2.50.20181114-8.fc30
 - Rebase to FSF GDB 8.2.50.20181114 (8.3pre).
 - Drop gdb-6.3-ppc64syscall-20040622.patch.
 - Drop gdb-6.3-ppc64displaysymbol-20041124.patch.
 - Drop gdb-6.8-watchpoint-conditionals-test.patch.
 * Thu Oct 18 2018 Sergio Durigan Junior <sergiodj@redhat.com> - 8.2.50.20181016-7.fc30
 - Use "--enable-unit-tests" flag when compiling GDB.
--- a/2
+++ b/2
@ -1,3 +1,3 @@
 SHA512 (gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz) = a8b1c54dd348cfeb37da73f968742896be3dd13a4215f8d8519870c2abea915f5176c3fa6989ddd10f20020a16f0fab20cbae68ee8d58a82234d8778023520f8
 SHA512 (v2.0.tar.gz) = ec63151e842c81cc73ea11ba560b63e005cefbe19d98de24ae5c8caa4de7c9c1d71d1ec5b6214a347592eac675b75a3d2b26d4691ca86f91020ebfea8e912939
-SHA512 (gdb-8.2.50.20181016.tar.xz) = ebf7abc93e08121b4a5e40f860e99251ca138b7b79976d92e834c7f13856dbe736fb545f3617dc29e8b73174fe87e69e8f0f93940cab60d938d65107da941a54
+SHA512 (gdb-8.2.50.20181114.tar.xz) = e8af2d2889aad7c74ede7f6b0dd57de38b9a7a9acaf0433a48338b079388ae3aa84e0697d0fecc022113a07d0873d87e19a43f8d22177118f19b386c3fdbd30c
`@ -1 +1 @@`
	`d53eec4ef86cf85841ceaec7db99753827f2beee`	`dd9168931facd539a585b88d7b7c6c04c8c065c2`