Merge remote-tracking branch 'up/master' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>

.gitignore

@@ -1,4 +1,3 @@
 /gdb-libstdc++-v3-python-7.1.1-20170526.tar.xz
 /v1.6.1.tar.gz
-/gdb-8.1.tar.xz
+/gdb-8.1.50.20180629.tar.xz
-/gdb-8.1.50.20180522.tar.xz

README.local-patches

@@ -48,20 +48,16 @@ you can use "git rebase" whenever you want to reorder patch order, or
 even to delete a patch.
 
 2) When writing the commit log, you must obey a few rules.  The
-subject line can be anything, but the body *must* have the following
+subject line *must* be the filename of the patch.  This line will be
-special line:
+used when exporting the patches from the git repository, and
-
+(obviously) it gives the filename that should be used for this
-  FileName: name-of-the-patch.patch
+specific patch.
-
-This line will be used when exporting the patches from the git
-repository, and (obviously) it gives the filename that should be used
-for this specific patch.
 
 3) You can also add comments that will go into the auto-generated
 "Patch:" file (see below).  To do that, use the special marker ";;" at
 the beginning of the line.  This way, a commit log that says:
 
-  FileName: test-patch.patch
+  test-patch.patch
 
   ;; This is a test patch
   ;; Second line

_gdb.spec.Patch.include

@@ -325,186 +325,182 @@ Patch078: gdb-runtest-pie-override.patch
 #=push+jan
 Patch079: gdb-attach-fail-reasons-5of5.patch
 
-# Workaround crashes from stale frame_info pointer (BZ 804256).
-#=push+jan
-Patch080: gdb-stale-frame_info.patch
-
 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedora: Compatibility with RHELs (unchecked which ones).
-Patch081: gdb-glibc-strstr-workaround.patch
+Patch080: gdb-glibc-strstr-workaround.patch
 
 # Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789).
 #=fedoratest
-Patch082: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
+Patch081: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
 
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch083: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch082: 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
-Patch084: gdb-rhbz795424-bitpos-20of25.patch
+Patch083: gdb-rhbz795424-bitpos-20of25.patch
 
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch085: gdb-rhbz795424-bitpos-21of25.patch
+Patch084: gdb-rhbz795424-bitpos-21of25.patch
 
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch086: gdb-rhbz795424-bitpos-22of25.patch
+Patch085: gdb-rhbz795424-bitpos-22of25.patch
 
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch087: gdb-rhbz795424-bitpos-23of25.patch
+Patch086: gdb-rhbz795424-bitpos-23of25.patch
 
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch088: gdb-rhbz795424-bitpos-25of25.patch
+Patch087: gdb-rhbz795424-bitpos-25of25.patch
 
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch089: gdb-rhbz795424-bitpos-25of25-test.patch
+Patch088: gdb-rhbz795424-bitpos-25of25-test.patch
 
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch090: gdb-rhbz795424-bitpos-lazyvalue.patch
+Patch089: 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
-Patch091: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch090: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
 
 # Fix crash of -readnow /usr/lib/debug/usr/bin/gnatbind.debug (BZ 1069211).
 #=push+jan
-Patch092: gdb-gnat-dwarf-crash-3of3.patch
+Patch091: gdb-gnat-dwarf-crash-3of3.patch
 
 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch093: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch092: 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
-Patch094: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch093: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 
 #=fedoratest
-Patch095: gdb-archer-vla-tests.patch
+Patch094: gdb-archer-vla-tests.patch
 
 #=fedoratest
-Patch096: gdb-vla-intel-tests.patch
+Patch095: gdb-vla-intel-tests.patch
 
 # Continue backtrace even if a frame filter throws an exception (Phil Muldoon).
 #=push
-Patch097: gdb-btrobust.patch
+Patch096: gdb-btrobust.patch
 
 # Display Fortran strings in backtraces.
 #=fedoratest
-Patch098: gdb-fortran-frame-string.patch
+Patch097: gdb-fortran-frame-string.patch
 
 # Fix Python GIL with gdb.execute("continue") (Phil Muldoon, BZ 1116957).
 #=push
-Patch099: gdb-python-gil.patch
+Patch098: gdb-python-gil.patch
 
 # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 # crash.' (RH BZ 1156192).
 #=fedoratest
-Patch100: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch099: gdb-rhbz1156192-recursive-dlopen-test.patch
 
 # Fix jit-reader.h for multi-lib.
 #=push+jan
-Patch101: gdb-jit-reader-multilib.patch
+Patch100: gdb-jit-reader-multilib.patch
 
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch102: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch101: 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
-Patch103: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+Patch102: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
 
 # Test 'info type-printers' Python error (RH BZ 1350436).
 #=fedoratest
-Patch104: gdb-rhbz1350436-type-printers-error.patch
+Patch103: gdb-rhbz1350436-type-printers-error.patch
 
 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch105: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch104: 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
-Patch106: gdb-bz1219747-attach-kills.patch
+Patch105: gdb-bz1219747-attach-kills.patch
 
 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch107: gdb-fedora-libncursesw.patch
+Patch106: gdb-fedora-libncursesw.patch
 
 # Test clflushopt instruction decode (for RH BZ 1262471).
 #=fedoratest
-Patch108: gdb-opcodes-clflushopt-test.patch
+Patch107: gdb-opcodes-clflushopt-test.patch
 
 # [rhel6] DTS backward Python compatibility API (BZ 1020004, Phil Muldoon).
 #=fedora
-Patch109: gdb-dts-rhel6-python-compat.patch
+Patch108: gdb-dts-rhel6-python-compat.patch
 
 # [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
 #=push+jan
-Patch110: gdb-6.6-buildid-locate-rpm-scl.patch
+Patch109: gdb-6.6-buildid-locate-rpm-scl.patch
 
 # Work around readline-6.2 incompatibility not asking for --more-- (BZ 701131).
 #=fedora
-Patch111: gdb-readline62-ask-more-rh.patch
+Patch110: 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 .
-Patch112: gdb-6.8-quit-never-aborts.patch
+Patch111: gdb-6.8-quit-never-aborts.patch
 
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch113: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch112: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 
 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch114: gdb-container-rh-pkg.patch
+Patch113: gdb-container-rh-pkg.patch
 
 # New test for Python "Cannot locate object file for block" (for RH BZ 1325795).
 #=fedoratest
-Patch115: gdb-rhbz1325795-framefilters-test.patch
+Patch114: gdb-rhbz1325795-framefilters-test.patch
 
 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch116: gdb-linux_perf-bundle.patch
+Patch115: gdb-linux_perf-bundle.patch
 
 # Fix gdb-headless /usr/bin/ executables (BZ 1390251).
 #=fedora
-Patch117: gdb-libexec-add-index.patch
+Patch116: gdb-libexec-add-index.patch
 
 # New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
 #=fedoratest
-Patch118: gdb-rhbz1398387-tab-crash-test.patch
+Patch117: gdb-rhbz1398387-tab-crash-test.patch
 
 # [testsuite] Fix false selftest.exp FAIL from system readline-6.3+ (Patrick Palka).
 #=fedoratest
-Patch119: gdb-testsuite-readline63-sigint.patch
+Patch118: gdb-testsuite-readline63-sigint.patch
 
 # Python patches of: http://sourceware.org/gdb/wiki/ProjectArcher
 #=push
-Patch120: gdb-archer.patch
+Patch119: gdb-archer.patch
 
 # Revert upstream commit 469412dd9ccc4de5874fd3299b105833f36b34cd
-Patch121: gdb-vla-intel-fix-print-char-array.patch
+Patch120: gdb-vla-intel-fix-print-char-array.patch
 
 # [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
 # =fedoratest
-Patch122: gdb-rhbz1553104-s390x-arch12-test.patch
+Patch121: gdb-rhbz1553104-s390x-arch12-test.patch
 

_gdb.spec.patch.include

@@ -119,4 +119,3 @@
 %patch119 -p1
 %patch120 -p1
 %patch121 -p1
-%patch122 -p1

_git_upstream_commit

@@ -1 +1 @@
-75d74ccace05f6166a45dbaa352abf753891d3be
+fd1ae9058720aa2738cc4852647097dd89c2bb88

_patch_order

@@ -77,7 +77,6 @@ gdb-7.2.50-sparc-add-workaround-to-broken-debug-files.patch
 gdb-test-ivy-bridge.patch
 gdb-runtest-pie-override.patch
 gdb-attach-fail-reasons-5of5.patch
-gdb-stale-frame_info.patch
 gdb-glibc-strstr-workaround.patch
 gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
 gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch

gdb-6.3-attach-see-vdso-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-attach-see-vdso-test.patch
 
-FileName: gdb-6.3-attach-see-vdso-test.patch
-
 ;; Test kernel VDSO decoding while attaching to an i386 process.
 ;;=fedoratest
 

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

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-bz140532-ppc-unwinding-test.patch
 
-FileName: gdb-6.3-bz140532-ppc-unwinding-test.patch
-
 ;; Update PPC unwinding patches to their upstream variants (BZ 140532).
 ;;=fedoratest
 
@@ -306,7 +304,6 @@ new file mode 100644
 +    }
 +}
 diff --git a/gdb/testsuite/gdb.arch/powerpc-prologue.exp b/gdb/testsuite/gdb.arch/powerpc-prologue.exp
-index 5251dfa9c3..f3933e2295 100644
 --- a/gdb/testsuite/gdb.arch/powerpc-prologue.exp
 +++ b/gdb/testsuite/gdb.arch/powerpc-prologue.exp
 @@ -16,8 +16,9 @@

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

@@ -3,8 +3,6 @@ From: Jan Kratochvil <jan.kratochvil@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-bz202689-exec-from-pthread-test.patch
 
-FileName: gdb-6.3-bz202689-exec-from-pthread-test.patch
-
 ;; Testcase for exec() from threaded program (BZ 202689).
 ;;=fedoratest
 

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

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-focus-cmd-prev-test.patch
 
-FileName: gdb-6.3-focus-cmd-prev-test.patch
-
 ;; Test a crash on `focus cmd', `focus prev' commands.
 ;;=fedoratest
 

gdb-6.3-gstack-20050411.patch

@@ -3,8 +3,6 @@ From: Andrew Cagney <cagney@gnu.org>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-gstack-20050411.patch
 
-FileName: gdb-6.3-gstack-20050411.patch
-
 ;; Add a wrapper script to GDB that implements pstack using the
 ;; --readnever option.
 ;;=push
@@ -16,10 +14,9 @@ FileName: gdb-6.3-gstack-20050411.patch
 	* gstack.sh, gstack.1: New files.
 
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index 09a2ad2ca3..1ea7a36c69 100644
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
-@@ -1727,7 +1727,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
+@@ -1735,7 +1735,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
  install: all
  	@$(MAKE) $(FLAGS_TO_PASS) install-only
  
@@ -28,7 +25,7 @@ index 09a2ad2ca3..1ea7a36c69 100644
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e "$$t"` ; \
  		if test "x$$transformed_name" = x; then \
-@@ -1776,7 +1776,25 @@ install-guile:
+@@ -1784,7 +1784,25 @@ install-guile:
  install-python:
  	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_DATADIR)/python/gdb
  
@@ -55,7 +52,7 @@ index 09a2ad2ca3..1ea7a36c69 100644
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e $$t` ; \
  		if test "x$$transformed_name" = x; then \
-@@ -1799,6 +1817,18 @@ uninstall: force $(CONFIG_UNINSTALL)
+@@ -1807,6 +1825,18 @@ uninstall: force $(CONFIG_UNINSTALL)
  	fi
  	@$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
  

gdb-6.3-inferior-notification-20050721.patch

@@ -3,8 +3,6 @@ From: Jeff Johnston <jjohnstn@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-inferior-notification-20050721.patch
 
-FileName: gdb-6.3-inferior-notification-20050721.patch
-
 ;; Notify observers that the inferior has been created
 ;;=fedoratest
 

gdb-6.3-inheritancetest-20050726.patch

@@ -3,8 +3,6 @@ From: Jeff Johnston <jjohnstn@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-inheritancetest-20050726.patch
 
-FileName: gdb-6.3-inheritancetest-20050726.patch
-
 ;; Verify printing of inherited members test
 ;;=fedoratest
 

gdb-6.3-mapping-zero-inode-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-mapping-zero-inode-test.patch
 
-FileName: gdb-6.3-mapping-zero-inode-test.patch
-
 ;; Test GCORE for shmid 0 shared memory mappings.
 ;;=fedoratest: But it is broken anyway, sometimes the case being tested is not reproducible.
 

gdb-6.3-ppc64displaysymbol-20041124.patch

@@ -3,8 +3,6 @@ From: Andrew Cagney <cagney@gnu.org>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-ppc64displaysymbol-20041124.patch
 
-FileName: 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.
@@ -15,10 +13,9 @@ FileName: gdb-6.3-ppc64displaysymbol-20041124.patch
 	address.
 
 diff --git a/gdb/printcmd.c b/gdb/printcmd.c
-index 0dfea34753..82fe1db9a7 100644
 --- a/gdb/printcmd.c
 +++ b/gdb/printcmd.c
-@@ -600,6 +600,14 @@ build_address_symbolic (struct gdbarch *gdbarch,
+@@ -587,6 +587,14 @@ build_address_symbolic (struct gdbarch *gdbarch,
  	  addr = overlay_mapped_address (addr, section);
  	}
      }

gdb-6.3-ppc64syscall-20040622.patch

@@ -3,8 +3,6 @@ From: Andrew Cagney <cagney@gnu.org>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-ppc64syscall-20040622.patch
 
-FileName: gdb-6.3-ppc64syscall-20040622.patch
-
 ;; Better parse 64-bit PPC system call prologues.
 ;;=push: Write new testcase.
 
@@ -17,7 +15,6 @@ FileName: gdb-6.3-ppc64syscall-20040622.patch
 	"func_start".
 
 diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
-index c5b49c5f46..4d1a241cdf 100644
 --- a/gdb/rs6000-tdep.c
 +++ b/gdb/rs6000-tdep.c
 @@ -134,6 +134,7 @@ static const char *powerpc_vector_abi_string = "auto";
@@ -28,7 +25,7 @@ index c5b49c5f46..4d1a241cdf 100644
      int offset;			/* total size of frame --- the distance
  				   by which we decrement sp to allocate
  				   the frame */
-@@ -1610,7 +1611,6 @@ static CORE_ADDR
+@@ -1426,7 +1427,6 @@ static CORE_ADDR
  skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
  	       struct rs6000_framedata *fdata)
  {
@@ -36,7 +33,7 @@ index c5b49c5f46..4d1a241cdf 100644
    CORE_ADDR last_prologue_pc = pc;
    CORE_ADDR li_found_pc = 0;
    gdb_byte buf[4];
-@@ -1629,12 +1629,14 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
+@@ -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;
@@ -51,7 +48,7 @@ index c5b49c5f46..4d1a241cdf 100644
    fdata->saved_gpr = -1;
    fdata->saved_fpr = -1;
    fdata->saved_vr = -1;
-@@ -1668,6 +1670,55 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
+@@ -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);
  
@@ -107,7 +104,7 @@ index c5b49c5f46..4d1a241cdf 100644
        if ((op & 0xfc1fffff) == 0x7c0802a6)
  	{			/* mflr Rx */
  	  /* Since shared library / PIC code, which needs to get its
-@@ -1857,9 +1908,9 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
+@@ -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.  */

gdb-6.3-readnever-20050907.patch

@@ -3,8 +3,6 @@ From: Andrew Cagney <cagney@gnu.org>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-readnever-20050907.patch
 
-FileName: gdb-6.3-readnever-20050907.patch
-
 ;; Add readnever option
 ;;=push
 
@@ -24,7 +22,6 @@ FileName: gdb-6.3-readnever-20050907.patch
 Pushed upstream: https://sourceware.org/ml/gdb-cvs/2017-12/msg00007.html
 
 diff --git a/gdb/gcore.in b/gdb/gcore.in
-index 233c00d366..009e4181dd 100644
 --- a/gdb/gcore.in
 +++ b/gdb/gcore.in
 @@ -97,7 +97,7 @@ for pid in "$@"

gdb-6.3-rh-testversion-20041202.patch

@@ -1,10 +1,7 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Elena Zannoni <ezannoni@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb.gdb/selftest.exp: Add matching on specific Red Hat only version
+Subject: gdb-6.3-rh-testversion-20041202.patch
- string
-
-FileName: gdb-6.3-rh-testversion-20041202.patch
 
 ;; Match the Fedora's version info.
 ;;=fedora
@@ -15,7 +12,6 @@ FileName: gdb-6.3-rh-testversion-20041202.patch
         string.
 
 diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
-index 20f34983ef..4108e088a9 100644
 --- a/gdb/testsuite/gdb.gdb/selftest.exp
 +++ b/gdb/testsuite/gdb.gdb/selftest.exp
 @@ -53,6 +53,9 @@ proc test_with_self { } {

gdb-6.3-test-dtorfix-20050121.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-test-dtorfix-20050121.patch
 
-FileName: gdb-6.3-test-dtorfix-20050121.patch
-
 ;; Test support of multiple destructors just like multiple constructors
 ;;=fedoratest
 

gdb-6.3-test-movedir-20050125.patch

@@ -3,8 +3,6 @@ From: Elena Zannoni <ezannoni@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-test-movedir-20050125.patch
 
-FileName: gdb-6.3-test-movedir-20050125.patch
-
 ;; Fix to support executable moving
 ;;=fedoratest
 

gdb-6.3-test-pie-20050107.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-test-pie-20050107.patch
 
-FileName: gdb-6.3-test-pie-20050107.patch
-
 ;; VSYSCALL and PIE
 ;;=fedoratest
 

gdb-6.3-test-self-20050110.patch

@@ -3,8 +3,6 @@ From: Elena Zannoni <ezannoni@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-test-self-20050110.patch
 
-FileName: gdb-6.3-test-self-20050110.patch
-
 ;; Get selftest working with sep-debug-info
 ;;=fedoratest
 
@@ -17,10 +15,9 @@ FileName: gdb-6.3-test-self-20050110.patch
         * gdb.gdb/observer.exp: Ditto.
 
 diff --git a/gdb/testsuite/lib/selftest-support.exp b/gdb/testsuite/lib/selftest-support.exp
-index f7169e0955..3c06154192 100644
 --- a/gdb/testsuite/lib/selftest-support.exp
 +++ b/gdb/testsuite/lib/selftest-support.exp
-@@ -156,18 +156,18 @@ proc do_self_tests {function body} {
+@@ -151,18 +151,18 @@ proc do_self_tests {function body} {
      }
  
      # Remove any old copy lying around.

gdb-6.3-threaded-watchpoints2-20050225.patch

@@ -3,8 +3,6 @@ From: Jeff Johnston <jjohnstn@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.3-threaded-watchpoints2-20050225.patch
 
-FileName: gdb-6.3-threaded-watchpoints2-20050225.patch
-
 ;; Test sibling threads to set threaded watchpoints for x86 and x86-64
 ;;=fedoratest
 

gdb-6.5-BEA-testsuite.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-BEA-testsuite.patch
 
-FileName: gdb-6.5-BEA-testsuite.patch
-
 ;; Improved testsuite results by the testsuite provided by the courtesy of BEA.
 ;;=fedoratest: For upstream it should be rewritten as a dejagnu test, the test of no "??" was useful.
 

gdb-6.5-bz109921-DW_AT_decl_file-test.patch

@@ -3,8 +3,6 @@ From: Jan Kratochvil <jan.kratochvil@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
 
-FileName: gdb-6.5-bz109921-DW_AT_decl_file-test.patch
-
 ;; Find symbols properly at their original (included) file (BZ 109921).
 ;;=fedoratest
 

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

@@ -3,8 +3,6 @@ From: Jan Kratochvil <jan.kratochvil@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
 
-FileName: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
-
 ;; Support TLS symbols (+`errno' suggestion if no pthread is found) (BZ 185337).
 ;;=push+jan: It should be replaced by Infinity project.
 
@@ -44,10 +42,9 @@ glibc-debuginfo-2.7-2.x86_64: /usr/lib/debug/lib64/libc.so.6.debug:
   <81a8>     DW_AT_MIPS_linkage_name: (indirect string, offset: 0x2808): *__GI___errno_location
 
 diff --git a/gdb/printcmd.c b/gdb/printcmd.c
-index 82fe1db9a7..c921022a59 100644
 --- a/gdb/printcmd.c
 +++ b/gdb/printcmd.c
-@@ -1203,6 +1203,10 @@ print_command_1 (const char *exp, int voidprint)
+@@ -1190,6 +1190,10 @@ print_command_1 (const char *exp, int voidprint)
  
    if (exp && *exp)
      {

gdb-6.5-bz203661-emit-relocs.patch

@@ -3,16 +3,13 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-bz203661-emit-relocs.patch
 
-FileName: gdb-6.5-bz203661-emit-relocs.patch
-
 ;; Fix debuginfo addresses resolving for --emit-relocs Linux kernels (BZ 203661).
 ;;=push+jan: There was some mail thread about it, this patch may be a hack.
 
 diff --git a/gdb/symfile.c b/gdb/symfile.c
-index 7bc03fbb8f..661125dec5 100644
 --- a/gdb/symfile.c
 +++ b/gdb/symfile.c
-@@ -3492,6 +3492,12 @@ default_symfile_relocate (struct objfile *objfile, asection *sectp,
+@@ -3584,6 +3584,12 @@ default_symfile_relocate (struct objfile *objfile, asection *sectp,
       DWO file.  */
    bfd *abfd = sectp->owner;
  

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

@@ -3,8 +3,6 @@ From: Jan Kratochvil <jan.kratochvil@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-bz216711-clone-is-outermost.patch
 
-FileName: gdb-6.5-bz216711-clone-is-outermost.patch
-
 ;; Fix bogus 0x0 unwind of the thread's topmost function clone(3) (BZ 216711).
 ;;=fedora
 
@@ -34,7 +32,6 @@ instead.
 	Port to GDB-6.7.
 
 diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
-index 2bd3d31b75..2623bae42d 100644
 --- a/gdb/amd64-linux-tdep.c
 +++ b/gdb/amd64-linux-tdep.c
 @@ -291,6 +291,80 @@ amd64_linux_register_reggroup_p (struct gdbarch *gdbarch, int regnum,
@@ -128,10 +125,9 @@ index 2bd3d31b75..2623bae42d 100644
    set_gdbarch_write_pc (gdbarch, amd64_linux_write_pc);
  
 diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
-index d555465c2f..186690af30 100644
 --- a/gdb/amd64-tdep.c
 +++ b/gdb/amd64-tdep.c
-@@ -2597,6 +2597,7 @@ amd64_frame_unwind_stop_reason (struct frame_info *this_frame,
+@@ -2595,6 +2595,7 @@ amd64_frame_unwind_stop_reason (struct frame_info *this_frame,
  {
    struct amd64_frame_cache *cache =
      amd64_frame_cache (this_frame, this_cache);
@@ -139,7 +135,7 @@ index d555465c2f..186690af30 100644
  
    if (!cache->base_p)
      return UNWIND_UNAVAILABLE;
-@@ -2605,6 +2606,10 @@ amd64_frame_unwind_stop_reason (struct frame_info *this_frame,
+@@ -2603,6 +2604,10 @@ amd64_frame_unwind_stop_reason (struct frame_info *this_frame,
    if (cache->base == 0)
      return UNWIND_OUTERMOST;
  
@@ -150,7 +146,7 @@ index d555465c2f..186690af30 100644
    return UNWIND_NO_REASON;
  }
  
-@@ -2739,6 +2744,7 @@ amd64_sigtramp_frame_this_id (struct frame_info *this_frame,
+@@ -2737,6 +2742,7 @@ amd64_sigtramp_frame_this_id (struct frame_info *this_frame,
  {
    struct amd64_frame_cache *cache =
      amd64_sigtramp_frame_cache (this_frame, this_cache);
@@ -158,7 +154,7 @@ index d555465c2f..186690af30 100644
  
    if (!cache->base_p)
      (*this_id) = frame_id_build_unavailable_stack (get_frame_pc (this_frame));
-@@ -2747,6 +2753,11 @@ amd64_sigtramp_frame_this_id (struct frame_info *this_frame,
+@@ -2745,6 +2751,11 @@ amd64_sigtramp_frame_this_id (struct frame_info *this_frame,
        /* This marks the outermost frame.  */
        return;
      }
@@ -171,10 +167,9 @@ index d555465c2f..186690af30 100644
      (*this_id) = frame_id_build (cache->base + 16, get_frame_pc (this_frame));
  }
 diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
-index 646f305edc..a0e872c01f 100644
 --- a/gdb/i386-tdep.c
 +++ b/gdb/i386-tdep.c
-@@ -8428,6 +8428,9 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
+@@ -8404,6 +8404,9 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
  
    tdep->xsave_xcr0_offset = -1;
  
@@ -185,7 +180,6 @@ index 646f305edc..a0e872c01f 100644
  
    set_gdbarch_type_align (gdbarch, i386_type_align);
 diff --git a/gdb/i386-tdep.h b/gdb/i386-tdep.h
-index 81a93f11af..461ae06258 100644
 --- a/gdb/i386-tdep.h
 +++ b/gdb/i386-tdep.h
 @@ -251,6 +251,9 @@ struct gdbarch_tdep

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

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
 
-FileName: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
-
 ;; Test sideeffects of skipping ppc .so libs trampolines (BZ 218379).
 ;;=fedoratest
 

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

@@ -3,15 +3,12 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
 
-FileName: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
-
 ;; Fix lockup on trampoline vs. its function lookup; unreproducible (BZ 218379).
 ;;=fedora
 
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
 
 diff --git a/gdb/symtab.c b/gdb/symtab.c
-index e1f033d1d8..1d9e0b9180 100644
 --- a/gdb/symtab.c
 +++ b/gdb/symtab.c
 @@ -3165,6 +3165,13 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)

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

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-bz243845-stale-testing-zombie-test.patch
 
-FileName: gdb-6.5-bz243845-stale-testing-zombie-test.patch
-
 ;; Test leftover zombie process (BZ 243845).
 ;;=fedoratest
 

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

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-gcore-buffer-limit-test.patch
 
-FileName: gdb-6.5-gcore-buffer-limit-test.patch
-
 ;; Test gcore memory and time requirements for large inferiors.
 ;;=fedoratest
 

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

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-ia64-libunwind-leak-test.patch
 
-FileName: gdb-6.5-ia64-libunwind-leak-test.patch
-
 ;; Test ia64 memory leaks of the code using libunwind.
 ;;=fedoratest
 

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

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-last-address-space-byte-test.patch
 
-FileName: gdb-6.5-last-address-space-byte-test.patch
-
 ;; Testcase for deadlocking on last address space byte; for corrupted backtraces.
 ;;=fedoratest
 

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

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-missed-trap-on-step-test.patch
 
-FileName: gdb-6.5-missed-trap-on-step-test.patch
-
 ;; Test hiding unexpected breakpoints on intentional step commands.
 ;;=fedoratest
 

gdb-6.5-readline-long-line-crash-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-readline-long-line-crash-test.patch
 
-FileName: gdb-6.5-readline-long-line-crash-test.patch
-
 ;; Fix readline segfault on excessively long hand-typed lines.
 ;;=fedoratest
 

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

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-section-num-fixup-test.patch
 
-FileName: gdb-6.5-section-num-fixup-test.patch
-
 ;; Test a crash on libraries missing the .text section.
 ;;=fedoratest
 

gdb-6.5-sharedlibrary-path.patch

@@ -3,8 +3,6 @@ From: Jan Kratochvil <jan.kratochvil@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.5-sharedlibrary-path.patch
 
-FileName: gdb-6.5-sharedlibrary-path.patch
-
 ;; Fix TLS symbols resolving for shared libraries with a relative pathname.
 ;; The testsuite needs `gdb-6.5-tls-of-separate-debuginfo.patch'.
 ;;=fedoratest: One should recheck if it is really fixed upstream.

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

@@ -1,9 +1,7 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: print a more useful error message for "gdb core"
+Subject: gdb-6.6-buildid-locate-core-as-arg.patch
-
-FileName: gdb-6.6-buildid-locate-core-as-arg.patch
 
 ;;=push+jan
 
@@ -64,7 +62,6 @@ Http://sourceware.org/ml/gdb-patches/2010-01/msg00517.html
 	user did "gdb core".
 
 diff --git a/gdb/common/common-exceptions.h b/gdb/common/common-exceptions.h
-index 15c85e28ab..9fe2375bce 100644
 --- a/gdb/common/common-exceptions.h
 +++ b/gdb/common/common-exceptions.h
 @@ -104,6 +104,9 @@ enum errors {
@@ -78,7 +75,6 @@ index 15c85e28ab..9fe2375bce 100644
    NR_ERRORS
  };
 diff --git a/gdb/exec.c b/gdb/exec.c
-index 3023ff7e5a..8308ec3d6f 100644
 --- a/gdb/exec.c
 +++ b/gdb/exec.c
 @@ -36,6 +36,7 @@
@@ -121,7 +117,6 @@ index 3023ff7e5a..8308ec3d6f 100644
  
        if (build_section_table (exec_bfd, &sections, &sections_end))
 diff --git a/gdb/main.c b/gdb/main.c
-index 189266f90e..4caefe2011 100644
 --- a/gdb/main.c
 +++ b/gdb/main.c
 @@ -447,6 +447,37 @@ struct cmdarg

gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch

@@ -4,8 +4,6 @@ Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: 
  gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 
-FileName: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
-
 ;; Fix 'gdb gives highly misleading error when debuginfo pkg is present,
 ;; but not corresponding binary pkg' (RH BZ 981154).
 ;;=push+jan
@@ -28,7 +26,6 @@ Comments by Sergio Durigan Junior <sergiodj@redhat.com>:
   valid and doesn't print the necessary warning ("Try: yum install ...").
 
 diff --git a/gdb/build-id.c b/gdb/build-id.c
-index 4e1477e950..5af9d66899 100644
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
 @@ -581,7 +581,10 @@ build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id,

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

@@ -3,13 +3,10 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 
-FileName: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
-
 ;; Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
 ;;=push+jan
 
 diff --git a/gdb/build-id.c b/gdb/build-id.c
-index 39e741cf58..4e1477e950 100644
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
 @@ -652,6 +652,19 @@ build_id_to_filename (const struct bfd_build_id *build_id, char **link_return)
@@ -33,7 +30,6 @@ index 39e741cf58..4e1477e950 100644
     and avoid their duplicities during a single inferior run.  */
  
 diff --git a/gdb/proc-service.list b/gdb/proc-service.list
-index 53f7ed8b1e..323f5e83c2 100644
 --- a/gdb/proc-service.list
 +++ b/gdb/proc-service.list
 @@ -37,4 +37,7 @@

gdb-6.6-buildid-locate-rpm-scl.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.6-buildid-locate-rpm-scl.patch
 
-FileName: gdb-6.6-buildid-locate-rpm-scl.patch
-
 ;; [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
 ;;=push+jan
 
@@ -12,7 +10,6 @@ warning: Skipping deprecated .gdb_index section
 https://bugzilla.redhat.com/show_bug.cgi?id=953585
 
 diff --git a/gdb/build-id.c b/gdb/build-id.c
-index 5af9d66899..2ff93191c7 100644
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
 @@ -689,7 +689,11 @@ static int missing_rpm_list_entries;
@@ -100,10 +97,9 @@ index 5af9d66899..2ff93191c7 100644
  {
    return strcoll (*ap, *bp);
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 328a07df82..45c22450b1 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -3478,6 +3478,16 @@ read_index_from_section (struct objfile *objfile,
+@@ -3469,6 +3469,16 @@ read_gdb_index_from_section (struct objfile *objfile,
       "set use-deprecated-index-sections on".  */
    if (version < 6 && !deprecated_ok)
      {
@@ -120,7 +116,7 @@ index 328a07df82..45c22450b1 100644
        static int warning_printed = 0;
        if (!warning_printed)
  	{
-@@ -3489,6 +3499,10 @@ to use the section anyway."),
+@@ -3480,6 +3490,10 @@ to use the section anyway."),
  	  warning_printed = 1;
  	}
        return 0;

gdb-6.6-buildid-locate-rpm.patch

@@ -3,15 +3,12 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.6-buildid-locate-rpm.patch
 
-FileName: gdb-6.6-buildid-locate-rpm.patch
-
 ;;=push+jan
 
 diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
-index e0d38ea267..da5ac313e3 100644
 --- a/gdb/aclocal.m4
 +++ b/gdb/aclocal.m4
-@@ -12,6 +12,221 @@
+@@ -11,7 +11,223 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
@@ -229,12 +226,13 @@ index e0d38ea267..da5ac313e3 100644
 +
 +AS_VAR_IF([$1], [""], [$5], [$4])dnl
 +])# PKG_CHECK_VAR
++
+ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 +
  # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
  
- # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ # Copyright (C) 2001-2017 Free Software Foundation, Inc.
 diff --git a/gdb/build-id.c b/gdb/build-id.c
-index 7b9cbca14e..39e741cf58 100644
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
 @@ -35,6 +35,8 @@
@@ -680,7 +678,6 @@ index 7b9cbca14e..39e741cf58 100644
  
  /* See build-id.h.  */
 diff --git a/gdb/config.in b/gdb/config.in
-index aa46f07410..404e0bbddc 100644
 --- a/gdb/config.in
 +++ b/gdb/config.in
 @@ -33,6 +33,9 @@
@@ -704,10 +701,9 @@ index aa46f07410..404e0bbddc 100644
  #undef HAVE_LIBUNWIND_IA64_H
  
 diff --git a/gdb/configure b/gdb/configure
-index 4186f7e160..30a6e86ff8 100755
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -716,6 +716,11 @@ PKGVERSION
+@@ -749,6 +749,11 @@ CODESIGN_CERT
  HAVE_NATIVE_GCORE_TARGET
  TARGET_OBS
  subdirs
@@ -719,7 +715,7 @@ index 4186f7e160..30a6e86ff8 100755
  GDB_DATADIR
  DEBUGDIR
  MAKEINFO_EXTRA_FLAGS
-@@ -820,6 +825,7 @@ with_gdb_datadir
+@@ -853,6 +858,7 @@ with_gdb_datadir
  with_relocated_sources
  with_auto_load_dir
  with_auto_load_safe_path
@@ -727,7 +723,7 @@ index 4186f7e160..30a6e86ff8 100755
  enable_targets
  enable_64_bit_bfd
  enable_gdbcli
-@@ -878,6 +884,11 @@ CCC
+@@ -912,6 +918,11 @@ CCC
  CPP
  MAKEINFO
  MAKEINFOFLAGS
@@ -739,7 +735,7 @@ index 4186f7e160..30a6e86ff8 100755
  YACC
  YFLAGS
  XMKMF'
-@@ -1548,6 +1559,8 @@ Optional Packages:
+@@ -1583,6 +1594,8 @@ Optional Packages:
                            [--with-auto-load-dir]
    --without-auto-load-safe-path
                            do not restrict auto-loaded files locations
@@ -748,7 +744,7 @@ index 4186f7e160..30a6e86ff8 100755
    --with-libunwind-ia64   use libunwind frame unwinding for ia64 targets
    --with-curses           use the curses library instead of the termcap
                            library
-@@ -1605,6 +1618,13 @@ Some influential environment variables:
+@@ -1640,6 +1653,13 @@ Some influential environment variables:
    MAKEINFO    Parent configure detects if it is of sufficient version.
    MAKEINFOFLAGS
                Parameters for MAKEINFO.
@@ -759,10 +755,10 @@ index 4186f7e160..30a6e86ff8 100755
 +              path overriding pkg-config's built-in search path
 +  RPM_CFLAGS  C compiler flags for RPM, overriding pkg-config
 +  RPM_LIBS    linker flags for RPM, overriding pkg-config
-   YACC        The `Yet Another C Compiler' implementation to use. Defaults to
+   YACC        The `Yet Another Compiler Compiler' implementation to use.
-               the first program found out of: `bison -y', `byacc', `yacc'.
+               Defaults to the first program found out of: `bison -y', `byacc',
-   YFLAGS      The list of arguments that will be passed by default to $YACC.
+               `yacc'.
-@@ -6492,6 +6512,494 @@ _ACEOF
+@@ -6575,6 +6595,494 @@ _ACEOF
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_auto_load_safe_path" >&5
  $as_echo "$with_auto_load_safe_path" >&6; }
  
@@ -1258,10 +1254,9 @@ index 4186f7e160..30a6e86ff8 100755
  
  subdirs="$subdirs testsuite"
 diff --git a/gdb/configure.ac b/gdb/configure.ac
-index e1f630cd38..39a777f647 100644
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -167,6 +167,199 @@ AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escape_dir,
+@@ -166,6 +166,199 @@ AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escape_dir,
  	      [Directories safe to hold auto-loaded files.])
  AC_MSG_RESULT([$with_auto_load_safe_path])
  
@@ -1462,10 +1457,9 @@ index e1f630cd38..39a777f647 100644
  
  # Check whether to support alternative target configurations
 diff --git a/gdb/corelow.c b/gdb/corelow.c
-index 76945950b9..4481128156 100644
 --- a/gdb/corelow.c
 +++ b/gdb/corelow.c
-@@ -368,7 +368,7 @@ build_id_locate_exec (int from_tty)
+@@ -366,7 +366,7 @@ build_id_locate_exec (int from_tty)
          symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
      }
    else
@@ -1475,7 +1469,6 @@ index 76945950b9..4481128156 100644
    do_cleanups (back_to);
  
 diff --git a/gdb/event-top.c b/gdb/event-top.c
-index 5852089f09..d9379b42c5 100644
 --- a/gdb/event-top.c
 +++ b/gdb/event-top.c
 @@ -40,6 +40,7 @@
@@ -1508,10 +1501,9 @@ index 5852089f09..d9379b42c5 100644
  }
  
 diff --git a/gdb/symfile.h b/gdb/symfile.h
-index dbd0370cf9..adcf1fdaae 100644
 --- a/gdb/symfile.h
 +++ b/gdb/symfile.h
-@@ -538,6 +538,8 @@ void map_symbol_filenames (symbol_filename_ftype *fun, void *data,
+@@ -540,6 +540,8 @@ void map_symbol_filenames (symbol_filename_ftype *fun, void *data,
  /* build-id support.  */
  extern struct bfd_build_id *build_id_addr_get (CORE_ADDR addr);
  extern void debug_print_missing (const char *binary, const char *debug);

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

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.6-buildid-locate-solib-missing-ids.patch
 
-FileName: gdb-6.6-buildid-locate-solib-missing-ids.patch
-
 ;; Fix loading of core files without build-ids but with build-ids in executables.
 ;; Load strictly build-id-checked core files only if no executable is specified
 ;; (Jan Kratochvil, RH BZ 1339862).
@@ -14,7 +12,6 @@ gdb returns an incorrect back trace when applying a debuginfo
 https://bugzilla.redhat.com/show_bug.cgi?id=1339862
 
 diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
-index aa95bc1ce6..9a7ef10963 100644
 --- a/gdb/solib-svr4.c
 +++ b/gdb/solib-svr4.c
 @@ -1358,14 +1358,27 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,

gdb-6.6-buildid-locate.patch

@@ -3,13 +3,10 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.6-buildid-locate.patch
 
-FileName: gdb-6.6-buildid-locate.patch
-
 ;; New locating of the matching binaries from the pure core file (build-id).
 ;;=push+jan
 
 diff --git a/gdb/build-id.c b/gdb/build-id.c
-index c8eacbd1e8..7b9cbca14e 100644
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
 @@ -26,11 +26,67 @@
@@ -833,7 +830,6 @@ index c8eacbd1e8..7b9cbca14e 100644
 +  gdb::observers::executable_changed.attach (debug_print_executable_changed);
 +}
 diff --git a/gdb/build-id.h b/gdb/build-id.h
-index 15fb609409..1f62db0239 100644
 --- a/gdb/build-id.h
 +++ b/gdb/build-id.h
 @@ -22,9 +22,10 @@
@@ -872,7 +868,6 @@ index 15fb609409..1f62db0239 100644
  
  #endif /* BUILD_ID_H */
 diff --git a/gdb/coffread.c b/gdb/coffread.c
-index f24ec0713a..5c1c3e61ea 100644
 --- a/gdb/coffread.c
 +++ b/gdb/coffread.c
 @@ -733,7 +733,8 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
@@ -886,7 +881,6 @@ index f24ec0713a..5c1c3e61ea 100644
        if (debugfile.empty ())
  	debugfile = find_separate_debug_file_by_debuglink (objfile);
 diff --git a/gdb/corelow.c b/gdb/corelow.c
-index c6175279da..76945950b9 100644
 --- a/gdb/corelow.c
 +++ b/gdb/corelow.c
 @@ -45,6 +45,10 @@
@@ -900,7 +894,7 @@ index c6175279da..76945950b9 100644
  
  #ifndef O_LARGEFILE
  #define O_LARGEFILE 0
-@@ -323,6 +327,54 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg)
+@@ -321,6 +325,54 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg)
      inferior_ptid = ptid;			/* Yes, make it current.  */
  }
  
@@ -918,7 +912,7 @@ index c6175279da..76945950b9 100644
 +  if (exec_bfd != NULL || symfile_objfile != NULL)
 +    return;
 +
-+  if (target_auxv_search (target_stack, AT_ENTRY, &at_entry) <= 0)
++  if (target_auxv_search (current_top_target (), AT_ENTRY, &at_entry) <= 0)
 +    return;
 +
 +  build_id = build_id_addr_get (at_entry);
@@ -955,8 +949,8 @@ index c6175279da..76945950b9 100644
  /* Issue a message saying we have no core to debug, if FROM_TTY.  */
  
  static void
-@@ -466,6 +518,14 @@ core_target_open (const char *arg, int from_tty)
+@@ -464,6 +516,14 @@ core_target_open (const char *arg, int from_tty)
- 	switch_to_thread (thread->ptid);
+ 	switch_to_thread (thread);
      }
  
 +  /* Find the build_id identifiers.  If it gets executed after
@@ -970,7 +964,7 @@ index c6175279da..76945950b9 100644
    post_create_inferior (target, from_tty);
  
    /* Now go through the target stack looking for threads since there
-@@ -1068,4 +1128,11 @@ void
+@@ -1066,4 +1126,11 @@ void
  _initialize_corelow (void)
  {
    add_target (core_target_info, core_target_open, filename_completer);
@@ -983,10 +977,9 @@ index c6175279da..76945950b9 100644
 +			   &setlist, &showlist);
  }
 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
-index 28f083f96e..403f5ca658 100644
 --- a/gdb/doc/gdb.texinfo
 +++ b/gdb/doc/gdb.texinfo
-@@ -19558,6 +19558,27 @@ information files.
+@@ -19570,6 +19570,27 @@ information files.
  
  @end table
  
@@ -1015,10 +1008,9 @@ index 28f083f96e..403f5ca658 100644
  @cindex debug link sections
  A debug link is a special section of the executable file named
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 4006f4a48f..266740f74c 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -2690,7 +2690,7 @@ dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile)
+@@ -2683,7 +2683,7 @@ dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile)
      }
  
    if (dwz_bfd == NULL)
@@ -1028,7 +1020,6 @@ index 4006f4a48f..266740f74c 100644
    if (dwz_bfd == NULL)
      error (_("could not find '.gnu_debugaltlink' file for %s"),
 diff --git a/gdb/elfread.c b/gdb/elfread.c
-index b4b4a1b24c..0824e37bf1 100644
 --- a/gdb/elfread.c
 +++ b/gdb/elfread.c
 @@ -1290,7 +1290,9 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
@@ -1054,7 +1045,6 @@ index b4b4a1b24c..0824e37bf1 100644
  }
  
 diff --git a/gdb/objfiles.h b/gdb/objfiles.h
-index 28e66eca36..5ab0e33fb6 100644
 --- a/gdb/objfiles.h
 +++ b/gdb/objfiles.h
 @@ -470,6 +470,10 @@ struct objfile
@@ -1069,7 +1059,6 @@ index 28e66eca36..5ab0e33fb6 100644
  
  extern struct gdbarch *get_objfile_arch (const struct objfile *);
 diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c
-index c2b40ff535..112cbf6560 100644
 --- a/gdb/python/py-objfile.c
 +++ b/gdb/python/py-objfile.c
 @@ -137,7 +137,7 @@ objfpy_get_build_id (PyObject *self, void *closure)
@@ -1091,7 +1080,6 @@ index c2b40ff535..112cbf6560 100644
  	continue;
        if (objfpy_build_id_matches (obfd_build_id, build_id))
 diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
-index f9936b36de..aa95bc1ce6 100644
 --- a/gdb/solib-svr4.c
 +++ b/gdb/solib-svr4.c
 @@ -45,6 +45,7 @@
@@ -1158,10 +1146,9 @@ index f9936b36de..aa95bc1ce6 100644
        /* If this entry has no name, or its name matches the name
  	 for the main executable, don't include it in the list.  */
 diff --git a/gdb/symfile.h b/gdb/symfile.h
-index d9185092ee..dbd0370cf9 100644
 --- a/gdb/symfile.h
 +++ b/gdb/symfile.h
-@@ -535,6 +535,10 @@ void expand_symtabs_matching
+@@ -537,6 +537,10 @@ void expand_symtabs_matching
  void map_symbol_filenames (symbol_filename_ftype *fun, void *data,
  			   int need_fullname);
  
@@ -1173,7 +1160,6 @@ index d9185092ee..dbd0370cf9 100644
  
  /* Names for a dwarf2 debugging section.  The field NORMAL is the normal
 diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp
-index 63a7fa8e5b..8a4fab77df 100644
 --- a/gdb/testsuite/gdb.base/corefile.exp
 +++ b/gdb/testsuite/gdb.base/corefile.exp
 @@ -311,3 +311,33 @@ gdb_test_multiple "core-file $corefile" $test {
@@ -1211,7 +1197,6 @@ index 63a7fa8e5b..8a4fab77df 100644
 +    pass $wholetest
 +}
 diff --git a/gdb/testsuite/gdb.base/new-ui-pending-input.exp b/gdb/testsuite/gdb.base/new-ui-pending-input.exp
-index a6dc14e3c9..54a10df155 100644
 --- a/gdb/testsuite/gdb.base/new-ui-pending-input.exp
 +++ b/gdb/testsuite/gdb.base/new-ui-pending-input.exp
 @@ -62,6 +62,7 @@ proc test_command_line_new_ui_pending_input {} {
@@ -1223,10 +1208,9 @@ index a6dc14e3c9..54a10df155 100644
      append options " -ex \"b $bpline\""
      append options " -ex \"run\""
 diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
-index 0f05d043f2..becda6a001 100644
 --- a/gdb/testsuite/lib/gdb.exp
 +++ b/gdb/testsuite/lib/gdb.exp
-@@ -1694,6 +1694,16 @@ proc default_gdb_start { } {
+@@ -1695,6 +1695,16 @@ proc default_gdb_start { } {
  	    warning "Couldn't set the width to 0."
  	}
      }
@@ -1244,7 +1228,6 @@ index 0f05d043f2..becda6a001 100644
  }
  
 diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
-index 851e490f4d..469ca592ab 100644
 --- a/gdb/testsuite/lib/mi-support.exp
 +++ b/gdb/testsuite/lib/mi-support.exp
 @@ -309,6 +309,16 @@ proc default_mi_gdb_start { args } {

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

@@ -3,8 +3,6 @@ From: Jan Kratochvil <jan.kratochvil@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.6-bz229517-gcore-without-terminal.patch
 
-FileName: gdb-6.6-bz229517-gcore-without-terminal.patch
-
 ;; Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
 ;;=fedoratest
 

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

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.6-bz230000-power6-disassembly-test.patch
 
-FileName: gdb-6.6-bz230000-power6-disassembly-test.patch
-
 ;; Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 ;;=fedoratest
 

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

@@ -3,8 +3,6 @@ From: Jan Kratochvil <jan.kratochvil@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
 
-FileName: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
-
 ;; Support for stepping over PPC atomic instruction sequences (BZ 237572).
 ;;=fedoratest
 

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

@@ -3,16 +3,13 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.6-scheduler_locking-step-is-default.patch
 
-FileName: gdb-6.6-scheduler_locking-step-is-default.patch
-
 ;; Make upstream `set scheduler-locking step' as default.
 ;;=push+jan: How much is scheduler-locking relevant after non-stop?
 
 diff --git a/gdb/infrun.c b/gdb/infrun.c
-index df19478ef3..78ffc10b23 100644
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
-@@ -2202,7 +2202,7 @@ static const char *const scheduler_enums[] = {
+@@ -2193,7 +2193,7 @@ static const char *const scheduler_enums[] = {
    schedlock_replay,
    NULL
  };
@@ -22,7 +19,6 @@ index df19478ef3..78ffc10b23 100644
  show_scheduler_mode (struct ui_file *file, int from_tty,
  		     struct cmd_list_element *c, const char *value)
 diff --git a/gdb/testsuite/gdb.mi/mi-cli.exp b/gdb/testsuite/gdb.mi/mi-cli.exp
-index 6ce6439eb7..4f405b5fc1 100644
 --- a/gdb/testsuite/gdb.mi/mi-cli.exp
 +++ b/gdb/testsuite/gdb.mi/mi-cli.exp
 @@ -199,7 +199,7 @@ mi_expect_stop "breakpoint-hit" "main" "" ".*basics.c" \
@@ -35,7 +31,6 @@ index 6ce6439eb7..4f405b5fc1 100644
  
  # Test that the new current source line is output to the console
 diff --git a/gdb/testsuite/gdb.mi/mi-console.exp b/gdb/testsuite/gdb.mi/mi-console.exp
-index ec4b006018..05cf7fb889 100644
 --- a/gdb/testsuite/gdb.mi/mi-console.exp
 +++ b/gdb/testsuite/gdb.mi/mi-console.exp
 @@ -60,6 +60,9 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
@@ -49,7 +44,6 @@ index ec4b006018..05cf7fb889 100644
  # we are semihosted (e.g., the sim or a remote target that supports
  # the File I/O remote protocol extension), we see the target I/O
 diff --git a/gdb/testsuite/gdb.mi/mi-logging.exp b/gdb/testsuite/gdb.mi/mi-logging.exp
-index b09cde2d37..e51d46edb5 100644
 --- a/gdb/testsuite/gdb.mi/mi-logging.exp
 +++ b/gdb/testsuite/gdb.mi/mi-logging.exp
 @@ -53,7 +53,7 @@ close $chan
@@ -71,7 +65,6 @@ index b09cde2d37..e51d46edb5 100644
  } else {
      fail "redirect log file contents"
 diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp
-index 5227d63f5d..782f31c080 100644
 --- a/gdb/testsuite/gdb.opt/inline-cmds.exp
 +++ b/gdb/testsuite/gdb.opt/inline-cmds.exp
 @@ -331,7 +331,7 @@ proc mi_cli_step {cli_output_re message} {

gdb-6.6-testsuite-timeouts.patch

@@ -3,13 +3,10 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.6-testsuite-timeouts.patch
 
-FileName: gdb-6.6-testsuite-timeouts.patch
-
 ;; Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
 ;;=fedoratest
 
 diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
-index 4b34aa84f2..40e08a4db2 100644
 --- a/gdb/testsuite/gdb.base/annota1.exp
 +++ b/gdb/testsuite/gdb.base/annota1.exp
 @@ -39,6 +39,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
@@ -22,7 +19,6 @@ index 4b34aa84f2..40e08a4db2 100644
  # <return> to continue" prompts.
  gdb_test_no_output "set height 0"
 diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
-index a899be69ea..af472af8a5 100644
 --- a/gdb/testsuite/gdb.base/annota3.exp
 +++ b/gdb/testsuite/gdb.base/annota3.exp
 @@ -38,6 +38,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb

gdb-6.7-charsign-test.patch

@@ -3,8 +3,6 @@ From: Jan Kratochvil <jan.kratochvil@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.7-charsign-test.patch
 
-FileName: gdb-6.7-charsign-test.patch
-
 ;; Fix displaying of numeric char arrays as strings (BZ 224128).
 ;;=fedoratest: But it is failing anyway, one should check the behavior more.
 

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

@@ -3,8 +3,6 @@ From: Jan Kratochvil <jan.kratochvil@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.7-ppc-clobbered-registers-O2-test.patch
 
-FileName: gdb-6.7-ppc-clobbered-registers-O2-test.patch
-
 ;; Test PPC hiding of call-volatile parameter register.
 ;;=fedoratest
 

gdb-6.7-testsuite-stable-results.patch

@@ -3,8 +3,6 @@ From: Jan Kratochvil <jan.kratochvil@redhat.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.7-testsuite-stable-results.patch
 
-FileName: gdb-6.7-testsuite-stable-results.patch
-
 ;; Testsuite fixes for more stable/comparable results.
 ;;=fedoratest
 
@@ -28,7 +26,6 @@ gdb-6.8.50.20090209/gdb/testsuite/gdb.base/annota1.exp:
 frames-invalid can happen asynchronously.
 
 diff --git a/gdb/testsuite/gdb.base/fileio.c b/gdb/testsuite/gdb.base/fileio.c
-index 7f482a34d3..1caadbae84 100644
 --- a/gdb/testsuite/gdb.base/fileio.c
 +++ b/gdb/testsuite/gdb.base/fileio.c
 @@ -560,6 +560,28 @@ strerrno (int err)
@@ -61,7 +58,6 @@ index 7f482a34d3..1caadbae84 100644
    test_open ();
    test_write ();
 diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
-index bc409c26aa..e1e5e2e5d0 100644
 --- a/gdb/testsuite/gdb.base/fileio.exp
 +++ b/gdb/testsuite/gdb.base/fileio.exp
 @@ -24,9 +24,9 @@ if [target_info exists gdb,nofileio] {

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

@@ -3,13 +3,10 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.8-bz436037-reg-no-longer-active.patch
 
-FileName: gdb-6.8-bz436037-reg-no-longer-active.patch
-
 ;; Fix register assignments with no GDB stack frames (BZ 436037).
 ;;=push+jan: This fix is incorrect.
 
 diff --git a/gdb/valops.c b/gdb/valops.c
-index 9b6600b538..cdc5c8014c 100644
 --- a/gdb/valops.c
 +++ b/gdb/valops.c
 @@ -1104,6 +1104,8 @@ value_assign (struct value *toval, struct value *fromval)

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

@@ -3,15 +3,12 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.8-bz442765-threaded-exec-test.patch
 
-FileName: gdb-6.8-bz442765-threaded-exec-test.patch
-
 ;; Test various forms of threads tracking across exec() (BZ 442765).
 ;;=fedoratest
 
 Test various forms of threads tracking across exec(2).
 
 diff --git a/gdb/testsuite/gdb.threads/threaded-exec.c b/gdb/testsuite/gdb.threads/threaded-exec.c
-index 522b24671d..7079317d3a 100644
 --- a/gdb/testsuite/gdb.threads/threaded-exec.c
 +++ b/gdb/testsuite/gdb.threads/threaded-exec.c
 @@ -18,21 +18,95 @@
@@ -151,7 +148,6 @@ index 522b24671d..7079317d3a 100644
 +  assert (0);
  }
 diff --git a/gdb/testsuite/gdb.threads/threaded-exec.exp b/gdb/testsuite/gdb.threads/threaded-exec.exp
-index 77c8a7dc85..8c43162b36 100644
 --- a/gdb/testsuite/gdb.threads/threaded-exec.exp
 +++ b/gdb/testsuite/gdb.threads/threaded-exec.exp
 @@ -20,9 +20,14 @@

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

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.8-bz466901-backtrace-full-prelinked.patch
 
-FileName: gdb-6.8-bz466901-backtrace-full-prelinked.patch
-
 ;; Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 ;;=fedoratest
 

gdb-6.8-quit-never-aborts.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.8-quit-never-aborts.patch
 
-FileName: gdb-6.8-quit-never-aborts.patch
-
 ;; Make the GDB quit processing non-abortable to cleanup everything properly.
 ;;=fedora: It was useful only after gdb-6.8-attach-signalled-detach-stopped.patch .
 
@@ -16,7 +14,6 @@ should have been detached with SIGSTOP (as they are accidentally left running
 on the debugger termination).
 
 diff --git a/gdb/defs.h b/gdb/defs.h
-index ce5fee3ba3..8b16aca2a0 100644
 --- a/gdb/defs.h
 +++ b/gdb/defs.h
 @@ -168,6 +168,10 @@ extern void default_quit_handler (void);
@@ -31,7 +28,6 @@ index ce5fee3ba3..8b16aca2a0 100644
  
  /* Helper for the QUIT macro.  */
 diff --git a/gdb/extension.c b/gdb/extension.c
-index e5c014667a..1c54f03272 100644
 --- a/gdb/extension.c
 +++ b/gdb/extension.c
 @@ -820,6 +820,11 @@ check_quit_flag (void)
@@ -47,10 +43,9 @@ index e5c014667a..1c54f03272 100644
      {
        if (extlang->ops->check_quit_flag != NULL)
 diff --git a/gdb/top.c b/gdb/top.c
-index 07b386dacb..e6c595505f 100644
 --- a/gdb/top.c
 +++ b/gdb/top.c
-@@ -1604,7 +1604,13 @@ quit_force (int *exit_arg, int from_tty)
+@@ -1611,7 +1611,13 @@ quit_force (int *exit_arg, int from_tty)
  
    qt.from_tty = from_tty;
  
@@ -65,7 +60,6 @@ index 07b386dacb..e6c595505f 100644
    /* Get out of tfind mode, and kill or detach all inferiors.  */
    TRY
 diff --git a/gdb/utils.c b/gdb/utils.c
-index c816e2f897..db1c534560 100644
 --- a/gdb/utils.c
 +++ b/gdb/utils.c
 @@ -108,6 +108,13 @@ static std::chrono::steady_clock::duration prompt_for_continue_wait_time;

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

@@ -3,13 +3,10 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.8-sparc64-silence-memcpy-check.patch
 
-FileName: gdb-6.8-sparc64-silence-memcpy-check.patch
-
 ;; Silence memcpy check which returns false positive (sparc64)
 ;;=push: But it is just a GCC workaround, look up the existing GCC PR for it.
 
 diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
-index 7300080d8d..9860e12729 100644
 --- a/gdb/sparc-tdep.c
 +++ b/gdb/sparc-tdep.c
 @@ -1462,6 +1462,7 @@ sparc32_store_return_value (struct type *type, struct regcache *regcache,
@@ -18,5 +15,5 @@ index 7300080d8d..9860e12729 100644
        /* Floating return values.  */
 +      len = (len <= 8) ? len : 8;
        memcpy (buf, valbuf, len);
-       regcache_cooked_write (regcache, SPARC_F0_REGNUM, buf);
+       regcache->cooked_write (SPARC_F0_REGNUM, buf);
        if (len > 4)

gdb-6.8-watchpoint-conditionals-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-6.8-watchpoint-conditionals-test.patch
 
-FileName: gdb-6.8-watchpoint-conditionals-test.patch
-
 ;; Test the watchpoints conditionals works.
 ;;=fedoratest
 

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

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-7.2.50-sparc-add-workaround-to-broken-debug-files.patch
 
-FileName: gdb-7.2.50-sparc-add-workaround-to-broken-debug-files.patch
-
 ;; Toolchain on sparc is slightly broken and debuginfo files are generated
 ;; with non 64bit aligned tables/offsets.
 ;; See for example readelf -S ../Xvnc.debug.
@@ -19,7 +17,6 @@ FileName: gdb-7.2.50-sparc-add-workaround-to-broken-debug-files.patch
 ;;=push
 
 diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c
-index 8fedeb438d..057f5e1ae9 100644
 --- a/gdb/gdb_bfd.c
 +++ b/gdb/gdb_bfd.c
 @@ -24,12 +24,14 @@

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

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-archer-next-over-throw-cxx-exec.patch
 
-FileName: gdb-archer-next-over-throw-cxx-exec.patch
-
 ;; Fix follow-exec for C++ programs (bugreported by Martin Stransky).
 ;;=fedoratest
 

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

@@ -3,15 +3,12 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-archer-pie-addons-keep-disabled.patch
 
-FileName: gdb-archer-pie-addons-keep-disabled.patch
-
 ;;=push+jan: Breakpoints disabling matching should not be based on address.
 
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
-index 721afd2c04..a04b1183b7 100644
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
-@@ -15511,6 +15511,50 @@ initialize_breakpoint_ops (void)
+@@ -15519,6 +15519,50 @@ initialize_breakpoint_ops (void)
  
  static struct cmd_list_element *enablebreaklist = NULL;
  
@@ -63,10 +60,9 @@ index 721afd2c04..a04b1183b7 100644
  _initialize_breakpoint (void)
  {
 diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
-index 4223158fbc..407cc531db 100644
 --- a/gdb/breakpoint.h
 +++ b/gdb/breakpoint.h
-@@ -1683,6 +1683,9 @@ extern const char *ep_parse_optional_if_clause (const char **arg);
+@@ -1684,6 +1684,9 @@ extern const char *ep_parse_optional_if_clause (const char **arg);
     UIOUT iff debugging multiple threads.  */
  extern void maybe_print_thread_hit_breakpoint (struct ui_out *uiout);
  
@@ -77,7 +73,6 @@ index 4223158fbc..407cc531db 100644
  extern void print_breakpoint (breakpoint *bp);
  
 diff --git a/gdb/objfiles.c b/gdb/objfiles.c
-index f57f4f58b0..d31c0d6f56 100644
 --- a/gdb/objfiles.c
 +++ b/gdb/objfiles.c
 @@ -875,6 +875,11 @@ objfile_relocate1 (struct objfile *objfile,

gdb-archer-pie-addons.patch

@@ -3,12 +3,9 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-archer-pie-addons.patch
 
-FileName: gdb-archer-pie-addons.patch
-
 ;;=push+jan: May get obsoleted by Tom's unrelocated objfiles patch.
 
 diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
-index 878c8b0302..cf1346161d 100644
 --- a/gdb/gdbtypes.h
 +++ b/gdb/gdbtypes.h
 @@ -505,6 +505,7 @@ enum field_loc_kind
@@ -27,7 +24,7 @@ index 878c8b0302..cf1346161d 100644
    CORE_ADDR physaddr;
    const char *physname;
  
-@@ -1453,6 +1455,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
+@@ -1438,6 +1440,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
  #define FIELD_ENUMVAL_LVAL(thisfld) ((thisfld).loc.enumval)
  #define FIELD_ENUMVAL(thisfld) (FIELD_ENUMVAL_LVAL (thisfld) + 0)
  #define FIELD_STATIC_PHYSNAME(thisfld) ((thisfld).loc.physname)
@@ -35,7 +32,7 @@ index 878c8b0302..cf1346161d 100644
  #define FIELD_STATIC_PHYSADDR(thisfld) ((thisfld).loc.physaddr)
  #define FIELD_DWARF_BLOCK(thisfld) ((thisfld).loc.dwarf_block)
  #define SET_FIELD_BITPOS(thisfld, bitpos)			\
-@@ -1464,6 +1467,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
+@@ -1449,6 +1452,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
  #define SET_FIELD_PHYSNAME(thisfld, name)			\
    (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSNAME,		\
     FIELD_STATIC_PHYSNAME (thisfld) = (name))
@@ -43,7 +40,7 @@ index 878c8b0302..cf1346161d 100644
  #define SET_FIELD_PHYSADDR(thisfld, addr)			\
    (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSADDR,		\
     FIELD_STATIC_PHYSADDR (thisfld) = (addr))
-@@ -1480,6 +1484,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
+@@ -1465,6 +1469,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
  #define TYPE_FIELD_BITPOS(thistype, n) FIELD_BITPOS (TYPE_FIELD (thistype, n))
  #define TYPE_FIELD_ENUMVAL(thistype, n) FIELD_ENUMVAL (TYPE_FIELD (thistype, n))
  #define TYPE_FIELD_STATIC_PHYSNAME(thistype, n) FIELD_STATIC_PHYSNAME (TYPE_FIELD (thistype, n))
@@ -52,10 +49,9 @@ index 878c8b0302..cf1346161d 100644
  #define TYPE_FIELD_DWARF_BLOCK(thistype, n) FIELD_DWARF_BLOCK (TYPE_FIELD (thistype, n))
  #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL(TYPE_FIELD(thistype,n))
 diff --git a/gdb/value.c b/gdb/value.c
-index aa6ca43b41..98c060c65f 100644
 --- a/gdb/value.c
 +++ b/gdb/value.c
-@@ -2830,7 +2830,8 @@ value_static_field (struct type *type, int fieldno)
+@@ -2829,7 +2829,8 @@ value_static_field (struct type *type, int fieldno)
      {
      case FIELD_LOC_KIND_PHYSADDR:
        retval = value_at_lazy (TYPE_FIELD_TYPE (type, fieldno),

gdb-archer-vla-tests.patch

@@ -3,12 +3,9 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-archer-vla-tests.patch
 
-FileName: gdb-archer-vla-tests.patch
-
 ;;=fedoratest
 
 diff --git a/gdb/testsuite/gdb.ada/packed_array.exp b/gdb/testsuite/gdb.ada/packed_array.exp
-index 3e614b788a..0ae87786db 100644
 --- a/gdb/testsuite/gdb.ada/packed_array.exp
 +++ b/gdb/testsuite/gdb.ada/packed_array.exp
 @@ -56,5 +56,11 @@ gdb_test_multiple "$test" "$test" {
@@ -1086,7 +1083,6 @@ new file mode 100644
 +
 +gdb_test "ptype array" "type = char \\\[78\\\]" "second: ptype array"
 diff --git a/gdb/testsuite/gdb.base/arrayidx.c b/gdb/testsuite/gdb.base/arrayidx.c
-index 5a0d01d04f..9e4b16e902 100644
 --- a/gdb/testsuite/gdb.base/arrayidx.c
 +++ b/gdb/testsuite/gdb.base/arrayidx.c
 @@ -17,6 +17,13 @@
@@ -1104,7 +1100,6 @@ index 5a0d01d04f..9e4b16e902 100644
  main (void)
  {
 diff --git a/gdb/testsuite/gdb.base/arrayidx.exp b/gdb/testsuite/gdb.base/arrayidx.exp
-index 91eb3c6056..af29a51f23 100644
 --- a/gdb/testsuite/gdb.base/arrayidx.exp
 +++ b/gdb/testsuite/gdb.base/arrayidx.exp
 @@ -49,4 +49,12 @@ gdb_test "print array" \
@@ -3692,10 +3687,9 @@ new file mode 100644
 +  writeln(s); { set breakpoint 2 here }
 +end.
 diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
-index becda6a001..067be70c7a 100644
 --- a/gdb/testsuite/lib/gdb.exp
 +++ b/gdb/testsuite/lib/gdb.exp
-@@ -169,6 +169,11 @@ proc gdb_unload {} {
+@@ -170,6 +170,11 @@ proc gdb_unload {} {
  	    send_gdb "y\n"
  	    exp_continue
  	}
@@ -3708,7 +3702,6 @@ index becda6a001..067be70c7a 100644
  	    send_gdb "y\n"
  	    exp_continue
 diff --git a/gdb/testsuite/lib/pascal.exp b/gdb/testsuite/lib/pascal.exp
-index 03d1b1bc06..9f9e143dff 100644
 --- a/gdb/testsuite/lib/pascal.exp
 +++ b/gdb/testsuite/lib/pascal.exp
 @@ -37,6 +37,9 @@ proc pascal_init {} {

gdb-archer.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-archer.patch
 
-FileName: gdb-archer.patch
-
 ;; Python patches of: http://sourceware.org/gdb/wiki/ProjectArcher
 ;;=push
 
@@ -17,10 +15,9 @@ commit 718a1618b2f691a7f407213bb50f100ac59f91c3
 tromey/python
 
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index 1ea7a36c69..b767caa735 100644
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
-@@ -2094,6 +2094,12 @@ stamp-h: $(srcdir)/config.in config.status
+@@ -2112,6 +2112,12 @@ stamp-h: $(srcdir)/config.in config.status
  	  CONFIG_LINKS= \
  	  $(SHELL) config.status
  
@@ -30,23 +27,21 @@ index 1ea7a36c69..b767caa735 100644
 +	  CONFIG_HEADERS= \
 +	  $(SHELL) config.status
 +
- config.status: $(srcdir)/configure configure.tgt configure.host ../bfd/development.sh
+ config.status: $(srcdir)/configure configure.nat configure.tgt configure.host ../bfd/development.sh
  	$(SHELL) config.status --recheck
  
 diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
-index 5c7c0b4c2e..2014607e9e 100644
 --- a/gdb/data-directory/Makefile.in
 +++ b/gdb/data-directory/Makefile.in
-@@ -80,6 +80,8 @@ PYTHON_FILE_LIST = \
+@@ -80,6 +80,7 @@ PYTHON_FILE_LIST = \
  	gdb/unwinder.py \
  	gdb/xmethod.py \
  	gdb/command/__init__.py \
 +	gdb/command/ignore_errors.py \
-+	gdb/command/pahole.py \
  	gdb/command/explore.py \
  	gdb/command/backtrace.py \
  	gdb/command/frame_filters.py \
-@@ -92,6 +94,8 @@ PYTHON_FILE_LIST = \
+@@ -92,6 +93,8 @@ PYTHON_FILE_LIST = \
  	gdb/function/as_string.py \
  	gdb/function/caller_is.py \
  	gdb/function/strfns.py \
@@ -56,7 +51,6 @@ index 5c7c0b4c2e..2014607e9e 100644
  	gdb/printer/bound_registers.py
  
 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
-index 403f5ca658..4788dd9f0d 100644
 --- a/gdb/doc/gdb.texinfo
 +++ b/gdb/doc/gdb.texinfo
 @@ -1245,6 +1245,16 @@ for remote debugging.
@@ -77,7 +71,6 @@ index 403f5ca658..4788dd9f0d 100644
  @item -tui
  @cindex @code{--tui}
 diff --git a/gdb/doc/python.texi b/gdb/doc/python.texi
-index fb074faf43..8d8fbfeaa9 100644
 --- a/gdb/doc/python.texi
 +++ b/gdb/doc/python.texi
 @@ -88,8 +88,6 @@ containing @code{end}.  For example:
@@ -90,7 +83,6 @@ index fb074faf43..8d8fbfeaa9 100644
  >end
  23
 diff --git a/gdb/gdb-gdb.gdb.in b/gdb/gdb-gdb.gdb.in
-index 05a38b2670..9801fdff67 100644
 --- a/gdb/gdb-gdb.gdb.in
 +++ b/gdb/gdb-gdb.gdb.in
 @@ -1,5 +1,15 @@
@@ -110,7 +102,6 @@ index 05a38b2670..9801fdff67 100644
    set variable $gdb_init_done = 1
  
 diff --git a/gdb/main.c b/gdb/main.c
-index 84e6126ad4..80d84ea246 100644
 --- a/gdb/main.c
 +++ b/gdb/main.c
 @@ -33,6 +33,7 @@
@@ -319,92 +310,6 @@ new file mode 100644
 +            pass
 +
 +IgnoreErrorsCommand ()
-diff --git a/gdb/python/lib/gdb/command/pahole.py b/gdb/python/lib/gdb/command/pahole.py
-new file mode 100644
---- /dev/null
-+++ b/gdb/python/lib/gdb/command/pahole.py
-@@ -0,0 +1,81 @@
-+# pahole command for gdb
-+
-+# Copyright (C) 2008, 2009, 2012 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+import gdb
-+
-+class Pahole (gdb.Command):
-+    """Show the holes in a structure.
-+This command takes a single argument, a type name.
-+It prints the type and displays comments showing where holes are."""
-+
-+    def __init__ (self):
-+        super (Pahole, self).__init__ ("pahole", gdb.COMMAND_NONE,
-+                                       gdb.COMPLETE_SYMBOL)
-+
-+    def maybe_print_hole(self, bitpos, field_bitpos):
-+        if bitpos != field_bitpos:
-+            hole = field_bitpos - bitpos
-+            print ('  /* XXX %d bit hole, try to pack */' % hole)
-+
-+    def pahole (self, type, level, name):
-+        if name is None:
-+            name = ''
-+        tag = type.tag
-+        if tag is None:
-+            tag = ''
-+        print ('%sstruct %s {' % (' ' * (2 * level), tag))
-+        bitpos = 0
-+        for field in type.fields ():
-+            # Skip static fields.
-+            if not hasattr (field, ('bitpos')):
-+                continue
-+
-+            ftype = field.type.strip_typedefs()
-+
-+            self.maybe_print_hole(bitpos, field.bitpos)
-+            bitpos = field.bitpos
-+            if field.bitsize > 0:
-+                fieldsize = field.bitsize
-+            else:
-+                # TARGET_CHAR_BIT here...
-+                fieldsize = 8 * ftype.sizeof
-+
-+            # TARGET_CHAR_BIT
-+            print (' /* %3d %3d */' % (int (bitpos / 8), int (fieldsize / 8)), end = "")
-+            bitpos = bitpos + fieldsize
-+
-+            if ftype.code == gdb.TYPE_CODE_STRUCT:
-+                self.pahole (ftype, level + 1, field.name)
-+            else:
-+                print (' ' * (2 + 2 * level), end = "")
-+                print ('%s %s' % (str (ftype), field.name))
-+
-+        if level == 0:
-+            self.maybe_print_hole(bitpos, 8 * type.sizeof)
-+
-+        print (' ' * (14 + 2 * level), end = "")
-+        print ('} %s' % name)
-+
-+    def invoke (self, arg, from_tty):
-+        type = gdb.lookup_type (arg)
-+        type = type.strip_typedefs ()
-+        if type.code != gdb.TYPE_CODE_STRUCT:
-+            raise (TypeError, '%s is not a struct type' % arg)
-+        print (' ' * 14, end = "")
-+        self.pahole (type, 0, '')
-+
-+Pahole()
 diff --git a/gdb/python/lib/gdb/function/in_scope.py b/gdb/python/lib/gdb/function/in_scope.py
 new file mode 100644
 --- /dev/null
@@ -458,10 +363,9 @@ new file mode 100644
 +
 +InScope ()
 diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
-index b8e2d9049d..deb87c6a71 100644
 --- a/gdb/python/python-internal.h
 +++ b/gdb/python/python-internal.h
-@@ -641,6 +641,9 @@ class gdbpy_enter_varobj : public gdbpy_enter
+@@ -644,6 +644,9 @@ class gdbpy_enter_varobj : public gdbpy_enter
  
  };
  
@@ -472,7 +376,6 @@ index b8e2d9049d..deb87c6a71 100644
  extern const struct language_defn *python_language;
  
 diff --git a/gdb/python/python.c b/gdb/python/python.c
-index 4233b37fa8..cc4b710df7 100644
 --- a/gdb/python/python.c
 +++ b/gdb/python/python.c
 @@ -95,6 +95,8 @@ const struct extension_language_defn extension_language_python =
@@ -607,7 +510,7 @@ index 4233b37fa8..cc4b710df7 100644
  
  static PyObject *
  gdbpy_get_current_progspace (PyObject *unused1, PyObject *unused2)
-@@ -2045,6 +2156,8 @@ PyMethodDef python_GdbMethods[] =
+@@ -2057,6 +2168,8 @@ PyMethodDef python_GdbMethods[] =
  Evaluate command, a string, as a gdb CLI command.  Optionally returns\n\
  a Python String containing the output of the command if to_string is\n\
  set to True." },
@@ -617,7 +520,6 @@ index 4233b37fa8..cc4b710df7 100644
      "Return a gdb parameter's value" },
  
 diff --git a/gdb/python/python.h b/gdb/python/python.h
-index de58fd81df..237a84a0b2 100644
 --- a/gdb/python/python.h
 +++ b/gdb/python/python.h
 @@ -25,4 +25,6 @@
@@ -628,7 +530,6 @@ index de58fd81df..237a84a0b2 100644
 +
  #endif /* GDB_PYTHON_H */
 diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp
-index f186fa9578..0327284226 100644
 --- a/gdb/testsuite/gdb.python/py-frame.exp
 +++ b/gdb/testsuite/gdb.python/py-frame.exp
 @@ -95,6 +95,8 @@ gdb_test "python print ('result = %s' % f0.read_var ('a'))" " = 1" "test Frame.r
@@ -641,7 +542,6 @@ index f186fa9578..0327284226 100644
  gdb_test "python print ('result = %s' % (gdb.selected_frame ().read_register ('sp') == gdb.parse_and_eval ('\$sp')))" \
    " = True" \
 diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
-index eb82a7776f..3069a5c6d7 100644
 --- a/gdb/testsuite/gdb.python/py-value.exp
 +++ b/gdb/testsuite/gdb.python/py-value.exp
 @@ -384,6 +384,15 @@ proc test_value_after_death {} {
@@ -669,7 +569,6 @@ index eb82a7776f..3069a5c6d7 100644
  # Test either C or C++ values. 
  
 diff --git a/gdb/varobj.c b/gdb/varobj.c
-index a0df485ae9..ab8248a781 100644
 --- a/gdb/varobj.c
 +++ b/gdb/varobj.c
 @@ -218,6 +218,14 @@ is_root_p (const struct varobj *var)
@@ -688,7 +587,6 @@ index a0df485ae9..ab8248a781 100644
  /* See python-internal.h.  */
  gdbpy_enter_varobj::gdbpy_enter_varobj (const struct varobj *var)
 diff --git a/gdb/varobj.h b/gdb/varobj.h
-index 3aba0cda67..42dfad83f8 100644
 --- a/gdb/varobj.h
 +++ b/gdb/varobj.h
 @@ -328,6 +328,8 @@ extern bool varobj_has_more (const struct varobj *var, int to);

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

@@ -1,9 +1,7 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: attach-fail-reasons: SELinux deny_ptrace
+Subject: gdb-attach-fail-reasons-5of5.patch
-
-FileName: gdb-attach-fail-reasons-5of5.patch
 
 ;; Print reasons for failed attach/spawn incl. SELinux deny_ptrace (BZ 786878).
 ;;=push+jan
@@ -45,7 +43,6 @@ gdb/gdbserver/
 	direct ptrace.
 
 diff --git a/gdb/config.in b/gdb/config.in
-index 404e0bbddc..97d2f7f518 100644
 --- a/gdb/config.in
 +++ b/gdb/config.in
 @@ -276,6 +276,9 @@
@@ -69,10 +66,9 @@ index 404e0bbddc..97d2f7f518 100644
  #undef HAVE_SETLOCALE
  
 diff --git a/gdb/configure b/gdb/configure
-index 30a6e86ff8..3b604feb11 100755
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -15747,6 +15747,64 @@ cat >>confdefs.h <<_ACEOF
+@@ -15854,6 +15854,64 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
  
  
@@ -138,10 +134,9 @@ index 30a6e86ff8..3b604feb11 100755
  # Support for --with-sysroot is a copy of GDB_AC_WITH_DIR,
  # except that the argument to --with-sysroot is optional.
 diff --git a/gdb/configure.ac b/gdb/configure.ac
-index 39a777f647..c707e7b152 100644
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -2048,6 +2048,10 @@ case $host_os in
+@@ -2054,6 +2054,10 @@ case $host_os in
  esac
  AC_DEFINE_UNQUOTED(GDBINIT,"$gdbinit",[The .gdbinit filename.])
  
@@ -153,7 +148,6 @@ index 39a777f647..c707e7b152 100644
  
  # Support for --with-sysroot is a copy of GDB_AC_WITH_DIR,
 diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in
-index dda7c1f150..b2a34b92ce 100644
 --- a/gdb/gdbserver/config.in
 +++ b/gdb/gdbserver/config.in
 @@ -126,6 +126,9 @@
@@ -177,10 +171,9 @@ index dda7c1f150..b2a34b92ce 100644
  #undef HAVE_SETNS
  
 diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
-index b2e2e8f955..3269bbe553 100755
 --- a/gdb/gdbserver/configure
 +++ b/gdb/gdbserver/configure
-@@ -8465,6 +8465,64 @@ if $want_ipa ; then
+@@ -8535,6 +8535,64 @@ if $want_ipa ; then
     fi
  fi
  
@@ -246,10 +239,9 @@ index b2e2e8f955..3269bbe553 100755
  
  
 diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
-index 99801681ff..56f28797ca 100644
 --- a/gdb/gdbserver/configure.ac
 +++ b/gdb/gdbserver/configure.ac
-@@ -488,6 +488,10 @@ if $want_ipa ; then
+@@ -486,6 +486,10 @@ if $want_ipa ; then
     fi
  fi
  
@@ -261,10 +253,9 @@ index 99801681ff..56f28797ca 100644
  AC_SUBST(GDBSERVER_LIBS)
  AC_SUBST(srv_xmlbuiltin)
 diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
-index e64949504d..6bcaf3700f 100644
 --- a/gdb/gdbserver/linux-low.c
 +++ b/gdb/gdbserver/linux-low.c
-@@ -966,7 +966,16 @@ linux_ptrace_fun ()
+@@ -967,7 +967,16 @@ linux_ptrace_fun ()
  {
    if (ptrace (PTRACE_TRACEME, 0, (PTRACE_TYPE_ARG3) 0,
  	      (PTRACE_TYPE_ARG4) 0) < 0)
@@ -283,7 +274,6 @@ index e64949504d..6bcaf3700f 100644
    if (setpgid (0, 0) < 0)
      trace_start_error_with_name ("setpgid");
 diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
-index 445b59fa4a..05344316a7 100644
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
 @@ -1088,7 +1088,17 @@ linux_nat_target::create_inferior (const char *exec_file,
@@ -306,7 +296,6 @@ index 445b59fa4a..05344316a7 100644
  
  /* Callback for linux_proc_attach_tgid_threads.  Attach to PTID if not
 diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
-index 1f21ef03a3..53c9a0de17 100644
 --- a/gdb/nat/linux-ptrace.c
 +++ b/gdb/nat/linux-ptrace.c
 @@ -25,6 +25,10 @@
@@ -356,10 +345,9 @@ index 1f21ef03a3..53c9a0de17 100644
  
  int
 diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
-index dc180fbf82..32e3d33bc8 100644
 --- a/gdb/nat/linux-ptrace.h
 +++ b/gdb/nat/linux-ptrace.h
-@@ -189,6 +189,7 @@ extern std::string linux_ptrace_attach_fail_reason (pid_t pid);
+@@ -184,6 +184,7 @@ extern std::string linux_ptrace_attach_fail_reason (pid_t pid);
  extern std::string linux_ptrace_attach_fail_reason_string (ptid_t ptid, int err);
  
  extern void linux_ptrace_init_warnings (void);

gdb-btrobust.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-btrobust.patch
 
-FileName: gdb-btrobust.patch
-
 ;; Continue backtrace even if a frame filter throws an exception (Phil Muldoon).
 ;;=push
 
@@ -14,7 +12,6 @@ printed, but a default backtrace will occur in this case.
 --
 
 diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
-index 4edefd48f9..af5fcae654 100644
 --- a/gdb/python/py-framefilter.c
 +++ b/gdb/python/py-framefilter.c
 @@ -1151,6 +1151,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,

gdb-bz1219747-attach-kills.patch

@@ -1,9 +1,7 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: Never kill PID on: gdb exec PID
+Subject: gdb-bz1219747-attach-kills.patch
-
-FileName: gdb-bz1219747-attach-kills.patch
 
 ;; Never kill PID on: gdb exec PID (Jan Kratochvil, RH BZ 1219747).
 ;;=push+jan
@@ -80,7 +78,6 @@ gdb/testsuite/ChangeLog
 	* gdb.base/attach-kills.exp: New.
 
 diff --git a/gdb/main.c b/gdb/main.c
-index 4caefe2011..84e6126ad4 100644
 --- a/gdb/main.c
 +++ b/gdb/main.c
 @@ -1115,7 +1115,10 @@ captured_main_1 (struct captured_main_args *context)

gdb-bz533176-fortran-omp-step.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-bz533176-fortran-omp-step.patch
 
-FileName: gdb-bz533176-fortran-omp-step.patch
-
 ;; Fix stepping with OMP parallel Fortran sections (BZ 533176).
 ;;=push+jan: It requires some better DWARF annotations.
 
@@ -30,10 +28,9 @@ threads need to get synchronized at some point.  This is a more general
 debugging problem of GOMP outside of the scope of this Bug.
 
 diff --git a/gdb/infrun.c b/gdb/infrun.c
-index 78ffc10b23..443e2123f0 100644
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
-@@ -6699,6 +6699,16 @@ process_event_stop_test (struct execution_control_state *ecs)
+@@ -6694,6 +6694,16 @@ process_event_stop_test (struct execution_control_state *ecs)
  
        if (ecs->event_thread->control.step_over_calls == STEP_OVER_ALL)
  	{
@@ -50,7 +47,7 @@ index 78ffc10b23..443e2123f0 100644
  	  /* We're doing a "next".
  
  	     Normal (forward) execution: set a breakpoint at the
-@@ -6732,6 +6742,7 @@ process_event_stop_test (struct execution_control_state *ecs)
+@@ -6727,6 +6737,7 @@ process_event_stop_test (struct execution_control_state *ecs)
  
  	  keep_going (ecs);
  	  return;

gdb-bz541866-rwatch-before-run.patch

@@ -3,17 +3,14 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-bz541866-rwatch-before-run.patch
 
-FileName: gdb-bz541866-rwatch-before-run.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.
 
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
-index a04b1183b7..305bb3f6c0 100644
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
-@@ -8808,7 +8808,7 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch,
+@@ -8804,7 +8804,7 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch,
  		     int enabled, int internal, unsigned flags,
  		     int display_canonical)
  {
@@ -22,7 +19,7 @@ index a04b1183b7..305bb3f6c0 100644
  
    if (type == bp_hardware_breakpoint)
      {
-@@ -14345,7 +14345,7 @@ enable_breakpoint_disp (struct breakpoint *bpt, enum bpdisp disposition,
+@@ -14353,7 +14353,7 @@ enable_breakpoint_disp (struct breakpoint *bpt, enum bpdisp disposition,
  
    if (bpt->type == bp_hardware_breakpoint)
      {
@@ -98,10 +95,9 @@ new file mode 100644
 +
 +#endif /* NM_LINUX64_H */
 diff --git a/gdb/configure.nat b/gdb/configure.nat
-index 6b0f44fede..dd0c63c256 100644
 --- a/gdb/configure.nat
 +++ b/gdb/configure.nat
-@@ -237,6 +237,7 @@ case ${gdb_host} in
+@@ -238,6 +238,7 @@ case ${gdb_host} in
  		;;
  	    i386)
  		# Host: Intel 386 running GNU/Linux.
@@ -109,7 +105,7 @@ index 6b0f44fede..dd0c63c256 100644
  		NATDEPFILES="${NATDEPFILES} x86-nat.o x86-dregs.o \
  		i386-linux-nat.o x86-linux-nat.o linux-btrace.o \
  		x86-linux.o x86-linux-dregs.o"
-@@ -289,6 +290,7 @@ case ${gdb_host} in
+@@ -290,6 +291,7 @@ case ${gdb_host} in
  	case ${gdb_host_cpu} in
  	    i386)
  		# Host: GNU/Linux x86-64
@@ -118,16 +114,15 @@ index 6b0f44fede..dd0c63c256 100644
  		amd64-nat.o amd64-linux-nat.o x86-linux-nat.o linux-btrace.o \
  		x86-linux.o x86-linux-dregs.o amd64-linux-siginfo.o"
 diff --git a/gdb/target.h b/gdb/target.h
-index e2d1e61cdc..6e13809397 100644
 --- a/gdb/target.h
 +++ b/gdb/target.h
-@@ -1908,9 +1908,11 @@ extern struct thread_info *target_thread_handle_to_thread_info
+@@ -1953,9 +1953,11 @@ extern struct thread_info *target_thread_handle_to_thread_info
     one.  OTHERTYPE is the number of watchpoints of other types than
     this one used so far.  */
  
 +#ifndef target_can_use_hardware_watchpoint
  #define target_can_use_hardware_watchpoint(TYPE,CNT,OTHERTYPE) \
-  (target_stack->can_use_hw_breakpoint) ( \
+  (current_top_target ()->can_use_hw_breakpoint) ( \
  					     TYPE, CNT, OTHERTYPE)
 +#endif
  

gdb-bz568248-oom-is-error.patch

@@ -1,9 +1,7 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: nomem: internal_error -> error
+Subject: gdb-bz568248-oom-is-error.patch
-
-FileName: gdb-bz568248-oom-is-error.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.
@@ -53,7 +51,6 @@ gdb/
 	* utils.c (nomem): Change internal_error to error.
 
 diff --git a/gdb/utils.c b/gdb/utils.c
-index 9c5bf68e5a..7813df1436 100644
 --- a/gdb/utils.c
 +++ b/gdb/utils.c
 @@ -746,13 +746,11 @@ malloc_failure (long size)

gdb-bz601887-dwarf4-rh-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-bz601887-dwarf4-rh-test.patch
 
-FileName: gdb-bz601887-dwarf4-rh-test.patch
-
 ;; Backport DWARF-4 support (BZ 601887, Tom Tromey).
 ;;=fedoratest
 

gdb-bz634108-solib_address.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-bz634108-solib_address.patch
 
-FileName: gdb-bz634108-solib_address.patch
-
 ;; Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
 ;;=fedoratest
 

gdb-ccache-workaround.patch

@@ -3,13 +3,10 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-ccache-workaround.patch
 
-FileName: gdb-ccache-workaround.patch
-
 ;; Workaround ccache making lineno non-zero for command-line definitions.
 ;;=fedoratest: ccache is rarely used and it is even fixed now.
 
 diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
-index 27dc991ce9..a3b9458b44 100644
 --- a/gdb/testsuite/gdb.base/macscp.exp
 +++ b/gdb/testsuite/gdb.base/macscp.exp
 @@ -25,6 +25,14 @@ if { [test_compiler_info "gcc-*"] || [test_compiler_info "clang-*"] } {

gdb-container-rh-pkg.patch

@@ -3,16 +3,13 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-container-rh-pkg.patch
 
-FileName: gdb-container-rh-pkg.patch
-
 ;; Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 ;;=fedora
 
 diff --git a/gdb/remote.c b/gdb/remote.c
-index 635cb266e8..a683df4a83 100644
 --- a/gdb/remote.c
 +++ b/gdb/remote.c
-@@ -13667,7 +13667,17 @@ remote_target::pid_to_exec_file (int pid)
+@@ -13904,7 +13904,17 @@ remote_target::pid_to_exec_file (int pid)
    char *annex = NULL;
  
    if (packet_support (PACKET_qXfer_exec_file) != PACKET_ENABLE)

gdb-core-open-vdso-warning.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-core-open-vdso-warning.patch
 
-FileName: gdb-core-open-vdso-warning.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@.*>
@@ -19,7 +17,6 @@ Author: Ulrich Weigand <uweigand@de.ibm.com>
 Date:   Wed Sep 25 11:52:50 2013 +0000
 
 diff --git a/gdb/testsuite/gdb.base/solib-symbol.exp b/gdb/testsuite/gdb.base/solib-symbol.exp
-index 20c1d47a03..893efe0b2d 100644
 --- a/gdb/testsuite/gdb.base/solib-symbol.exp
 +++ b/gdb/testsuite/gdb.base/solib-symbol.exp
 @@ -29,6 +29,7 @@ set testfile "solib-symbol-main"

gdb-dts-rhel6-python-compat.patch

@@ -3,15 +3,12 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-dts-rhel6-python-compat.patch
 
-FileName: gdb-dts-rhel6-python-compat.patch
-
 ;; [rhel6] DTS backward Python compatibility API (BZ 1020004, Phil Muldoon).
 ;;=fedora
 
 https://bugzilla.redhat.com/show_bug.cgi?id=1020004
 
 diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
-index 753e0b69a3..5c7c0b4c2e 100644
 --- a/gdb/data-directory/Makefile.in
 +++ b/gdb/data-directory/Makefile.in
 @@ -71,6 +71,8 @@ PYTHON_FILE_LIST = \

gdb-fedora-libncursesw.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-fedora-libncursesw.patch
 
-FileName: gdb-fedora-libncursesw.patch
-
 ;; Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 ;;=push+jan
 
@@ -12,18 +10,17 @@ Fedora: Force libncursesw over libncurses to match the includes.
 https://bugzilla.redhat.com/show_bug.cgi?id=1270534
 
 diff --git a/gdb/configure b/gdb/configure
-index 9f236ae26a..a2d480c1e5 100755
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -9304,6 +9304,7 @@ if test x"$prefer_curses" = xyes; then
+@@ -9393,6 +9393,7 @@ if test x"$prefer_curses" = xyes; then
    # search /usr/local/include, if ncurses is installed in /usr/local.  A
    # default installation of ncurses on alpha*-dec-osf* will lead to such
    # a situation.
 +  # Fedora: Force libncursesw over libncurses to match the includes.
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing waddstr" >&5
  $as_echo_n "checking for library containing waddstr... " >&6; }
- if test "${ac_cv_search_waddstr+set}" = set; then :
+ if ${ac_cv_search_waddstr+:} false; then :
-@@ -9328,7 +9329,7 @@ return waddstr ();
+@@ -9417,7 +9418,7 @@ return waddstr ();
    return 0;
  }
  _ACEOF
@@ -32,15 +29,15 @@ index 9f236ae26a..a2d480c1e5 100755
    if test -z "$ac_lib"; then
      ac_res="none required"
    else
-@@ -9402,6 +9403,7 @@ case $host_os in
+@@ -9491,6 +9492,7 @@ case $host_os in
  esac
  
  # These are the libraries checked by Readline.
 +# Fedora: Force libncursesw over libncurses to match the includes.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
  $as_echo_n "checking for library containing tgetent... " >&6; }
- if test "${ac_cv_search_tgetent+set}" = set; then :
+ if ${ac_cv_search_tgetent+:} false; then :
-@@ -9426,7 +9428,7 @@ return tgetent ();
+@@ -9515,7 +9517,7 @@ return tgetent ();
    return 0;
  }
  _ACEOF
@@ -50,10 +47,9 @@ index 9f236ae26a..a2d480c1e5 100755
      ac_res="none required"
    else
 diff --git a/gdb/configure.ac b/gdb/configure.ac
-index dc0acd035b..57ebcaeb08 100644
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -760,7 +760,8 @@ if test x"$prefer_curses" = xyes; then
+@@ -766,7 +766,8 @@ if test x"$prefer_curses" = xyes; then
    # search /usr/local/include, if ncurses is installed in /usr/local.  A
    # default installation of ncurses on alpha*-dec-osf* will lead to such
    # a situation.
@@ -63,7 +59,7 @@ index dc0acd035b..57ebcaeb08 100644
  
    if test "$ac_cv_search_waddstr" != no; then
      curses_found=yes
-@@ -802,7 +803,8 @@ case $host_os in
+@@ -808,7 +809,8 @@ case $host_os in
  esac
  
  # These are the libraries checked by Readline.

gdb-follow-child-stale-parent.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-follow-child-stale-parent.patch
 
-FileName: gdb-follow-child-stale-parent.patch
-
 ;; Fix regression by python on ia64 due to stale current frame.
 ;;=push+jan
 
@@ -24,7 +22,6 @@ unwinders try to access it, breaking:
   +FAIL: gdb.threads/watchpoint-fork.exp: child: singlethreaded: finish
 
 diff --git a/gdb/infrun.c b/gdb/infrun.c
-index 443e2123f0..16ee1c2e31 100644
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
 @@ -752,6 +752,9 @@ follow_fork (void)

gdb-fortran-frame-string.patch

@@ -1,9 +1,7 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: Display Fortran strings in backtraces
+Subject: gdb-fortran-frame-string.patch
-
-FileName: gdb-fortran-frame-string.patch
 
 ;; Display Fortran strings in backtraces.
 ;;=fedoratest

gdb-glibc-strstr-workaround.patch

@@ -3,16 +3,13 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-glibc-strstr-workaround.patch
 
-FileName: gdb-glibc-strstr-workaround.patch
-
 ;; Workaround PR libc/14166 for inferior calls of strstr.
 ;;=fedora: Compatibility with RHELs (unchecked which ones).
 
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 266740f74c..d69f154af3 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -21376,6 +21376,26 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
+@@ -21255,6 +21255,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);

gdb-gnat-dwarf-crash-3of3.patch

@@ -1,9 +1,7 @@
 From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
 From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb_assert -> complaint for weird DWARF
+Subject: gdb-gnat-dwarf-crash-3of3.patch
-
-FileName: gdb-gnat-dwarf-crash-3of3.patch
 
 ;; Fix crash of -readnow /usr/lib/debug/usr/bin/gnatbind.debug (BZ 1069211).
 ;;=push+jan
@@ -42,17 +40,15 @@ gdb/
 	* dwarf2read.c (process_die): Change gdb_assert to complaint.
 
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 420c3e6bd5..328a07df82 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -10516,6 +10516,14 @@ private:
+@@ -10483,6 +10483,13 @@ private:
  static void
  process_die (struct die_info *die, struct dwarf2_cu *cu)
  {
 +  if (die->in_process)
 +    {
-+      complaint (&symfile_complaints,
++      complaint (_("DIE at 0x%s attempted to be processed twice"),
-+		 _("DIE at 0x%s attempted to be processed twice"),
 +		 sect_offset_str (die->sect_off));
 +      return;
 +    }
@@ -61,10 +57,9 @@ index 420c3e6bd5..328a07df82 100644
  
    switch (die->tag)
 diff --git a/gdb/infrun.c b/gdb/infrun.c
-index 16ee1c2e31..82b9cedc90 100644
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
-@@ -609,6 +609,13 @@ holding the child stopped.  Try \"set detach-on-fork\" or \
+@@ -607,6 +607,13 @@ holding the child stopped.  Try \"set detach-on-fork\" or \
  				target_pid_to_str (process_ptid));
  	    }
  
@@ -79,7 +74,6 @@ index 16ee1c2e31..82b9cedc90 100644
  	}
  
 diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
-index 05344316a7..30a94b47c9 100644
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
 @@ -191,6 +191,12 @@ struct linux_nat_target *linux_target;
@@ -105,7 +99,7 @@ index 05344316a7..30a94b47c9 100644
  
        /* The process is definitely stopped.  It is in a job control
  	 stop, unless the kernel predates the TASK_STOPPED /
-@@ -1359,6 +1368,25 @@ get_detach_signal (struct lwp_info *lp)
+@@ -1358,6 +1367,25 @@ get_detach_signal (struct lwp_info *lp)
        return gdb_signal_to_host (signo);
      }
  
@@ -131,7 +125,7 @@ index 05344316a7..30a94b47c9 100644
    return 0;
  }
  
-@@ -1507,6 +1535,10 @@ linux_nat_target::detach (inferior *inf, int from_tty)
+@@ -1506,6 +1534,10 @@ linux_nat_target::detach (inferior *inf, int from_tty)
        detach_one_lwp (main_lwp, &signo);
  
        detach_success (inf);
@@ -142,7 +136,7 @@ index 05344316a7..30a94b47c9 100644
      }
  }
  
-@@ -1765,6 +1797,16 @@ linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
+@@ -1764,6 +1796,16 @@ linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
        return;
      }
  
@@ -159,7 +153,7 @@ index 05344316a7..30a94b47c9 100644
    if (resume_many)
      iterate_over_lwps (ptid, linux_nat_resume_callback, lp);
  
-@@ -3754,6 +3796,10 @@ linux_nat_target::mourn_inferior ()
+@@ -3760,6 +3802,10 @@ linux_nat_target::mourn_inferior ()
  
    /* Let the arch-specific native code know this process is gone.  */
    linux_target->low_forget_process (pid);
@@ -171,7 +165,6 @@ index 05344316a7..30a94b47c9 100644
  
  /* Convert a native/host siginfo object, into/from the siginfo in the
 diff --git a/gdb/testsuite/gdb.threads/attach-stopped.exp b/gdb/testsuite/gdb.threads/attach-stopped.exp
-index a3916c6354..9f004b4179 100644
 --- a/gdb/testsuite/gdb.threads/attach-stopped.exp
 +++ b/gdb/testsuite/gdb.threads/attach-stopped.exp
 @@ -56,7 +56,65 @@ proc corefunc { threadtype } {

gdb-jit-reader-multilib.patch

@@ -3,16 +3,13 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-jit-reader-multilib.patch
 
-FileName: gdb-jit-reader-multilib.patch
-
 ;; Fix jit-reader.h for multi-lib.
 ;;=push+jan
 
 diff --git a/gdb/configure b/gdb/configure
-index 3b604feb11..9f236ae26a 100755
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -9594,10 +9594,12 @@ _ACEOF
+@@ -9680,10 +9680,12 @@ _ACEOF
  
  
  
@@ -29,10 +26,9 @@ index 3b604feb11..9f236ae26a 100755
    TARGET_PTR="unsigned __int128"
  else
 diff --git a/gdb/configure.ac b/gdb/configure.ac
-index c707e7b152..dc0acd035b 100644
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -837,10 +837,12 @@ AC_CHECK_SIZEOF(unsigned long long)
+@@ -843,10 +843,12 @@ AC_CHECK_SIZEOF(unsigned long long)
  AC_CHECK_SIZEOF(unsigned long)
  AC_CHECK_SIZEOF(unsigned __int128)
  

gdb-libexec-add-index.patch

@@ -3,13 +3,10 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-libexec-add-index.patch
 
-FileName: gdb-libexec-add-index.patch
-
 ;; Fix gdb-headless /usr/bin/ executables (BZ 1390251).
 ;;=fedora
 
 diff --git a/gdb/contrib/gdb-add-index.sh b/gdb/contrib/gdb-add-index.sh
-index 71146966ab..500b2f62d5 100755
 --- a/gdb/contrib/gdb-add-index.sh
 +++ b/gdb/contrib/gdb-add-index.sh
 @@ -21,6 +21,11 @@

gdb-lineno-makeup-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-lineno-makeup-test.patch
 
-FileName: gdb-lineno-makeup-test.patch
-
 ;; Testcase for "Do not make up line information" fix by Daniel Jacobowitz.
 ;;=fedoratest
 

gdb-linux_perf-bundle.patch

@@ -3,16 +3,13 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-linux_perf-bundle.patch
 
-FileName: gdb-linux_perf-bundle.patch
-
 ;; [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 ;;=fedora
 
 diff --git a/gdb/configure b/gdb/configure
-index a2d480c1e5..4f102c3ede 100755
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -11973,7 +11973,7 @@ else
+@@ -12059,7 +12059,7 @@ else
  
  #include <linux/perf_event.h>
  #ifndef PERF_ATTR_SIZE_VER5
@@ -22,20 +19,18 @@ index a2d480c1e5..4f102c3ede 100755
  
  _ACEOF
 diff --git a/gdb/configure.ac b/gdb/configure.ac
-index 57ebcaeb08..1840f91651 100644
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -1471,7 +1471,7 @@ else
+@@ -1477,7 +1477,7 @@ else
-   AC_PREPROC_IFELSE(AC_LANG_SOURCE([[
+   AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
  #include <linux/perf_event.h>
  #ifndef PERF_ATTR_SIZE_VER5
 -# error
 +// error // PERF_ATTR_SIZE_VER5_BUNDLE is not available here - Fedora+RHEL
  #endif
-   ]]), [perf_event=yes], [perf_event=no])
+   ]])], [perf_event=yes], [perf_event=no])
    if test "$perf_event" != yes; then
 diff --git a/gdb/gdb.c b/gdb/gdb.c
-index b97500e579..151545105c 100644
 --- a/gdb/gdb.c
 +++ b/gdb/gdb.c
 @@ -20,11 +20,19 @@
@@ -59,7 +54,6 @@ index b97500e579..151545105c 100644
    args.argc = argc;
    args.argv = argv;
 diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h
-index 118030190d..ba4e618b11 100644
 --- a/gdb/nat/linux-btrace.h
 +++ b/gdb/nat/linux-btrace.h
 @@ -28,6 +28,177 @@

gdb-moribund-utrace-workaround.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-moribund-utrace-workaround.patch
 
-FileName: gdb-moribund-utrace-workaround.patch
-
 ;; Workaround non-stop moribund locations exploited by kernel utrace (BZ 590623).
 ;;=push+jan: Currently it is still not fully safe.
 
@@ -14,10 +12,9 @@ http://sources.redhat.com/bugzilla/show_bug.cgi?id=11593
 Bug in FSF GDB exploited by the ptrace-on-utrace interaction.
 
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
-index 305bb3f6c0..0106ce8dd5 100644
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
-@@ -12017,6 +12017,8 @@ update_global_location_list (enum ugll_insert_mode insert_mode)
+@@ -12013,6 +12013,8 @@ update_global_location_list (enum ugll_insert_mode insert_mode)
  		 traps we can no longer explain.  */
  
  	      old_loc->events_till_retirement = 3 * (thread_count () + 1);

gdb-opcodes-clflushopt-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-opcodes-clflushopt-test.patch
 
-FileName: gdb-opcodes-clflushopt-test.patch
-
 ;; Test clflushopt instruction decode (for RH BZ 1262471).
 ;;=fedoratest
 

gdb-physname-pr11734-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-physname-pr11734-test.patch
 
-FileName: gdb-physname-pr11734-test.patch
-
 ;; Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
 ;;=fedoratest
 

gdb-physname-pr12273-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-physname-pr12273-test.patch
 
-FileName: gdb-physname-pr12273-test.patch
-
 ;; Fix regressions on C++ names resolving (PR 11734, PR 12273, Keith Seitz).
 ;;=fedoratest
 

gdb-ppc-power7-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-ppc-power7-test.patch
 
-FileName: gdb-ppc-power7-test.patch
-
 ;; Test power7 ppc disassembly.
 ;;=fedoratest
 

gdb-python-gil.patch

@@ -3,13 +3,10 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-python-gil.patch
 
-FileName: gdb-python-gil.patch
-
 ;; Fix Python GIL with gdb.execute("continue") (Phil Muldoon, BZ 1116957).
 ;;=push
 
 diff --git a/gdb/doc/python.texi b/gdb/doc/python.texi
-index 4182b60ca3..fb074faf43 100644
 --- a/gdb/doc/python.texi
 +++ b/gdb/doc/python.texi
 @@ -232,6 +232,14 @@ returned as a string.  The default is @code{False}, in which case the
@@ -28,7 +25,6 @@ index 4182b60ca3..fb074faf43 100644
  
  @findex gdb.breakpoints
 diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
-index 26400f4fba..b8e2d9049d 100644
 --- a/gdb/python/python-internal.h
 +++ b/gdb/python/python-internal.h
 @@ -148,6 +148,8 @@ typedef int Py_ssize_t;
@@ -41,7 +37,6 @@ index 26400f4fba..b8e2d9049d 100644
  #endif
  
 diff --git a/gdb/python/python.c b/gdb/python/python.c
-index db37331dc4..4233b37fa8 100644
 --- a/gdb/python/python.c
 +++ b/gdb/python/python.c
 @@ -556,12 +556,16 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)

gdb-readline62-ask-more-rh.patch

@@ -3,13 +3,10 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-readline62-ask-more-rh.patch
 
-FileName: gdb-readline62-ask-more-rh.patch
-
 ;; Work around readline-6.2 incompatibility not asking for --more-- (BZ 701131).
 ;;=fedora
 
 diff --git a/gdb/event-top.c b/gdb/event-top.c
-index d9379b42c5..44d9a8c4e6 100644
 --- a/gdb/event-top.c
 +++ b/gdb/event-top.c
 @@ -1183,6 +1183,13 @@ gdb_setup_readline (int editing)

gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
 
-FileName: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
-
 ;; Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 ;;=fedoratest
 

gdb-rhbz1007614-memleak-infpy_read_memory-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
 
-FileName: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
-
 ;; Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 ;;=fedoratest
 

gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
-FileName: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
-
 ;; Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 ;; Kratochvil, RH BZ 1084404).
 ;;=fedoratest

gdb-rhbz1149205-catch-syscall-after-fork-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 
-FileName: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
-
 ;; Fix '`catch syscall' doesn't work for parent after `fork' is called'
 ;; (Philippe Waroquiers, RH BZ 1149205).
 ;;=fedoratest

gdb-rhbz1156192-recursive-dlopen-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-rhbz1156192-recursive-dlopen-test.patch
 
-FileName: gdb-rhbz1156192-recursive-dlopen-test.patch
-
 ;; Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 ;; crash.' (RH BZ 1156192).
 ;;=fedoratest

gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
 
-FileName: gdb-rhbz1186476-internal-error-unqualified-name-re-set-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).

gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch

@@ -3,8 +3,6 @@ From: Fedora GDB patches <invalid@email.com>
 Date: Fri, 27 Oct 2017 21:07:50 +0200
 Subject: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 
-FileName: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
-
 ;; [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 ;;=fedoratest