Remove missing "^index .*" lines from patches, and regenerate them

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

@@ -306,7 +306,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-gstack-20050411.patch

@@ -16,7 +16,6 @@ FileName: gdb-6.3-gstack-20050411.patch
 	* gstack.sh, gstack.1: New files.
 
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index 5b650c6643..8c487916d2 100644
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
 @@ -1729,7 +1729,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force

gdb-6.3-ppc64displaysymbol-20041124.patch

@@ -15,7 +15,6 @@ 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,

gdb-6.3-ppc64syscall-20040622.patch

@@ -17,7 +17,6 @@ FileName: gdb-6.3-ppc64syscall-20040622.patch
 	"func_start".
 
 diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
-index ff4699c191..feed75fbf9 100644
 --- a/gdb/rs6000-tdep.c
 +++ b/gdb/rs6000-tdep.c
 @@ -134,6 +134,7 @@ static const char *powerpc_vector_abi_string = "auto";

gdb-6.3-readnever-20050907.patch

@@ -24,7 +24,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

@@ -15,7 +15,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-self-20050110.patch

@@ -17,7 +17,6 @@ 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} {

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

@@ -44,7 +44,6 @@ 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)

gdb-6.5-bz203661-emit-relocs.patch

@@ -9,7 +9,6 @@ FileName: gdb-6.5-bz203661-emit-relocs.patch
 ;;=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 a57bd6a593..e9875a08de 100644
 --- a/gdb/symfile.c
 +++ b/gdb/symfile.c
 @@ -3492,6 +3492,12 @@ default_symfile_relocate (struct objfile *objfile, asection *sectp,

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

@@ -34,7 +34,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,7 +127,6 @@ 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,
@@ -171,7 +169,6 @@ 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)
@@ -185,7 +182,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-solib-trampoline-lookup-lock-fix.patch

@@ -11,7 +11,6 @@ FileName: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
 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.6-buildid-locate-core-as-arg.patch

@@ -64,7 +64,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 +77,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 +119,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

@@ -28,7 +28,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

@@ -9,7 +9,6 @@ FileName: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 ;;=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 +32,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

@@ -12,7 +12,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,7 +99,6 @@ index 5af9d66899..2ff93191c7 100644
  {
    return strcoll (*ap, *bp);
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index cf0c887a2a..fa6744b377 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
 @@ -3469,6 +3469,16 @@ read_index_from_section (struct objfile *objfile,

gdb-6.6-buildid-locate-rpm.patch

@@ -8,7 +8,6 @@ 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 @@
@@ -234,7 +233,6 @@ index e0d38ea267..da5ac313e3 100644
  
  # Copyright (C) 2001, 2003, 2005, 2011 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,7 +701,6 @@ 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
@@ -1258,7 +1254,6 @@ 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,
@@ -1462,7 +1457,6 @@ 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)
@@ -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,7 +1501,6 @@ 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,

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

@@ -14,7 +14,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

@@ -9,7 +9,6 @@ FileName: gdb-6.6-buildid-locate.patch
 ;;=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 +832,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 +870,6 @@ index 15fb609409..1f62db0239 100644
  
  #endif /* BUILD_ID_H */
 diff --git a/gdb/coffread.c b/gdb/coffread.c
-index 5345fb7998..66d725d4a3 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 +883,6 @@ index 5345fb7998..66d725d4a3 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 @@
@@ -983,7 +979,6 @@ index c6175279da..76945950b9 100644
 +			   &setlist, &showlist);
  }
 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
-index 62ba1d25a4..06a8d6d2b3 100644
 --- a/gdb/doc/gdb.texinfo
 +++ b/gdb/doc/gdb.texinfo
 @@ -19561,6 +19561,27 @@ information files.
@@ -1015,7 +1010,6 @@ index 62ba1d25a4..06a8d6d2b3 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 7fe15e5d05..901ebeb4e5 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
 @@ -2683,7 +2683,7 @@ dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile)
@@ -1028,7 +1022,6 @@ index 7fe15e5d05..901ebeb4e5 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 +1047,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 +1061,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 +1082,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,7 +1148,6 @@ 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
@@ -1173,7 +1162,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 +1199,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,7 +1210,6 @@ 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 ee66a38e08..83f2854faa 100644
 --- a/gdb/testsuite/lib/gdb.exp
 +++ b/gdb/testsuite/lib/gdb.exp
 @@ -1694,6 +1694,16 @@ proc default_gdb_start { } {
@@ -1244,7 +1230,6 @@ index ee66a38e08..83f2854faa 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-scheduler_locking-step-is-default.patch

@@ -9,7 +9,6 @@ FileName: gdb-6.6-scheduler_locking-step-is-default.patch
 ;;=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[] = {
@@ -22,7 +21,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 +33,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 +46,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 +67,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

@@ -9,7 +9,6 @@ FileName: gdb-6.6-testsuite-timeouts.patch
 ;;=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 +21,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-testsuite-stable-results.patch

@@ -28,7 +28,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 +60,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

@@ -9,7 +9,6 @@ FileName: gdb-6.8-bz436037-reg-no-longer-active.patch
 ;;=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

@@ -11,7 +11,6 @@ FileName: gdb-6.8-bz442765-threaded-exec-test.patch
 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 +150,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-quit-never-aborts.patch

@@ -16,7 +16,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 +30,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,7 +45,6 @@ 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)
@@ -65,7 +62,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 42d4225595..8f9159bfa6 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

@@ -9,7 +9,6 @@ FileName: gdb-6.8-sparc64-silence-memcpy-check.patch
 ;;=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,

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

@@ -19,7 +19,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-pie-addons-keep-disabled.patch

@@ -8,7 +8,6 @@ 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)
@@ -63,7 +62,6 @@ 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);
@@ -77,7 +75,6 @@ index 4223158fbc..407cc531db 100644
  extern void print_breakpoint (breakpoint *bp);
  
 diff --git a/gdb/objfiles.c b/gdb/objfiles.c
-index 0432ce6208..c009a40b09 100644
 --- a/gdb/objfiles.c
 +++ b/gdb/objfiles.c
 @@ -875,6 +875,11 @@ objfile_relocate1 (struct objfile *objfile,

gdb-archer-pie-addons.patch

@@ -8,7 +8,6 @@ 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
@@ -52,7 +51,6 @@ 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 6bb6b8eb61..3e0b2ff883 100644
 --- a/gdb/value.c
 +++ b/gdb/value.c
 @@ -2829,7 +2829,8 @@ value_static_field (struct type *type, int fieldno)

gdb-archer-vla-tests.patch

@@ -8,7 +8,6 @@ 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 +1085,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 +1102,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,7 +3689,6 @@ 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 83f2854faa..4402f78f79 100644
 --- a/gdb/testsuite/lib/gdb.exp
 +++ b/gdb/testsuite/lib/gdb.exp
 @@ -169,6 +169,11 @@ proc gdb_unload {} {
@@ -3708,7 +3704,6 @@ index 83f2854faa..4402f78f79 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

@@ -17,7 +17,6 @@ commit 718a1618b2f691a7f407213bb50f100ac59f91c3
 tromey/python
 
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index 8c487916d2..cbbefb91af 100644
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
 @@ -2096,6 +2096,12 @@ stamp-h: $(srcdir)/config.in config.status
@@ -34,7 +33,6 @@ index 8c487916d2..cbbefb91af 100644
  	$(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 = \
@@ -56,7 +54,6 @@ index 5c7c0b4c2e..2014607e9e 100644
  	gdb/printer/bound_registers.py
  
 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
-index 06a8d6d2b3..2fc7a46f46 100644
 --- a/gdb/doc/gdb.texinfo
 +++ b/gdb/doc/gdb.texinfo
 @@ -1245,6 +1245,16 @@ for remote debugging.
@@ -77,7 +74,6 @@ index 06a8d6d2b3..2fc7a46f46 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 +86,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 +105,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 @@
@@ -458,7 +452,6 @@ 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
@@ -472,7 +465,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 f5829d6c08..a2a849f77d 100644
 --- a/gdb/python/python.c
 +++ b/gdb/python/python.c
 @@ -95,6 +95,8 @@ const struct extension_language_defn extension_language_python =
@@ -617,7 +609,6 @@ index f5829d6c08..a2a849f77d 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 +619,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 +631,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 +658,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 +676,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

@@ -45,7 +45,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,7 +68,6 @@ 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
@@ -138,7 +136,6 @@ 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
@@ -153,7 +150,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,7 +173,6 @@ 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
@@ -246,7 +241,6 @@ 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
@@ -261,7 +255,6 @@ 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 ()
@@ -283,7 +276,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 +298,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,7 +347,6 @@ 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);

gdb-btrobust.patch

@@ -14,7 +14,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

@@ -80,7 +80,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

@@ -30,7 +30,6 @@ 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)

gdb-bz541866-rwatch-before-run.patch

@@ -10,7 +10,6 @@ FileName: gdb-bz541866-rwatch-before-run.patch
 ;;=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,
@@ -98,7 +97,6 @@ new file mode 100644
 +
 +#endif /* NM_LINUX64_H */
 diff --git a/gdb/configure.nat b/gdb/configure.nat
-index bcaeaf4583..28babcf0ad 100644
 --- a/gdb/configure.nat
 +++ b/gdb/configure.nat
 @@ -237,6 +237,7 @@ case ${gdb_host} in
@@ -118,7 +116,6 @@ index bcaeaf4583..28babcf0ad 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

gdb-bz568248-oom-is-error.patch

@@ -53,7 +53,6 @@ gdb/
 	* utils.c (nomem): Change internal_error to error.
 
 diff --git a/gdb/utils.c b/gdb/utils.c
-index a2e933bc8d..c69c01efc1 100644
 --- a/gdb/utils.c
 +++ b/gdb/utils.c
 @@ -746,13 +746,11 @@ malloc_failure (long size)

gdb-ccache-workaround.patch

@@ -9,7 +9,6 @@ FileName: gdb-ccache-workaround.patch
 ;;=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

@@ -9,7 +9,6 @@ FileName: gdb-container-rh-pkg.patch
 ;;=fedora
 
 diff --git a/gdb/remote.c b/gdb/remote.c
-index 9eed75aa8c..ffaf01fa7d 100644
 --- a/gdb/remote.c
 +++ b/gdb/remote.c
 @@ -14048,7 +14048,17 @@ remote_target::pid_to_exec_file (int pid)

gdb-core-open-vdso-warning.patch

@@ -19,7 +19,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

@@ -11,7 +11,6 @@ FileName: gdb-dts-rhel6-python-compat.patch
 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

@@ -12,7 +12,6 @@ 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
@@ -50,7 +49,6 @@ 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

gdb-follow-child-stale-parent.patch

@@ -24,7 +24,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-glibc-strstr-workaround.patch

@@ -9,7 +9,6 @@ FileName: gdb-glibc-strstr-workaround.patch
 ;;=fedora: Compatibility with RHELs (unchecked which ones).
 
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 901ebeb4e5..76884243fe 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
 @@ -21272,6 +21272,26 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu,

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

@@ -42,7 +42,6 @@ gdb/
 	* dwarf2read.c (process_die): Change gdb_assert to complaint.
 
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index ae1c86acfe..cf0c887a2a 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
 @@ -10491,6 +10491,13 @@ private:
@@ -60,7 +59,6 @@ index ae1c86acfe..cf0c887a2a 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 \
@@ -78,7 +76,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;
@@ -170,7 +167,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

@@ -9,7 +9,6 @@ FileName: gdb-jit-reader-multilib.patch
 ;;=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
@@ -29,7 +28,6 @@ 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)

gdb-libexec-add-index.patch

@@ -9,7 +9,6 @@ FileName: gdb-libexec-add-index.patch
 ;;=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-linux_perf-bundle.patch

@@ -9,7 +9,6 @@ FileName: gdb-linux_perf-bundle.patch
 ;;=fedora
 
 diff --git a/gdb/configure b/gdb/configure
-index a2d480c1e5..4f102c3ede 100755
 --- a/gdb/configure
 +++ b/gdb/configure
 @@ -11973,7 +11973,7 @@ else
@@ -22,7 +21,6 @@ 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
@@ -35,7 +33,6 @@ index 57ebcaeb08..1840f91651 100644
    ]]), [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 +56,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

@@ -14,7 +14,6 @@ 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)

gdb-python-gil.patch

@@ -9,7 +9,6 @@ FileName: gdb-python-gil.patch
 ;;=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 +27,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 +39,6 @@ index 26400f4fba..b8e2d9049d 100644
  #endif
  
 diff --git a/gdb/python/python.c b/gdb/python/python.c
-index c29e7d7a6b..f5829d6c08 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

@@ -9,7 +9,6 @@ FileName: gdb-readline62-ask-more-rh.patch
 ;;=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-rhbz1350436-type-printers-error.patch

@@ -15,7 +15,6 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1350436
 https://sourceware.org/ml/gdb-patches/2016-06/msg00455.html
 
 diff --git a/gdb/testsuite/gdb.python/py-typeprint.cc b/gdb/testsuite/gdb.python/py-typeprint.cc
-index 8135a5aa26..fb961f347d 100644
 --- a/gdb/testsuite/gdb.python/py-typeprint.cc
 +++ b/gdb/testsuite/gdb.python/py-typeprint.cc
 @@ -31,6 +31,12 @@ templ<basic_string> s;
@@ -32,7 +31,6 @@ index 8135a5aa26..fb961f347d 100644
  {
    return 0;
 diff --git a/gdb/testsuite/gdb.python/py-typeprint.exp b/gdb/testsuite/gdb.python/py-typeprint.exp
-index 15135b6f12..885457a853 100644
 --- a/gdb/testsuite/gdb.python/py-typeprint.exp
 +++ b/gdb/testsuite/gdb.python/py-typeprint.exp
 @@ -50,3 +50,7 @@ gdb_test_no_output "enable type-printer string"
@@ -44,7 +42,6 @@ index 15135b6f12..885457a853 100644
 +	 "info type-printers for other"
 +gdb_test "whatis ovar" "type = Another"
 diff --git a/gdb/testsuite/gdb.python/py-typeprint.py b/gdb/testsuite/gdb.python/py-typeprint.py
-index db5ea71b3b..69fc8c3886 100644
 --- a/gdb/testsuite/gdb.python/py-typeprint.py
 +++ b/gdb/testsuite/gdb.python/py-typeprint.py
 @@ -15,7 +15,7 @@

gdb-rhbz795424-bitpos-20of25.patch

@@ -473,7 +473,6 @@ Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=bitpos-main.patch
 
 diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
-index 908b83a49a..dd69f50785 100644
 --- a/gdb/aarch64-linux-nat.c
 +++ b/gdb/aarch64-linux-nat.c
 @@ -743,7 +743,7 @@ aarch64_linux_nat_target::remove_watchpoint (CORE_ADDR addr, int len,
@@ -486,7 +485,6 @@ index 908b83a49a..dd69f50785 100644
    return aarch64_linux_region_ok_for_watchpoint (addr, len);
  }
 diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
-index 64bddc2670..e90e901027 100644
 --- a/gdb/ada-lang.c
 +++ b/gdb/ada-lang.c
 @@ -78,7 +78,7 @@ static struct type *desc_bounds_type (struct type *);
@@ -873,7 +871,6 @@ index 64bddc2670..e90e901027 100644
  
        TYPE_FIELD_BITSIZE (result, 0) = TYPE_FIELD_BITSIZE (type0, 0);
 diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
-index a4192fc8a5..5a84ca8a35 100644
 --- a/gdb/ada-lang.h
 +++ b/gdb/ada-lang.h
 @@ -175,7 +175,7 @@ extern void ada_print_type (struct type *, const char *, struct ui_file *, int,
@@ -904,7 +901,6 @@ index a4192fc8a5..5a84ca8a35 100644
  
  extern struct type *ada_coerce_to_simple_array_type (struct type *);
 diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
-index 47ce897d01..9ef9b3c2f9 100644
 --- a/gdb/ada-typeprint.c
 +++ b/gdb/ada-typeprint.c
 @@ -896,8 +896,8 @@ ada_print_type (struct type *type0, const char *varstring,
@@ -929,7 +925,6 @@ index 47ce897d01..9ef9b3c2f9 100644
        case TYPE_CODE_ENUM:
  	if (show < 0)
 diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
-index a4869198a4..da5a9327e1 100644
 --- a/gdb/ada-valprint.c
 +++ b/gdb/ada-valprint.c
 @@ -34,11 +34,11 @@
@@ -1077,7 +1072,6 @@ index a4869198a4..da5a9327e1 100644
  	       struct value *val,
  	       const struct value_print_options *options)
 diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
-index 186690af30..338a0f2c87 100644
 --- a/gdb/amd64-tdep.c
 +++ b/gdb/amd64-tdep.c
 @@ -729,7 +729,7 @@ amd64_return_value (struct gdbarch *gdbarch, struct value *function,
@@ -1106,7 +1100,6 @@ index 186690af30..338a0f2c87 100644
      }
  
 diff --git a/gdb/annotate.c b/gdb/annotate.c
-index 495aa2dba6..45e486ae64 100644
 --- a/gdb/annotate.c
 +++ b/gdb/annotate.c
 @@ -531,21 +531,21 @@ annotate_frame_end (void)
@@ -1136,7 +1129,6 @@ index 495aa2dba6..45e486ae64 100644
  
  void
 diff --git a/gdb/annotate.h b/gdb/annotate.h
-index 1b9d9dd034..d79ccc56ed 100644
 --- a/gdb/annotate.h
 +++ b/gdb/annotate.h
 @@ -102,8 +102,8 @@ extern void annotate_frame_source_end (void);
@@ -1151,7 +1143,6 @@ index 1b9d9dd034..d79ccc56ed 100644
  extern void annotate_elt (void);
  extern void annotate_array_section_end (void);
 diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
-index e3cce491ee..d3117bdaa1 100644
 --- a/gdb/arch-utils.c
 +++ b/gdb/arch-utils.c
 @@ -228,7 +228,7 @@ legacy_virtual_frame_pointer (struct gdbarch *gdbarch,
@@ -1164,7 +1155,6 @@ index e3cce491ee..d3117bdaa1 100644
    const struct floatformat **format = NULL;
  
 diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h
-index 77ee9af2bf..e0bd701d5e 100644
 --- a/gdb/arch-utils.h
 +++ b/gdb/arch-utils.h
 @@ -131,7 +131,7 @@ extern gdbarch_virtual_frame_pointer_ftype legacy_virtual_frame_pointer;
@@ -1177,7 +1167,6 @@ index 77ee9af2bf..e0bd701d5e 100644
  extern CORE_ADDR generic_skip_trampoline_code (struct frame_info *frame,
  					       CORE_ADDR pc);
 diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
-index 30030b4eb0..8e2abfb70c 100644
 --- a/gdb/arm-linux-nat.c
 +++ b/gdb/arm-linux-nat.c
 @@ -1104,7 +1104,7 @@ arm_linux_nat_target::remove_hw_breakpoint (struct gdbarch *gdbarch,
@@ -1190,7 +1179,6 @@ index 30030b4eb0..8e2abfb70c 100644
    const struct arm_linux_hwbp_cap *cap = arm_linux_get_hwbp_cap ();
    CORE_ADDR max_wp_length, aligned_addr;
 diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
-index 9a44d4b750..9961d92042 100644
 --- a/gdb/ax-gdb.c
 +++ b/gdb/ax-gdb.c
 @@ -82,12 +82,12 @@ static void gen_traced_pop (struct agent_expr *, struct axs_value *);
@@ -1290,7 +1278,6 @@ index 9a44d4b750..9961d92042 100644
    int i, rslt;
    int nbases = TYPE_N_BASECLASSES (type);
 diff --git a/gdb/ax-general.c b/gdb/ax-general.c
-index 360e91bf31..0804f1f907 100644
 --- a/gdb/ax-general.c
 +++ b/gdb/ax-general.c
 @@ -177,7 +177,7 @@ ax_zero_ext (struct agent_expr *x, int n)
@@ -1303,7 +1290,6 @@ index 360e91bf31..0804f1f907 100644
    /* N must fit in a byte.  */
    if (n < 0 || n > 255)
 diff --git a/gdb/ax.h b/gdb/ax.h
-index 6066b77076..d1c9d35030 100644
 --- a/gdb/ax.h
 +++ b/gdb/ax.h
 @@ -193,7 +193,7 @@ extern void ax_ext (struct agent_expr *EXPR, int N);
@@ -1316,7 +1302,6 @@ index 6066b77076..d1c9d35030 100644
  /* Append a goto op to EXPR.  OP is the actual op (must be aop_goto or
     aop_if_goto).  We assume we don't know the target offset yet,
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
-index 0106ce8dd5..fe3a2d1350 100644
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
 @@ -2053,9 +2053,9 @@ should_be_inserted (struct bp_location *bl)
@@ -1350,7 +1335,6 @@ index 0106ce8dd5..fe3a2d1350 100644
  
  		  len = (target_exact_watchpoints
 diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
-index 407cc531db..bc833e57eb 100644
 --- a/gdb/breakpoint.h
 +++ b/gdb/breakpoint.h
 @@ -251,7 +251,7 @@ struct bp_target_info
@@ -1372,7 +1356,6 @@ index 407cc531db..bc833e57eb 100644
    /* Type of hardware watchpoint.  */
    target_hw_bp_type watchpoint_type {};
 diff --git a/gdb/c-lang.c b/gdb/c-lang.c
-index 6bbb470957..307eee32c4 100644
 --- a/gdb/c-lang.c
 +++ b/gdb/c-lang.c
 @@ -185,7 +185,7 @@ c_printchar (int c, struct type *type, struct ui_file *stream)
@@ -1403,7 +1386,6 @@ index 6bbb470957..307eee32c4 100644
  		if (get_discrete_bounds (TYPE_INDEX_TYPE (expect_type),
  					 &low_bound, &high_bound) < 0)
 diff --git a/gdb/c-lang.h b/gdb/c-lang.h
-index 18dedcc1fa..8afd3ee784 100644
 --- a/gdb/c-lang.h
 +++ b/gdb/c-lang.h
 @@ -77,7 +77,7 @@ extern void c_print_typedef (struct type *,
@@ -1425,7 +1407,6 @@ index 18dedcc1fa..8afd3ee784 100644
  			int force_ellipses,
  			const struct value_print_options *options);
 diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
-index cb793f0770..fad41891e2 100644
 --- a/gdb/c-typeprint.c
 +++ b/gdb/c-typeprint.c
 @@ -934,7 +934,8 @@ c_print_type_union_field_offset (struct type *type, unsigned int field_idx,
@@ -1450,7 +1431,6 @@ index cb793f0770..fad41891e2 100644
  
  	  print_spaces_filtered (OFFSET_SPC_LEN, stream);
 diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
-index 3904fab260..a3b8e2551b 100644
 --- a/gdb/c-valprint.c
 +++ b/gdb/c-valprint.c
 @@ -247,7 +247,7 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
@@ -1492,7 +1472,6 @@ index 3904fab260..a3b8e2551b 100644
  	     struct value *original_value,
  	     const struct value_print_options *options)
 diff --git a/gdb/compile/compile-c-support.c b/gdb/compile/compile-c-support.c
-index e694648288..43ed5a375a 100644
 --- a/gdb/compile/compile-c-support.c
 +++ b/gdb/compile/compile-c-support.c
 @@ -307,11 +307,11 @@ generate_register_struct (struct ui_file *stream, struct gdbarch *gdbarch,
@@ -1510,7 +1489,6 @@ index e694648288..43ed5a375a 100644
  	    fputs_unfiltered (";\n", stream);
  	  }
 diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
-index eb2f01444d..2f65bffa1d 100644
 --- a/gdb/cp-abi.c
 +++ b/gdb/cp-abi.c
 @@ -64,12 +64,12 @@ is_operator_name (const char *name)
@@ -1538,7 +1516,6 @@ index eb2f01444d..2f65bffa1d 100644
    if ((current_cp_abi.virtual_fn_field) == NULL)
      return NULL;
 diff --git a/gdb/cp-abi.h b/gdb/cp-abi.h
-index 8f2e4d9a66..86490a2c46 100644
 --- a/gdb/cp-abi.h
 +++ b/gdb/cp-abi.h
 @@ -108,7 +108,7 @@ extern struct value *value_virtual_fn_field (struct value **valuep,
@@ -1585,7 +1562,6 @@ index 8f2e4d9a66..86490a2c46 100644
  			    struct type *type,
  			    struct ui_file *stream);
 diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
-index e019a60791..25f1512857 100644
 --- a/gdb/cp-valprint.c
 +++ b/gdb/cp-valprint.c
 @@ -335,7 +335,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
@@ -1598,7 +1574,6 @@ index e019a60791..25f1512857 100644
  
  		  if (valprint_check_validity (stream, i_type, i_offset, val))
 diff --git a/gdb/d-lang.h b/gdb/d-lang.h
-index 391ea8665b..a8e72ae506 100644
 --- a/gdb/d-lang.h
 +++ b/gdb/d-lang.h
 @@ -81,7 +81,7 @@ extern struct block_symbol d_lookup_nested_symbol (struct type *, const char *,
@@ -1611,7 +1586,6 @@ index 391ea8665b..a8e72ae506 100644
  			 struct value *val,
  			 const struct value_print_options *options);
 diff --git a/gdb/d-valprint.c b/gdb/d-valprint.c
-index 579d3c8c91..9dd430b2bc 100644
 --- a/gdb/d-valprint.c
 +++ b/gdb/d-valprint.c
 @@ -73,7 +73,7 @@ dynamic_array_type (struct type *type,
@@ -1624,7 +1598,6 @@ index 579d3c8c91..9dd430b2bc 100644
  	     struct value *val,
               const struct value_print_options *options)
 diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
-index 45814c747b..11d1231df2 100644
 --- a/gdb/dwarf2loc.c
 +++ b/gdb/dwarf2loc.c
 @@ -1817,7 +1817,7 @@ rw_pieced_value (struct value *v, struct value *from)
@@ -1688,7 +1661,6 @@ index 45814c747b..11d1231df2 100644
  
  	    if (subobj_byte_offset + len > max)
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 76884243fe..ae1c86acfe 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
 @@ -2021,11 +2021,11 @@ dwarf2_complex_location_expr_complaint (void)
@@ -1719,7 +1691,6 @@ index 76884243fe..ae1c86acfe 100644
  	      attr = dwarf2_attr (die, DW_AT_byte_size, cu);
  	      if (attr)
 diff --git a/gdb/eval.c b/gdb/eval.c
-index 50dde3ed4f..44259cd964 100644
 --- a/gdb/eval.c
 +++ b/gdb/eval.c
 @@ -295,7 +295,8 @@ evaluate_struct_tuple (struct value *struct_val,
@@ -1775,7 +1746,6 @@ index 50dde3ed4f..44259cd964 100644
  
  	  if (get_discrete_bounds (range_type, &low_bound, &high_bound) < 0)
 diff --git a/gdb/f-lang.c b/gdb/f-lang.c
-index 81922f73fb..9d19c114e2 100644
 --- a/gdb/f-lang.c
 +++ b/gdb/f-lang.c
 @@ -101,7 +101,7 @@ f_printchar (int c, struct type *type, struct ui_file *stream)
@@ -1788,7 +1758,6 @@ index 81922f73fb..9d19c114e2 100644
  {
    const char *type_encoding = f_get_encoding (type);
 diff --git a/gdb/f-lang.h b/gdb/f-lang.h
-index e9d0f3a857..9171a13bdf 100644
 --- a/gdb/f-lang.h
 +++ b/gdb/f-lang.h
 @@ -30,7 +30,7 @@ extern void f_yyerror (const char *);	/* Defined in f-exp.y */
@@ -1801,7 +1770,6 @@ index e9d0f3a857..9171a13bdf 100644
  			 struct value *,
  			 const struct value_print_options *);
 diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
-index b4067a8460..0772f359f0 100644
 --- a/gdb/f-valprint.c
 +++ b/gdb/f-valprint.c
 @@ -36,7 +36,7 @@
@@ -1861,7 +1829,6 @@ index b4067a8460..0772f359f0 100644
  	     struct value *original_value,
  	     const struct value_print_options *options)
 diff --git a/gdb/findvar.c b/gdb/findvar.c
-index 8ad5e25cb2..fcd0a0cdc9 100644
 --- a/gdb/findvar.c
 +++ b/gdb/findvar.c
 @@ -821,7 +821,7 @@ struct value *
@@ -1892,7 +1859,6 @@ index 8ad5e25cb2..fcd0a0cdc9 100644
        /* If the register length is larger than the number of bytes
           remaining to copy, then only copy the appropriate bytes.  */
 diff --git a/gdb/frame.c b/gdb/frame.c
-index c0f6e64dfc..215034f269 100644
 --- a/gdb/frame.c
 +++ b/gdb/frame.c
 @@ -1398,7 +1398,7 @@ deprecated_frame_register_read (struct frame_info *frame, int regnum,
@@ -1914,7 +1880,6 @@ index c0f6e64dfc..215034f269 100644
    /* Copy the data.  */
    while (len > 0)
 diff --git a/gdb/frame.h b/gdb/frame.h
-index a6f7fd8947..eb955346d5 100644
 --- a/gdb/frame.h
 +++ b/gdb/frame.h
 @@ -620,7 +620,7 @@ extern void put_frame_register (struct frame_info *frame, int regnum,
@@ -1927,7 +1892,6 @@ index a6f7fd8947..eb955346d5 100644
  				     int *optimizedp, int *unavailablep);
  
 diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
-index c430ebe52a..6196bf8541 100644
 --- a/gdb/gdbarch.c
 +++ b/gdb/gdbarch.c
 @@ -1795,7 +1795,7 @@ set_gdbarch_wchar_signed (struct gdbarch *gdbarch,
@@ -1940,7 +1904,6 @@ index c430ebe52a..6196bf8541 100644
    gdb_assert (gdbarch != NULL);
    gdb_assert (gdbarch->floatformat_for_type != NULL);
 diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
-index 09edcd5eb2..ccb3cf87b8 100644
 --- a/gdb/gdbarch.h
 +++ b/gdb/gdbarch.h
 @@ -193,8 +193,8 @@ extern void set_gdbarch_wchar_signed (struct gdbarch *gdbarch, int wchar_signed)
@@ -1955,7 +1918,6 @@ index 09edcd5eb2..ccb3cf87b8 100644
  
  /* For most targets, a pointer on the target and its representation as an
 diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
-index 7330430937..9258e61843 100755
 --- a/gdb/gdbarch.sh
 +++ b/gdb/gdbarch.sh
 @@ -385,7 +385,7 @@ v;int;wchar_signed;;;1;-1;1
@@ -1968,7 +1930,6 @@ index 7330430937..9258e61843 100755
  # For most targets, a pointer on the target and its representation as an
  # address in GDB have the same size and "look the same".  For such a
 diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
-index 99cd1bcb92..2a7ab244fb 100644
 --- a/gdb/gdbtypes.c
 +++ b/gdb/gdbtypes.c
 @@ -2925,7 +2925,7 @@ floatformat_from_type (const struct type *type)
@@ -2028,7 +1989,6 @@ index 99cd1bcb92..2a7ab244fb 100644
    struct type *type;
  
 diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
-index cf1346161d..330e14d831 100644
 --- a/gdb/gdbtypes.h
 +++ b/gdb/gdbtypes.h
 @@ -876,7 +876,7 @@ struct type
@@ -2059,7 +2019,6 @@ index cf1346161d..330e14d831 100644
  extern struct type *arch_integer_type (struct gdbarch *, int, int,
  				       const char *);
 diff --git a/gdb/gnu-v2-abi.c b/gdb/gnu-v2-abi.c
-index 8a64157c55..ef1f851a91 100644
 --- a/gdb/gnu-v2-abi.c
 +++ b/gdb/gnu-v2-abi.c
 @@ -82,7 +82,7 @@ gnuv2_is_operator_name (const char *name)
@@ -2100,7 +2059,6 @@ index 8a64157c55..ef1f851a91 100644
  				    embedded_offset, address, val);
  
 diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
-index ddbec13891..9334837c89 100644
 --- a/gdb/gnu-v3-abi.c
 +++ b/gdb/gnu-v3-abi.c
 @@ -109,7 +109,7 @@ build_gdb_vtable_type (struct gdbarch *arch)
@@ -2167,7 +2125,6 @@ index ddbec13891..9334837c89 100644
  
        if (BASETYPE_VIA_VIRTUAL (domain, i))
 diff --git a/gdb/go-lang.h b/gdb/go-lang.h
-index 84af9389e7..0691f3914e 100644
 --- a/gdb/go-lang.h
 +++ b/gdb/go-lang.h
 @@ -85,7 +85,7 @@ extern void go_print_type (struct type *type, const char *varstring,
@@ -2180,7 +2137,6 @@ index 84af9389e7..0691f3914e 100644
  			  struct value *val,
  			  const struct value_print_options *options);
 diff --git a/gdb/go-valprint.c b/gdb/go-valprint.c
-index eccf9a8181..4cca802e59 100644
 --- a/gdb/go-valprint.c
 +++ b/gdb/go-valprint.c
 @@ -86,7 +86,7 @@ print_go_string (struct type *type,
@@ -2193,7 +2149,6 @@ index eccf9a8181..4cca802e59 100644
  	      struct value *val,
  	      const struct value_print_options *options)
 diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
-index a0e872c01f..d67e2e40c5 100644
 --- a/gdb/i386-tdep.c
 +++ b/gdb/i386-tdep.c
 @@ -8177,7 +8177,7 @@ i386_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr,
@@ -2206,7 +2161,6 @@ index a0e872c01f..d67e2e40c5 100644
    if (len == 128 && name)
      if (strcmp (name, "__float128") == 0
 diff --git a/gdb/language.c b/gdb/language.c
-index 22199e0c0d..5b7c4871b2 100644
 --- a/gdb/language.c
 +++ b/gdb/language.c
 @@ -773,7 +773,7 @@ unk_lang_printchar (int c, struct type *type, struct ui_file *stream)
@@ -2228,7 +2182,6 @@ index 22199e0c0d..5b7c4871b2 100644
  		    struct value *val,
  		    const struct value_print_options *options)
 diff --git a/gdb/language.h b/gdb/language.h
-index 029de4a7ab..2c0308fa93 100644
 --- a/gdb/language.h
 +++ b/gdb/language.h
 @@ -188,7 +188,7 @@ struct language_defn
@@ -2250,7 +2203,6 @@ index 029de4a7ab..2c0308fa93 100644
  			  struct value *val,
  			  const struct value_print_options *options);
 diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c
-index 6e6434b846..9595d379f3 100644
 --- a/gdb/m2-lang.c
 +++ b/gdb/m2-lang.c
 @@ -103,10 +103,10 @@ m2_printchar (int c, struct type *type, struct ui_file *stream)
@@ -2288,7 +2240,6 @@ index 6e6434b846..9595d379f3 100644
  	  things_printed += options->repeat_count_threshold;
  	  need_comma = 1;
 diff --git a/gdb/m2-lang.h b/gdb/m2-lang.h
-index d7e1aec673..67f98f7d10 100644
 --- a/gdb/m2-lang.h
 +++ b/gdb/m2-lang.h
 @@ -34,7 +34,7 @@ extern void m2_print_typedef (struct type *, struct symbol *,
@@ -2301,7 +2252,6 @@ index d7e1aec673..67f98f7d10 100644
  			  struct value *,
  			  const struct value_print_options *);
 diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
-index 27e9429211..4578ca2954 100644
 --- a/gdb/m2-typeprint.c
 +++ b/gdb/m2-typeprint.c
 @@ -234,9 +234,12 @@ static void m2_array (struct type *type, struct ui_file *stream,
@@ -2321,7 +2271,6 @@ index 27e9429211..4578ca2954 100644
    fprintf_filtered (stream, "] OF ");
    m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);
 diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c
-index 63c1560c6f..6991403f15 100644
 --- a/gdb/m2-valprint.c
 +++ b/gdb/m2-valprint.c
 @@ -35,7 +35,7 @@ static int print_unpacked_pointer (struct type *type,
@@ -2394,7 +2343,6 @@ index 63c1560c6f..6991403f15 100644
  
  	  fputs_filtered ("{", stream);
 diff --git a/gdb/memrange.c b/gdb/memrange.c
-index 2a337cc3cd..74f4c95ca9 100644
 --- a/gdb/memrange.c
 +++ b/gdb/memrange.c
 @@ -22,8 +22,8 @@
@@ -2409,7 +2357,6 @@ index 2a337cc3cd..74f4c95ca9 100644
    ULONGEST h, l;
  
 diff --git a/gdb/memrange.h b/gdb/memrange.h
-index 46088ade53..038cd2f92c 100644
 --- a/gdb/memrange.h
 +++ b/gdb/memrange.h
 @@ -28,7 +28,7 @@ struct mem_range
@@ -2440,7 +2387,6 @@ index 46088ade53..038cd2f92c 100644
  /* Returns true if ADDR is in RANGE.  */
  
 diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
-index 36831071fb..fe59c80c32 100644
 --- a/gdb/mips-linux-nat.c
 +++ b/gdb/mips-linux-nat.c
 @@ -614,7 +614,7 @@ mips_linux_nat_target::stopped_data_address (CORE_ADDR *paddr)
@@ -2453,7 +2399,6 @@ index 36831071fb..fe59c80c32 100644
    struct pt_watch_regs dummy_regs;
    int i;
 diff --git a/gdb/nat/x86-dregs.c b/gdb/nat/x86-dregs.c
-index 7604a36342..1ea4a3b107 100644
 --- a/gdb/nat/x86-dregs.c
 +++ b/gdb/nat/x86-dregs.c
 @@ -380,7 +380,7 @@ x86_remove_aligned_watchpoint (struct x86_debug_reg_state *state,
@@ -2475,7 +2420,6 @@ index 7604a36342..1ea4a3b107 100644
    int nregs;
  
 diff --git a/gdb/nat/x86-dregs.h b/gdb/nat/x86-dregs.h
-index e86e83aea0..4ce1a979a3 100644
 --- a/gdb/nat/x86-dregs.h
 +++ b/gdb/nat/x86-dregs.h
 @@ -116,7 +116,7 @@ extern int x86_dr_remove_watchpoint (struct x86_debug_reg_state *state,
@@ -2488,7 +2432,6 @@ index e86e83aea0..4ce1a979a3 100644
  /* If the inferior has some break/watchpoint that triggered, set the
     address associated with that break/watchpoint and return true.
 diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
-index 8af63f7620..62b8d4777b 100644
 --- a/gdb/opencl-lang.c
 +++ b/gdb/opencl-lang.c
 @@ -76,11 +76,11 @@ builtin_opencl_type (struct gdbarch *gdbarch)
@@ -2560,7 +2503,6 @@ index 8af63f7620..62b8d4777b 100644
        if (!value_bits_synthetic_pointer (c->val,
  					 c->indices[i] * elsize + comp_offset,
 diff --git a/gdb/p-lang.c b/gdb/p-lang.c
-index 3ff7f5694f..b3684d93fa 100644
 --- a/gdb/p-lang.c
 +++ b/gdb/p-lang.c
 @@ -93,8 +93,8 @@ pascal_main_name (void)
@@ -2611,7 +2553,6 @@ index 3ff7f5694f..b3684d93fa 100644
  	  things_printed += options->repeat_count_threshold;
  	  need_comma = 1;
 diff --git a/gdb/p-lang.h b/gdb/p-lang.h
-index 61ee752fe7..5510447e3f 100644
 --- a/gdb/p-lang.h
 +++ b/gdb/p-lang.h
 @@ -36,7 +36,7 @@ extern void pascal_print_type (struct type *, const char *, struct ui_file *,
@@ -2640,7 +2581,6 @@ index 61ee752fe7..5510447e3f 100644
  
  extern struct type **const pascal_builtin_types[];
 diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
-index 933dbfb6c4..e5c1b07040 100644
 --- a/gdb/p-valprint.c
 +++ b/gdb/p-valprint.c
 @@ -60,7 +60,7 @@ static const struct generic_val_print_decorations p_decorations =
@@ -2664,7 +2604,6 @@ index 933dbfb6c4..e5c1b07040 100644
    CORE_ADDR addr;
    int want_space = 0;
 diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
-index eb21f91c13..9e188a0ec3 100644
 --- a/gdb/ppc-linux-nat.c
 +++ b/gdb/ppc-linux-nat.c
 @@ -1313,7 +1313,7 @@ ppc_linux_nat_target::can_use_hw_breakpoint (enum bptype type, int cnt, int ot)
@@ -2677,7 +2616,6 @@ index eb21f91c13..9e188a0ec3 100644
    /* Handle sub-8-byte quantities.  */
    if (len <= 0)
 diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
-index 5716f82810..bf54f2690d 100644
 --- a/gdb/ppc-linux-tdep.c
 +++ b/gdb/ppc-linux-tdep.c
 @@ -1705,7 +1705,7 @@ ppc_init_linux_record_tdep (struct linux_record_tdep *record_tdep,
@@ -2690,7 +2628,6 @@ index 5716f82810..bf54f2690d 100644
    if (len == 128 && name)
      {
 diff --git a/gdb/printcmd.c b/gdb/printcmd.c
-index c921022a59..f34b1535af 100644
 --- a/gdb/printcmd.c
 +++ b/gdb/printcmd.c
 @@ -275,7 +275,7 @@ print_formatted (struct value *val, int size,
@@ -2712,7 +2649,6 @@ index c921022a59..f34b1535af 100644
  
    /* String printing should go through val_print_scalar_formatted.  */
 diff --git a/gdb/procfs.c b/gdb/procfs.c
-index 70619f1c15..ca7cc221f9 100644
 --- a/gdb/procfs.c
 +++ b/gdb/procfs.c
 @@ -3358,7 +3358,7 @@ procfs_target::remove_watchpoint (CORE_ADDR addr, int len,
@@ -2725,7 +2661,6 @@ index 70619f1c15..ca7cc221f9 100644
    /* The man page for proc(4) on Solaris 2.6 and up says that the
       system can support "thousands" of hardware watchpoints, but gives
 diff --git a/gdb/regcache.c b/gdb/regcache.c
-index 83bcbd22a3..f810752102 100644
 --- a/gdb/regcache.c
 +++ b/gdb/regcache.c
 @@ -846,7 +846,7 @@ regcache::cooked_write (int regnum, const gdb_byte *buf)
@@ -2813,7 +2748,6 @@ index 83bcbd22a3..f810752102 100644
  {
    gdb_assert (regnum >= 0 && regnum < m_descr->nr_cooked_registers);
 diff --git a/gdb/regcache.h b/gdb/regcache.h
-index d7bb8b5c93..06f878ab01 100644
 --- a/gdb/regcache.h
 +++ b/gdb/regcache.h
 @@ -74,9 +74,9 @@ extern LONGEST regcache_raw_get_signed (struct regcache *regcache,
@@ -2902,7 +2836,6 @@ index d7bb8b5c93..06f878ab01 100644
  
  
 diff --git a/gdb/remote.c b/gdb/remote.c
-index e7ade41c34..5bf085d123 100644
 --- a/gdb/remote.c
 +++ b/gdb/remote.c
 @@ -455,7 +455,7 @@ public:
@@ -2924,7 +2857,6 @@ index e7ade41c34..5bf085d123 100644
    if (remote_hw_watchpoint_length_limit == 0)
      return 0;
 diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
-index 4be112b7a3..77d145549d 100644
 --- a/gdb/rust-lang.c
 +++ b/gdb/rust-lang.c
 @@ -286,7 +286,7 @@ rust_printchar (int c, struct type *type, struct ui_file *stream)
@@ -2946,7 +2878,6 @@ index 4be112b7a3..77d145549d 100644
  		struct value *val,
  		const struct value_print_options *options)
 diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c
-index 3c65c5eaa5..d7c683e968 100644
 --- a/gdb/s390-linux-nat.c
 +++ b/gdb/s390-linux-nat.c
 @@ -952,7 +952,8 @@ s390_linux_nat_target::remove_hw_breakpoint (struct gdbarch *gdbarch,
@@ -2960,7 +2891,6 @@ index 3c65c5eaa5..d7c683e968 100644
    return 1;
  }
 diff --git a/gdb/spu-multiarch.c b/gdb/spu-multiarch.c
-index 5da5e4e7fc..29db0e8ea6 100644
 --- a/gdb/spu-multiarch.c
 +++ b/gdb/spu-multiarch.c
 @@ -66,7 +66,7 @@ struct spu_multiarch_target final : public target_ops
@@ -2982,7 +2912,6 @@ index 5da5e4e7fc..29db0e8ea6 100644
    struct target_ops *ops_beneath = find_target_beneath (this);
  
 diff --git a/gdb/stack.c b/gdb/stack.c
-index bfd9653cca..e71a44e70a 100644
 --- a/gdb/stack.c
 +++ b/gdb/stack.c
 @@ -190,7 +190,7 @@ print_stack_frame (struct frame_info *frame, int print_level,
@@ -3024,7 +2953,6 @@ index bfd9653cca..e71a44e70a 100644
        if (highest_offset == -1)
  	start = gdbarch_frame_args_skip (get_frame_arch (frame));
 diff --git a/gdb/symmisc.c b/gdb/symmisc.c
-index 91ddc578a8..addf9b873d 100644
 --- a/gdb/symmisc.c
 +++ b/gdb/symmisc.c
 @@ -586,11 +586,11 @@ print_symbol (struct gdbarch *gdbarch, struct symbol *symbol,
@@ -3043,7 +2971,6 @@ index 91ddc578a8..addf9b873d 100644
  	      fprintf_filtered (outfile, " %02x",
  				(unsigned) SYMBOL_VALUE_BYTES (symbol)[i]);
 diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
-index da74347122..ed625ed030 100644
 --- a/gdb/target-delegates.c
 +++ b/gdb/target-delegates.c
 @@ -39,7 +39,7 @@ struct dummy_target : public target_ops
@@ -3097,7 +3024,6 @@ index da74347122..ed625ed030 100644
    target_debug_print_int (result);
    fputs_unfiltered ("\n", gdb_stdlog);
 diff --git a/gdb/target.c b/gdb/target.c
-index d96cdec418..7d0da32ec6 100644
 --- a/gdb/target.c
 +++ b/gdb/target.c
 @@ -59,7 +59,7 @@ static int default_watchpoint_addr_within_range (struct target_ops *,
@@ -3119,7 +3045,6 @@ index d96cdec418..7d0da32ec6 100644
    return (len <= gdbarch_ptr_bit (target_gdbarch ()) / TARGET_CHAR_BIT);
  }
 diff --git a/gdb/target.h b/gdb/target.h
-index 6e13809397..aaed35f690 100644
 --- a/gdb/target.h
 +++ b/gdb/target.h
 @@ -557,7 +557,7 @@ struct target_ops
@@ -3132,7 +3057,6 @@ index 6e13809397..aaed35f690 100644
  
      virtual bool can_accel_watchpoint_condition (CORE_ADDR, int, int,
 diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
-index d99d663895..836d4e3d5d 100644
 --- a/gdb/tracepoint.c
 +++ b/gdb/tracepoint.c
 @@ -829,10 +829,10 @@ collection_list::add_register (unsigned int regno)
@@ -3229,7 +3153,6 @@ index d99d663895..836d4e3d5d 100644
        if (BLOCK_FUNCTION (block))
  	break;
 diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
-index 42e413018a..978074cbc8 100644
 --- a/gdb/tracepoint.h
 +++ b/gdb/tracepoint.h
 @@ -265,7 +265,7 @@ public:
@@ -3242,7 +3165,6 @@ index 42e413018a..978074cbc8 100644
  		       struct gdbarch *gdbarch,
  		       long frame_regno, long frame_offset,
 diff --git a/gdb/valarith.c b/gdb/valarith.c
-index 035def5466..67bd7cf03a 100644
 --- a/gdb/valarith.c
 +++ b/gdb/valarith.c
 @@ -184,7 +184,7 @@ value_subscript (struct value *array, LONGEST index)
@@ -3288,7 +3210,6 @@ index 035def5466..67bd7cf03a 100644
    for (i = 0; i < len; i++)
      {
 diff --git a/gdb/valops.c b/gdb/valops.c
-index cdc5c8014c..96b922dbef 100644
 --- a/gdb/valops.c
 +++ b/gdb/valops.c
 @@ -81,7 +81,7 @@ oload_classification classify_oload_match (struct badness_vector *,
@@ -3370,7 +3291,6 @@ index cdc5c8014c..96b922dbef 100644
  {
    struct type *real_type;
 diff --git a/gdb/valprint.c b/gdb/valprint.c
-index 2537d77c19..be4ba05c91 100644
 --- a/gdb/valprint.c
 +++ b/gdb/valprint.c
 @@ -879,7 +879,7 @@ generic_val_print_complex (struct type *type,
@@ -3433,7 +3353,6 @@ index 2537d77c19..be4ba05c91 100644
  		  int quote_char, int c_style_terminator,
  		  const struct value_print_options *options)
 diff --git a/gdb/valprint.h b/gdb/valprint.h
-index 1f62039be5..00e3cc5714 100644
 --- a/gdb/valprint.h
 +++ b/gdb/valprint.h
 @@ -119,7 +119,7 @@ extern void val_print_array_elements (struct type *, LONGEST,
@@ -3473,7 +3392,6 @@ index 1f62039be5..00e3cc5714 100644
  			      int quote_char, int c_style_terminator,
  			      const struct value_print_options *options);
 diff --git a/gdb/value.c b/gdb/value.c
-index 3e0b2ff883..33c28f2340 100644
 --- a/gdb/value.c
 +++ b/gdb/value.c
 @@ -383,7 +383,8 @@ value_bytes_available (const struct value *value,
@@ -3508,7 +3426,6 @@ index 3e0b2ff883..33c28f2340 100644
    mark_value_bits_optimized_out (value,
  				 offset * TARGET_CHAR_BIT,
 diff --git a/gdb/value.h b/gdb/value.h
-index e838fd580e..776e833fff 100644
 --- a/gdb/value.h
 +++ b/gdb/value.h
 @@ -274,7 +274,7 @@ struct lval_funcs
@@ -3568,7 +3485,6 @@ index e838fd580e..776e833fff 100644
  /* User function handler.  */
  
 diff --git a/gdb/x86-nat.c b/gdb/x86-nat.c
-index cfd293c17f..8886df2d4d 100644
 --- a/gdb/x86-nat.c
 +++ b/gdb/x86-nat.c
 @@ -173,7 +173,7 @@ x86_remove_watchpoint (CORE_ADDR addr, int len,
@@ -3581,7 +3497,6 @@ index cfd293c17f..8886df2d4d 100644
    struct x86_debug_reg_state *state
      = x86_debug_reg_state (ptid_get_pid (inferior_ptid));
 diff --git a/gdb/x86-nat.h b/gdb/x86-nat.h
-index cc27fa43b4..bab15def7b 100644
 --- a/gdb/x86-nat.h
 +++ b/gdb/x86-nat.h
 @@ -49,7 +49,7 @@ extern void x86_forget_process (pid_t pid);

gdb-rhbz795424-bitpos-21of25.patch

@@ -62,7 +62,6 @@ Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=bitpos-ensure-size_t.patch
 
 diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
-index 78422faa6c..9b749559a1 100644
 --- a/gdb/alpha-tdep.c
 +++ b/gdb/alpha-tdep.c
 @@ -413,6 +413,13 @@ alpha_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@@ -80,7 +79,6 @@ index 78422faa6c..9b749559a1 100644
  
    /* Keep sp aligned to a multiple of 16 as the ABI requires.  */
 diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
-index 25f1512857..823ac8fbd6 100644
 --- a/gdb/cp-valprint.c
 +++ b/gdb/cp-valprint.c
 @@ -529,6 +529,7 @@ cp_print_value (struct type *type, struct type *real_type,
@@ -92,7 +90,6 @@ index 25f1512857..823ac8fbd6 100644
  
  		  if (target_read_memory (address + boffset, buf.data (),
 diff --git a/gdb/defs.h b/gdb/defs.h
-index dc38a288c5..ce5fee3ba3 100644
 --- a/gdb/defs.h
 +++ b/gdb/defs.h
 @@ -674,4 +674,6 @@ DEF_ENUM_FLAGS_TYPE (enum user_selected_what_flag, user_selected_what);
@@ -103,7 +100,6 @@ index dc38a288c5..ce5fee3ba3 100644
 +
  #endif /* #ifndef DEFS_H */
 diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
-index e5c1b07040..06fb3b77c9 100644
 --- a/gdb/p-valprint.c
 +++ b/gdb/p-valprint.c
 @@ -773,6 +773,7 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
@@ -115,7 +111,6 @@ index e5c1b07040..06fb3b77c9 100644
  
  	      base_valaddr = buf.data ();
 diff --git a/gdb/utils.c b/gdb/utils.c
-index c69c01efc1..42d4225595 100644
 --- a/gdb/utils.c
 +++ b/gdb/utils.c
 @@ -2816,6 +2816,17 @@ string_to_core_addr (const char *my_string)
@@ -137,7 +132,6 @@ index c69c01efc1..42d4225595 100644
  
  static void
 diff --git a/gdb/valops.c b/gdb/valops.c
-index 96b922dbef..a7f9be5f4e 100644
 --- a/gdb/valops.c
 +++ b/gdb/valops.c
 @@ -2088,6 +2088,7 @@ search_struct_method (const char *name, struct value **arg1p,
@@ -149,7 +143,6 @@ index 96b922dbef..a7f9be5f4e 100644
  	      address = value_address (*arg1p);
  
 diff --git a/gdb/value.c b/gdb/value.c
-index 33c28f2340..f1a98a8556 100644
 --- a/gdb/value.c
 +++ b/gdb/value.c
 @@ -933,6 +933,7 @@ allocate_value_lazy (struct type *type)
@@ -178,7 +171,6 @@ index 33c28f2340..f1a98a8556 100644
  	.reset ((gdb_byte *) xrealloc (val->contents.release (),
  				       TYPE_LENGTH (new_encl_type)));
 diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c
-index 4c1ab2e73e..bd69fd2f48 100644
 --- a/gdb/vax-tdep.c
 +++ b/gdb/vax-tdep.c
 @@ -218,6 +218,7 @@ vax_return_value (struct gdbarch *gdbarch, struct value *function,

gdb-rhbz795424-bitpos-22of25.patch

@@ -106,7 +106,6 @@ Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=bitpos-wp.patch
 
 diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
-index dd69f50785..a8e2621eca 100644
 --- a/gdb/aarch64-linux-nat.c
 +++ b/gdb/aarch64-linux-nat.c
 @@ -62,14 +62,14 @@ public:
@@ -137,7 +136,6 @@ index dd69f50785..a8e2621eca 100644
    return start <= addr && start + length - 1 >= addr;
  }
 diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
-index 8e2abfb70c..6e6318013f 100644
 --- a/gdb/arm-linux-nat.c
 +++ b/gdb/arm-linux-nat.c
 @@ -80,7 +80,7 @@ public:
@@ -168,7 +166,6 @@ index 8e2abfb70c..6e6318013f 100644
    return start <= addr && start + length - 1 >= addr;
  }
 diff --git a/gdb/nat/aarch64-linux-hw-point.c b/gdb/nat/aarch64-linux-hw-point.c
-index a3931ea6a9..06dfb83f7f 100644
 --- a/gdb/nat/aarch64-linux-hw-point.c
 +++ b/gdb/nat/aarch64-linux-hw-point.c
 @@ -137,7 +137,7 @@ aarch64_point_encode_ctrl_reg (enum target_hw_bp_type type, int offset, int len)
@@ -254,7 +251,6 @@ index a3931ea6a9..06dfb83f7f 100644
    CORE_ADDR aligned_addr;
  
 diff --git a/gdb/nat/aarch64-linux-hw-point.h b/gdb/nat/aarch64-linux-hw-point.h
-index 1940b06a89..79504a4640 100644
 --- a/gdb/nat/aarch64-linux-hw-point.h
 +++ b/gdb/nat/aarch64-linux-hw-point.h
 @@ -176,7 +176,7 @@ int aarch64_handle_breakpoint (enum target_hw_bp_type type, CORE_ADDR addr,
@@ -282,7 +278,6 @@ index 1940b06a89..79504a4640 100644
  
  #endif /* AARCH64_LINUX_HW_POINT_H */
 diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
-index 9e188a0ec3..f08a964983 100644
 --- a/gdb/ppc-linux-nat.c
 +++ b/gdb/ppc-linux-nat.c
 @@ -282,7 +282,7 @@ struct ppc_linux_nat_target final : public linux_nat_target
@@ -359,7 +354,6 @@ index 9e188a0ec3..f08a964983 100644
    int mask;
  
 diff --git a/gdb/procfs.c b/gdb/procfs.c
-index ca7cc221f9..717a1130fe 100644
 --- a/gdb/procfs.c
 +++ b/gdb/procfs.c
 @@ -1561,7 +1561,7 @@ procfs_address_to_host_pointer (CORE_ADDR addr)
@@ -381,7 +375,6 @@ index ca7cc221f9..717a1130fe 100644
  {
    int       pflags = 0;
 diff --git a/gdb/remote.c b/gdb/remote.c
-index 5bf085d123..9eed75aa8c 100644
 --- a/gdb/remote.c
 +++ b/gdb/remote.c
 @@ -447,7 +447,7 @@ public:
@@ -421,7 +414,6 @@ index 5bf085d123..9eed75aa8c 100644
    getpkt (&rs->buf, &rs->buf_size, 0);
  
 diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c
-index d7c683e968..2403d05a18 100644
 --- a/gdb/s390-linux-nat.c
 +++ b/gdb/s390-linux-nat.c
 @@ -121,7 +121,7 @@ public:
@@ -434,7 +426,6 @@ index d7c683e968..2403d05a18 100644
    bool stopped_by_watchpoint () override;
    int insert_watchpoint (CORE_ADDR, int, enum target_hw_bp_type,
 diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
-index ed625ed030..3129ae295f 100644
 --- a/gdb/target-delegates.c
 +++ b/gdb/target-delegates.c
 @@ -38,9 +38,9 @@ struct dummy_target : public target_ops
@@ -526,7 +517,6 @@ index ed625ed030..3129ae295f 100644
    target_debug_print_int (arg2);
    fputs_unfiltered (", ", gdb_stdlog);
 diff --git a/gdb/target.c b/gdb/target.c
-index 7d0da32ec6..46d120b9d2 100644
 --- a/gdb/target.c
 +++ b/gdb/target.c
 @@ -56,7 +56,7 @@ static void generic_tls_error (void) ATTRIBUTE_NORETURN;
@@ -548,7 +538,6 @@ index 7d0da32ec6..46d120b9d2 100644
    return addr >= start && addr < start + length;
  }
 diff --git a/gdb/target.h b/gdb/target.h
-index aaed35f690..b1943a6d0a 100644
 --- a/gdb/target.h
 +++ b/gdb/target.h
 @@ -552,7 +552,7 @@ struct target_ops

gdb-rhbz795424-bitpos-23of25.patch

@@ -147,7 +147,6 @@ Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=bitpos-tdep.patch
 
 diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
-index 9b749559a1..485db44ae9 100644
 --- a/gdb/alpha-tdep.c
 +++ b/gdb/alpha-tdep.c
 @@ -299,17 +299,17 @@ alpha_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@@ -193,7 +192,6 @@ index 9b749559a1..485db44ae9 100644
  	      offset += tlen;
  	      contents += tlen;
 diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
-index 338a0f2c87..241abcd6d5 100644
 --- a/gdb/amd64-tdep.c
 +++ b/gdb/amd64-tdep.c
 @@ -882,8 +882,8 @@ amd64_push_arguments (struct regcache *regcache, int nargs,
@@ -226,7 +224,6 @@ index 338a0f2c87..241abcd6d5 100644
  	    }
  	}
 diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
-index 32ebead05d..2e388f2440 100644
 --- a/gdb/amd64-windows-tdep.c
 +++ b/gdb/amd64-windows-tdep.c
 @@ -291,7 +291,7 @@ amd64_windows_return_value (struct gdbarch *gdbarch, struct value *function,
@@ -239,7 +236,6 @@ index 32ebead05d..2e388f2440 100644
  
    /* See if our value is returned through a register.  If it is, then
 diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
-index 382080a714..885591cbf2 100644
 --- a/gdb/arm-tdep.c
 +++ b/gdb/arm-tdep.c
 @@ -3468,7 +3468,7 @@ arm_vfp_cprc_reg_char (enum arm_vfp_cprc_base_type b)
@@ -313,7 +309,6 @@ index 382080a714..885591cbf2 100644
        struct type *target_type;
        enum type_code typecode;
 diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
-index 5aa61ba2d9..96de319da5 100644
 --- a/gdb/avr-tdep.c
 +++ b/gdb/avr-tdep.c
 @@ -1192,13 +1192,13 @@ avr_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame)
@@ -349,7 +344,6 @@ index 5aa61ba2d9..96de319da5 100644
        /* Calculate the potential last register needed.
           E.g. For length 2, registers regnum and regnum-1 (say 25 and 24)
 diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c
-index 63fbf6209e..864530bf05 100644
 --- a/gdb/bfin-tdep.c
 +++ b/gdb/bfin-tdep.c
 @@ -504,7 +504,7 @@ bfin_push_dummy_call (struct gdbarch *gdbarch,
@@ -371,7 +365,6 @@ index 63fbf6209e..864530bf05 100644
        sp -= container_len;
        write_memory (sp, value_contents (args[i]), container_len);
 diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
-index 5fa79ef2cf..1c99356746 100644
 --- a/gdb/cris-tdep.c
 +++ b/gdb/cris-tdep.c
 @@ -663,13 +663,13 @@ static CORE_ADDR cris_unwind_sp (struct gdbarch *gdbarch,
@@ -409,7 +402,6 @@ index 5fa79ef2cf..1c99356746 100644
        /* How may registers worth of storage do we need for this argument?  */
        reg_demand = (len / 4) + (len % 4 != 0 ? 1 : 0);
 diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
-index 55e77b6bb6..1317a0a3a7 100644
 --- a/gdb/h8300-tdep.c
 +++ b/gdb/h8300-tdep.c
 @@ -637,7 +637,7 @@ h8300_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@@ -445,7 +437,6 @@ index 55e77b6bb6..1317a0a3a7 100644
  	      for (offset = 0; offset < padded_len; offset += wordsize)
  		{
 diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
-index 9692b33e09..3cca3fb6c1 100644
 --- a/gdb/hppa-tdep.c
 +++ b/gdb/hppa-tdep.c
 @@ -986,7 +986,7 @@ hppa64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@@ -467,7 +458,6 @@ index 9692b33e09..3cca3fb6c1 100644
  
    if (len > 16)
 diff --git a/gdb/i386-darwin-tdep.c b/gdb/i386-darwin-tdep.c
-index 7ee2f4cf2a..b811296b0d 100644
 --- a/gdb/i386-darwin-tdep.c
 +++ b/gdb/i386-darwin-tdep.c
 @@ -166,7 +166,7 @@ i386_darwin_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@@ -480,7 +470,6 @@ index 7ee2f4cf2a..b811296b0d 100644
  
        if (struct_return)
 diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
-index d67e2e40c5..dfff555493 100644
 --- a/gdb/i386-tdep.c
 +++ b/gdb/i386-tdep.c
 @@ -2678,7 +2678,7 @@ i386_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@@ -547,7 +536,6 @@ index d67e2e40c5..dfff555493 100644
    if (i386_fp_regnum_p (get_frame_arch (frame), regnum))
      {
 diff --git a/gdb/iq2000-tdep.c b/gdb/iq2000-tdep.c
-index f8e2f234e0..b703c2cae4 100644
 --- a/gdb/iq2000-tdep.c
 +++ b/gdb/iq2000-tdep.c
 @@ -651,8 +651,9 @@ iq2000_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@@ -563,7 +551,6 @@ index f8e2f234e0..b703c2cae4 100644
    CORE_ADDR struct_ptr;
  
 diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
-index fd79f3f4cd..941c897070 100644
 --- a/gdb/m32r-tdep.c
 +++ b/gdb/m32r-tdep.c
 @@ -671,7 +671,7 @@ m32r_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@@ -576,7 +563,6 @@ index fd79f3f4cd..941c897070 100644
    /* First force sp to a 4-byte alignment.  */
    sp = sp & ~3;
 diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c
-index b9fa5e6d4c..2320e61a69 100644
 --- a/gdb/m68k-tdep.c
 +++ b/gdb/m68k-tdep.c
 @@ -373,7 +373,7 @@ m68k_reg_struct_return_p (struct gdbarch *gdbarch, struct type *type)
@@ -602,7 +588,6 @@ index b9fa5e6d4c..2320e61a69 100644
        /* Non-scalars bigger than 4 bytes are left aligned, others are
  	 right aligned.  */
 diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
-index 0e8c3f97e2..f60a49b90b 100644
 --- a/gdb/mep-tdep.c
 +++ b/gdb/mep-tdep.c
 @@ -2241,7 +2241,7 @@ push_large_arguments (CORE_ADDR sp, int argc, struct value **argv,
@@ -615,7 +600,6 @@ index 0e8c3f97e2..f60a49b90b 100644
        if (arg_len > MEP_GPR_SIZE)
          {
 diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
-index cc67cd3bdd..2980604968 100644
 --- a/gdb/mips-tdep.c
 +++ b/gdb/mips-tdep.c
 @@ -477,7 +477,7 @@ static void
@@ -764,7 +748,6 @@ index cc67cd3bdd..2980604968 100644
        val = value_contents (arg);
  
 diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
-index e12e01df03..93cc78eb51 100644
 --- a/gdb/mn10300-tdep.c
 +++ b/gdb/mn10300-tdep.c
 @@ -1198,7 +1198,7 @@ mn10300_push_dummy_call (struct gdbarch *gdbarch,
@@ -777,7 +760,6 @@ index e12e01df03..93cc78eb51 100644
    int argnum;
    const gdb_byte *val;
 diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c
-index a6ba5d0ffd..184b7d6261 100644
 --- a/gdb/ppc-sysv-tdep.c
 +++ b/gdb/ppc-sysv-tdep.c
 @@ -68,7 +68,7 @@ ppc_sysv_abi_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@@ -871,7 +853,6 @@ index a6ba5d0ffd..184b7d6261 100644
        if (writebuf != NULL)
  	regcache_cooked_write_part (regcache, regnum,
 diff --git a/gdb/rl78-tdep.c b/gdb/rl78-tdep.c
-index af6a089608..be10f0a3c0 100644
 --- a/gdb/rl78-tdep.c
 +++ b/gdb/rl78-tdep.c
 @@ -1346,8 +1346,8 @@ rl78_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@@ -886,7 +867,6 @@ index af6a089608..be10f0a3c0 100644
        sp -= container_len;
        write_memory (rl78_make_data_address (sp),
 diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c
-index ecf6191df0..acf2473018 100644
 --- a/gdb/rs6000-aix-tdep.c
 +++ b/gdb/rs6000-aix-tdep.c
 @@ -177,9 +177,9 @@ rs6000_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@@ -911,7 +891,6 @@ index ecf6191df0..acf2473018 100644
        if (argbytes)
  	{
 diff --git a/gdb/score-tdep.c b/gdb/score-tdep.c
-index a167932327..4674eb7900 100644
 --- a/gdb/score-tdep.c
 +++ b/gdb/score-tdep.c
 @@ -516,7 +516,7 @@ score_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@@ -924,7 +903,6 @@ index a167932327..4674eb7900 100644
    CORE_ADDR addr = 0;
  
 diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
-index edf7e94b2e..3ab10e8401 100644
 --- a/gdb/sh-tdep.c
 +++ b/gdb/sh-tdep.c
 @@ -812,7 +812,7 @@ sh_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
@@ -966,7 +944,6 @@ index edf7e94b2e..3ab10e8401 100644
    int last_reg_arg = INT_MAX;
  
 diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
-index 9fd6a66199..56b72ea505 100644
 --- a/gdb/sparc64-tdep.c
 +++ b/gdb/sparc64-tdep.c
 @@ -1205,7 +1205,7 @@ sparc64_16_byte_align_p (struct type *type)
@@ -1024,7 +1001,6 @@ index 9fd6a66199..56b72ea505 100644
        gdb_byte buf[16];
  
 diff --git a/gdb/spu-tdep.c b/gdb/spu-tdep.c
-index 2567c240d4..46b6d6243e 100644
 --- a/gdb/spu-tdep.c
 +++ b/gdb/spu-tdep.c
 @@ -1431,7 +1431,7 @@ spu_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@@ -1046,7 +1022,6 @@ index 2567c240d4..46b6d6243e 100644
  	  
  	  if (spu_scalar_value_p (type))
 diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c
-index f11763d992..6192692a00 100644
 --- a/gdb/tic6x-tdep.c
 +++ b/gdb/tic6x-tdep.c
 @@ -883,7 +883,7 @@ tic6x_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@@ -1087,7 +1062,6 @@ index f11763d992..6192692a00 100644
  	  addr = sp + stack_offset;
  	  write_memory (addr, val, len);
 diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
-index 8f688b16cf..5152c9eece 100644
 --- a/gdb/tilegx-tdep.c
 +++ b/gdb/tilegx-tdep.c
 @@ -288,7 +288,7 @@ tilegx_push_dummy_call (struct gdbarch *gdbarch,
@@ -1100,7 +1074,6 @@ index 8f688b16cf..5152c9eece 100644
  
    /* If struct_return is 1, then the struct return address will
 diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c
-index ac7d6aa424..6e440e533f 100644
 --- a/gdb/v850-tdep.c
 +++ b/gdb/v850-tdep.c
 @@ -1019,7 +1019,7 @@ v850_push_dummy_call (struct gdbarch *gdbarch,
@@ -1122,7 +1095,6 @@ index ac7d6aa424..6e440e533f 100644
        gdb_byte valbuf[v850_reg_size];
  
 diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c
-index bd69fd2f48..5755c91eff 100644
 --- a/gdb/vax-tdep.c
 +++ b/gdb/vax-tdep.c
 @@ -110,7 +110,7 @@ vax_store_arguments (struct regcache *regcache, int nargs,
@@ -1144,7 +1116,6 @@ index bd69fd2f48..5755c91eff 100644
        sp -= (len + 3) & ~3;
        count += (len + 3) / 4;
 diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
-index 31650ac3a9..91b088251c 100644
 --- a/gdb/xstormy16-tdep.c
 +++ b/gdb/xstormy16-tdep.c
 @@ -232,8 +232,9 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch,
@@ -1160,7 +1131,6 @@ index 31650ac3a9..91b088251c 100644
    gdb_byte buf[xstormy16_pc_size];
  
 diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 01f96165dc..066081c3f9 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
 @@ -1627,8 +1627,7 @@ xtensa_store_return_value (struct type *type,

gdb-rhbz795424-bitpos-25of25.patch

@@ -57,7 +57,6 @@ Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=f77-bounds.patch
 
 diff --git a/gdb/f-lang.h b/gdb/f-lang.h
-index 9171a13bdf..9ec58f808e 100644
 --- a/gdb/f-lang.h
 +++ b/gdb/f-lang.h
 @@ -49,9 +49,9 @@ struct common_block
@@ -73,7 +72,6 @@ index 9171a13bdf..9ec58f808e 100644
  extern void f77_get_dynamic_array_length (struct type *);
  
 diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
-index 4f6a0ed09a..c330522913 100644
 --- a/gdb/f-typeprint.c
 +++ b/gdb/f-typeprint.c
 @@ -149,7 +149,7 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
@@ -122,7 +120,6 @@ index 4f6a0ed09a..c330522913 100644
        break;
  
 diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
-index 0772f359f0..03400ae431 100644
 --- a/gdb/f-valprint.c
 +++ b/gdb/f-valprint.c
 @@ -41,7 +41,7 @@ LONGEST f77_array_offset_tbl[MAX_FORTRAN_DIMS + 1][2];

gdb-runtest-pie-override.patch

@@ -25,7 +25,6 @@ But there is a problem with testsuite.unix non-unique subdir name and also
 a problem with make -j parallelization of the testsuite.
 
 diff --git a/gdb/testsuite/lib/future.exp b/gdb/testsuite/lib/future.exp
-index 547ca5fb7b..93c770820c 100644
 --- a/gdb/testsuite/lib/future.exp
 +++ b/gdb/testsuite/lib/future.exp
 @@ -185,6 +185,10 @@ proc gdb_default_target_compile {source destfile type options} {

gdb-stale-frame_info.patch

@@ -41,7 +41,6 @@ gdb/
 	switch_to_thread.
 
 diff --git a/gdb/progspace-and-thread.c b/gdb/progspace-and-thread.c
-index 27d626b05f..ee6342d96a 100644
 --- a/gdb/progspace-and-thread.c
 +++ b/gdb/progspace-and-thread.c
 @@ -23,15 +23,29 @@

gdb-testsuite-readline63-sigint.patch

@@ -15,7 +15,6 @@ Message-Id: <1436927724-4059-1-git-send-email-patrick@parcs.ath.cx>
 https://bugzilla.redhat.com/show_bug.cgi?id=1301175
 
 diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
-index 4108e088a9..4dbd583ce7 100644
 --- a/gdb/testsuite/gdb.gdb/selftest.exp
 +++ b/gdb/testsuite/gdb.gdb/selftest.exp
 @@ -104,9 +104,25 @@ proc test_with_self { } {

gdb-vla-intel-fix-print-char-array.patch

@@ -22,7 +22,6 @@ Revert commit (only the part touching gdb/f-valprint.c):
 And adjust its testcase.
 
 diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
-index 03400ae431..aa33d848d6 100644
 --- a/gdb/f-valprint.c
 +++ b/gdb/f-valprint.c
 @@ -313,8 +313,22 @@ f_val_print (struct type *type, LONGEST embedded_offset,
@@ -51,7 +50,6 @@ index 03400ae431..aa33d848d6 100644
  
      case TYPE_CODE_STRUCT:
 diff --git a/gdb/testsuite/gdb.fortran/printing-types.exp b/gdb/testsuite/gdb.fortran/printing-types.exp
-index 9237907ed6..dbd0666422 100644
 --- a/gdb/testsuite/gdb.fortran/printing-types.exp
 +++ b/gdb/testsuite/gdb.fortran/printing-types.exp
 @@ -29,7 +29,7 @@ if {![runto MAIN__]} then {

gdb-vla-intel-fortran-strides.patch

@@ -37,7 +37,6 @@ dbfd7140bf4c0500d1f5d192be781f83f78f7922
  23 files changed, 1242 insertions(+), 183 deletions(-)
 
 diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
-index 730934fe6e..e1dd28e7e7 100644
 --- a/gdb/dwarf2loc.c
 +++ b/gdb/dwarf2loc.c
 @@ -2600,11 +2600,14 @@ dwarf2_locexpr_baton_eval (const struct dwarf2_locexpr_baton *dlbaton,
@@ -128,7 +127,6 @@ index 730934fe6e..e1dd28e7e7 100644
  
  /* See dwarf2loc.h.  */
 diff --git a/gdb/dwarf2loc.h b/gdb/dwarf2loc.h
-index f82e7b2d11..74f0597359 100644
 --- a/gdb/dwarf2loc.h
 +++ b/gdb/dwarf2loc.h
 @@ -143,6 +143,12 @@ int dwarf2_evaluate_property (const struct dynamic_prop *prop,
@@ -145,7 +143,6 @@ index f82e7b2d11..74f0597359 100644
     property to C code.
  
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 834bce776a..464dff0d2b 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
 @@ -17552,7 +17552,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
@@ -192,7 +189,6 @@ index 834bce776a..464dff0d2b 100644
    if (high_bound_is_count)
      TYPE_RANGE_DATA (range_type)->flag_upper_bound_is_count = 1;
 diff --git a/gdb/eval.c b/gdb/eval.c
-index 5bd6e2cbfe..50dde3ed4f 100644
 --- a/gdb/eval.c
 +++ b/gdb/eval.c
 @@ -377,29 +377,325 @@ init_array_element (struct value *array, struct value *element,
@@ -621,7 +617,6 @@ index 5bd6e2cbfe..50dde3ed4f 100644
      error (_("Can't get dimensions for a non-array type"));
  
 diff --git a/gdb/expprint.c b/gdb/expprint.c
-index 70d355d369..1dfc7943da 100644
 --- a/gdb/expprint.c
 +++ b/gdb/expprint.c
 @@ -578,17 +578,14 @@ print_subexp_standard (struct expression *exp, int *pos,
@@ -694,7 +689,6 @@ index 70d355d369..1dfc7943da 100644
        }
        break;
 diff --git a/gdb/expression.h b/gdb/expression.h
-index 9f26bb8d60..2cc0d2c1e3 100644
 --- a/gdb/expression.h
 +++ b/gdb/expression.h
 @@ -148,28 +148,27 @@ extern void dump_raw_expression (struct expression *,
@@ -747,7 +741,6 @@ index 9f26bb8d60..2cc0d2c1e3 100644
  
  #endif /* !defined (EXPRESSION_H) */
 diff --git a/gdb/f-exp.y b/gdb/f-exp.y
-index e39f68417c..7d03e54a18 100644
 --- a/gdb/f-exp.y
 +++ b/gdb/f-exp.y
 @@ -257,31 +257,63 @@ arglist :	subrange
@@ -820,7 +813,6 @@ index e39f68417c..7d03e54a18 100644
  	;
  
 diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
-index 903f2af638..b4067a8460 100644
 --- a/gdb/f-valprint.c
 +++ b/gdb/f-valprint.c
 @@ -119,8 +119,14 @@ f77_print_array_1 (int nss, int ndimensions, struct type *type,
@@ -840,7 +832,6 @@ index 903f2af638..b4067a8460 100644
        for (i = lowerbound;
  	   (i < upperbound + 1 && (*elts) < options->print_max);
 diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
-index 4f77a5214e..98d3260860 100644
 --- a/gdb/gdbtypes.c
 +++ b/gdb/gdbtypes.c
 @@ -902,7 +902,8 @@ operator== (const range_bounds &l, const range_bounds &r)
@@ -952,7 +943,6 @@ index 4f77a5214e..98d3260860 100644
    return static_range_type;
  }
 diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
-index 5f614e573a..878c8b0302 100644
 --- a/gdb/gdbtypes.h
 +++ b/gdb/gdbtypes.h
 @@ -612,6 +612,10 @@ struct range_bounds
@@ -1009,7 +999,6 @@ index 5f614e573a..878c8b0302 100644
  				       const struct dynamic_prop *);
  
 diff --git a/gdb/parse.c b/gdb/parse.c
-index 193abe853f..ea0d027bb0 100644
 --- a/gdb/parse.c
 +++ b/gdb/parse.c
 @@ -989,24 +989,20 @@ operator_length_standard (const struct expression *expr, int endpos,
@@ -1049,7 +1038,6 @@ index 193abe853f..ea0d027bb0 100644
        break;
  
 diff --git a/gdb/rust-exp.y b/gdb/rust-exp.y
-index 9f21498d4c..5d0f24f4e1 100644
 --- a/gdb/rust-exp.y
 +++ b/gdb/rust-exp.y
 @@ -2477,24 +2477,28 @@ convert_ast_to_expression (struct parser_state *state,
@@ -1090,7 +1078,6 @@ index 9f21498d4c..5d0f24f4e1 100644
  	  }
  	else
 diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
-index ed0394592f..4be112b7a3 100644
 --- a/gdb/rust-lang.c
 +++ b/gdb/rust-lang.c
 @@ -1106,13 +1106,11 @@ rust_range (struct expression *exp, int *pos, enum noside noside)
@@ -1651,7 +1638,6 @@ new file mode 100644
 +  call sub
 +end
 diff --git a/gdb/testsuite/gdb.fortran/vla-ptype.exp b/gdb/testsuite/gdb.fortran/vla-ptype.exp
-index 5f367348b0..5351a0aa2e 100644
 --- a/gdb/testsuite/gdb.fortran/vla-ptype.exp
 +++ b/gdb/testsuite/gdb.fortran/vla-ptype.exp
 @@ -98,3 +98,7 @@ gdb_test "ptype vla2" "type = <not allocated>" "ptype vla2 not allocated"
@@ -1663,7 +1649,6 @@ index 5f367348b0..5351a0aa2e 100644
 +gdb_continue_to_breakpoint "vla1-neg-bounds"
 +gdb_test "ptype vla1" "type = $real \\(-2:1,-5:4,-3:-1\\)" "ptype vla1 negative bounds"
 diff --git a/gdb/testsuite/gdb.fortran/vla-sizeof.exp b/gdb/testsuite/gdb.fortran/vla-sizeof.exp
-index 3113983ba4..83bc849619 100644
 --- a/gdb/testsuite/gdb.fortran/vla-sizeof.exp
 +++ b/gdb/testsuite/gdb.fortran/vla-sizeof.exp
 @@ -44,3 +44,7 @@ gdb_test "print sizeof(pvla)" " = 0" "print sizeof non-associated pvla"
@@ -1758,7 +1743,6 @@ new file mode 100644
 +  pvla => null()        ! single-element
 +end program vla_stride
 diff --git a/gdb/testsuite/gdb.fortran/vla.f90 b/gdb/testsuite/gdb.fortran/vla.f90
-index 508290a36e..d87f59b92b 100644
 --- a/gdb/testsuite/gdb.fortran/vla.f90
 +++ b/gdb/testsuite/gdb.fortran/vla.f90
 @@ -54,4 +54,14 @@ program vla
@@ -1777,7 +1761,6 @@ index 508290a36e..d87f59b92b 100644
 +
  end program vla
 diff --git a/gdb/valarith.c b/gdb/valarith.c
-index 58e3a09c37..035def5466 100644
 --- a/gdb/valarith.c
 +++ b/gdb/valarith.c
 @@ -189,10 +189,16 @@ value_subscripted_rvalue (struct value *array, LONGEST index, int lowerbound)
@@ -1800,7 +1783,6 @@ index 58e3a09c37..035def5466 100644
        if (type_not_associated (array_type))
          error (_("no such vector element (vector not associated)"));
 diff --git a/gdb/valops.c b/gdb/valops.c
-index 62a86c06a3..5c35d7a091 100644
 --- a/gdb/valops.c
 +++ b/gdb/valops.c
 @@ -3808,56 +3808,195 @@ value_of_this_silent (const struct language_defn *lang)
@@ -2030,7 +2012,6 @@ index 62a86c06a3..5c35d7a091 100644
  
  /* Create a value for a FORTRAN complex number.  Currently most of the
 diff --git a/gdb/value.h b/gdb/value.h
-index 4d75c966ed..e838fd580e 100644
 --- a/gdb/value.h
 +++ b/gdb/value.h
 @@ -1139,6 +1139,8 @@ extern struct value *varying_to_slice (struct value *);

gdb-vla-intel-fortran-vla-strings.patch

@@ -33,7 +33,6 @@ git diff --stat -p gdb/master...gdb/users/bheckel/fortran-vla-strings
  20 files changed, 827 insertions(+), 110 deletions(-)
 
 diff --git a/gdb/NEWS b/gdb/NEWS
-index cef558039e..fa4c0382dc 100644
 --- a/gdb/NEWS
 +++ b/gdb/NEWS
 @@ -59,6 +59,8 @@ SH-5/SH64 running OpenBSD 	SH-5/SH64 support in sh*-*-openbsd*
@@ -46,7 +45,6 @@ index cef558039e..fa4c0382dc 100644
    in XML target descriptions.  This allows for finer grain grouping of
    registers on systems with a large amount of registers.
 diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
-index c4c0918e26..3904fab260 100644
 --- a/gdb/c-valprint.c
 +++ b/gdb/c-valprint.c
 @@ -653,6 +653,28 @@ c_value_print (struct value *val, struct ui_file *stream,
@@ -79,7 +77,6 @@ index c4c0918e26..3904fab260 100644
  	  type_print (value_type (val), "", stream, -1);
  	  fprintf_filtered (stream, ") ");
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 464dff0d2b..7fe15e5d05 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
 @@ -1789,7 +1789,8 @@ static void read_signatured_type (struct signatured_type *);
@@ -351,7 +348,6 @@ index 464dff0d2b..7fe15e5d05 100644
  
    if (dwarf2_per_objfile->die_type_hash == NULL)
 diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
-index f14f1811f4..4f6a0ed09a 100644
 --- a/gdb/f-typeprint.c
 +++ b/gdb/f-typeprint.c
 @@ -37,7 +37,7 @@ static void f_type_print_args (struct type *, struct ui_file *);
@@ -504,7 +500,6 @@ index f14f1811f4..4f6a0ed09a 100644
  	    }
  	  fprintfi_filtered (level, stream, "End Type ");
 diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
-index 98d3260860..99cd1bcb92 100644
 --- a/gdb/gdbtypes.c
 +++ b/gdb/gdbtypes.c
 @@ -1919,7 +1919,8 @@ is_dynamic_type_internal (struct type *type, int top_level)
@@ -595,7 +590,6 @@ index 98d3260860..99cd1bcb92 100644
  	  break;
  
 diff --git a/gdb/testsuite/gdb.cp/vla-cxx.cc b/gdb/testsuite/gdb.cp/vla-cxx.cc
-index 1b5b27bf3d..06198b41e0 100644
 --- a/gdb/testsuite/gdb.cp/vla-cxx.cc
 +++ b/gdb/testsuite/gdb.cp/vla-cxx.cc
 @@ -15,6 +15,10 @@
@@ -627,7 +621,6 @@ index 1b5b27bf3d..06198b41e0 100644
    return vla[2];
  }
 diff --git a/gdb/testsuite/gdb.cp/vla-cxx.exp b/gdb/testsuite/gdb.cp/vla-cxx.exp
-index ac87499d49..dacbfb6ca0 100644
 --- a/gdb/testsuite/gdb.cp/vla-cxx.exp
 +++ b/gdb/testsuite/gdb.cp/vla-cxx.exp
 @@ -23,6 +23,12 @@ if ![runto_main] {
@@ -1018,7 +1011,6 @@ new file mode 100644
 +}
 +gdb_test "ptype realp" "type = PTR TO -> \\( $real \\)"
 diff --git a/gdb/testsuite/gdb.fortran/vla-ptype.exp b/gdb/testsuite/gdb.fortran/vla-ptype.exp
-index 5351a0aa2e..fa248c5a0c 100644
 --- a/gdb/testsuite/gdb.fortran/vla-ptype.exp
 +++ b/gdb/testsuite/gdb.fortran/vla-ptype.exp
 @@ -32,9 +32,9 @@ set real [fortran_real4]
@@ -1211,7 +1203,6 @@ new file mode 100644
 +  l = associated(var_char_p)              ! var_char_p-not-associated
 +end program vla_strings
 diff --git a/gdb/testsuite/gdb.fortran/vla-type.exp b/gdb/testsuite/gdb.fortran/vla-type.exp
-index aff0d5a258..6f2d6a4009 100755
 --- a/gdb/testsuite/gdb.fortran/vla-type.exp
 +++ b/gdb/testsuite/gdb.fortran/vla-type.exp
 @@ -132,7 +132,10 @@ gdb_test "ptype fivearr(2)%tone" \
@@ -1236,7 +1227,6 @@ index aff0d5a258..6f2d6a4009 100755
           "ptype fivedynarr(2)%tone, not allocated"
  
 diff --git a/gdb/testsuite/gdb.fortran/vla-value.exp b/gdb/testsuite/gdb.fortran/vla-value.exp
-index 4b1842e38c..5a831a3964 100644
 --- a/gdb/testsuite/gdb.fortran/vla-value.exp
 +++ b/gdb/testsuite/gdb.fortran/vla-value.exp
 @@ -35,7 +35,7 @@ gdb_breakpoint [gdb_get_line_number "vla1-init"]
@@ -1258,7 +1248,6 @@ index 4b1842e38c..5a831a3964 100644
  gdb_test "print pvla(1, 3, 8)" "no such vector element \\\(vector not associated\\\)" \
    "print undefined pvla(1,3,8)"
 diff --git a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
-index b6e777235c..14b611f7b5 100644
 --- a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
 +++ b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
 @@ -51,10 +51,10 @@ mi_expect_stop "breakpoint-hit" "vla" "" ".*vla.f90" "$bp_lineno" \
@@ -1288,7 +1277,6 @@ index b6e777235c..14b611f7b5 100644
  	mi_gdb_test "582-var-show-format pvla2_not_associated" \
  	    "582\\^done,format=\"natural\"" \
 diff --git a/gdb/typeprint.c b/gdb/typeprint.c
-index 222fc0a06b..37021e8d0d 100644
 --- a/gdb/typeprint.c
 +++ b/gdb/typeprint.c
 @@ -464,6 +464,25 @@ whatis_exp (const char *exp, int show)
@@ -1318,7 +1306,6 @@ index 222fc0a06b..37021e8d0d 100644
    printf_filtered ("\n");
  }
 diff --git a/gdb/valops.c b/gdb/valops.c
-index 5c35d7a091..9b6600b538 100644
 --- a/gdb/valops.c
 +++ b/gdb/valops.c
 @@ -1565,6 +1565,19 @@ value_ind (struct value *arg1)
@@ -1352,7 +1339,6 @@ index 5c35d7a091..9b6600b538 100644
        enc_type = value_type (arg2);
        return readjust_indirect_value_type (arg2, enc_type, base_type, arg1);
 diff --git a/gdb/valprint.c b/gdb/valprint.c
-index bed2cecf2c..2537d77c19 100644
 --- a/gdb/valprint.c
 +++ b/gdb/valprint.c
 @@ -1108,12 +1108,6 @@ value_check_printable (struct value *val, struct ui_file *stream,

gdb-vla-intel-stringbt-fix.patch

@@ -31,7 +31,6 @@ Thanks,
 Jan
 
 diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
-index e1dd28e7e7..45814c747b 100644
 --- a/gdb/dwarf2loc.c
 +++ b/gdb/dwarf2loc.c
 @@ -42,6 +42,7 @@

gdb-x86_64-i386-syscall-restart.patch

@@ -88,7 +88,6 @@ gdb/
 	Sign extend it afterwards.
 
 diff --git a/gdb/amd64-nat.c b/gdb/amd64-nat.c
-index 12d364a716..0359edf041 100644
 --- a/gdb/amd64-nat.c
 +++ b/gdb/amd64-nat.c
 @@ -135,9 +135,9 @@ amd64_collect_native_gregset (const struct regcache *regcache,

generate-patches-from-git-repo.sh

@@ -71,7 +71,7 @@ for c in `git rev-list --reverse ${common_ancestor}..HEAD` ; do
     # before, even if nothing has changed.  This is bad, so we replace
     # the commit hash by something constant (the string
     # "FEDORA_PATCHES").
-    git format-patch --no-signature --no-stat --keep -1 --stdout $c | sed -e '1 s/^From [0-9a-f]\+ \(.*\)/From FEDORA_PATCHES \1/' -e '/^index [0-9a-f]\+\.\.[0-9a-f]\+$/d' > ../$fname
+    git format-patch --no-signature --no-stat --keep -1 --stdout $c | sed -e '1 s/^From [0-9a-f]\+ \(.*\)/From FEDORA_PATCHES \1/' -e '/^index [0-9a-f]\+\.\.[0-9a-f]\+.*$/d' > ../$fname
     (cd .. && git add $fname)
 
     cat >> $temp_PATCH_file <<EOF