8.0.90.20180109-1.fc26

Rebase to pre-FSF GDB 8.1 (8.1.90.20180109).
2018-01-10 14:21:10 -05:00 · 2018-01-10 14:21:10 -05:00 · c42f0297dc
parent 4632e1fa80
commit c42f0297dc
70 changed files with 471 additions and 436 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-2c66e1634c92040a8fcb9590cd80fe881def0b20
+b9fcc8455866297c3f9fb24efaebf739c8e687b5
--- a/gdb-6.3-bz140532-ppc-unwinding-test.patch
+++ b/gdb-6.3-bz140532-ppc-unwinding-test.patch
@ -321,7 +321,7 @@ index 0000000000..5f50c4ef43
 +    }
 +}
 diff --git a/gdb/testsuite/gdb.arch/powerpc-prologue.exp b/gdb/testsuite/gdb.arch/powerpc-prologue.exp
-index 9ab172be7b..91ee3a29ba 100644
+index 5251dfa9c3..f3933e2295 100644
 --- a/gdb/testsuite/gdb.arch/powerpc-prologue.exp
 +++ b/gdb/testsuite/gdb.arch/powerpc-prologue.exp
@@ -16,8 +16,9 @@
--- a/gdb-6.3-gstack-20050411.patch
+++ b/gdb-6.3-gstack-20050411.patch
@ -25,10 +25,10 @@ FileName: gdb-6.3-gstack-20050411.patch
 create mode 100644 gdb/testsuite/gdb.base/gstack.exp

 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index 5823098036..f95505ea21 100644
+index 17b71c6e7c..e77d6a5c03 100644
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
-@@ -1747,7 +1747,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
+@@ -1744,7 +1744,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force
 install: all
 	@$(MAKE) $(FLAGS_TO_PASS) install-only
 
@ -37,7 +37,7 @@ index 5823098036..f95505ea21 100644
 	transformed_name=`t='$(program_transform_name)'; \
 			  echo gdb | sed -e "$$t"` ; \
 		if test "x$$transformed_name" = x; then \
-@@ -1787,7 +1787,25 @@ install-guile:
+@@ -1784,7 +1784,25 @@ install-guile:
 install-python:
 	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_DATADIR)/python/gdb
 
@ -64,7 +64,7 @@ index 5823098036..f95505ea21 100644
 	transformed_name=`t='$(program_transform_name)'; \
 			  echo gdb | sed -e $$t` ; \
 		if test "x$$transformed_name" = x; then \
-@@ -1810,6 +1828,18 @@ uninstall: force $(CONFIG_UNINSTALL)
+@@ -1807,6 +1825,18 @@ uninstall: force $(CONFIG_UNINSTALL)
 	fi
 	@$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
 
--- a/gdb-6.3-ppc64displaysymbol-20041124.patch
+++ b/gdb-6.3-ppc64displaysymbol-20041124.patch
@ -18,7 +18,7 @@ FileName: gdb-6.3-ppc64displaysymbol-20041124.patch
 1 file changed, 8 insertions(+)

 diff --git a/gdb/printcmd.c b/gdb/printcmd.c
-index 7ca86232a1..9ff0d9e962 100644
+index 6256f35baa..c52e39f7fc 100644
 --- a/gdb/printcmd.c
 +++ b/gdb/printcmd.c
@@ -602,6 +602,14 @@ build_address_symbolic (struct gdbarch *gdbarch,
--- a/gdb-6.3-ppc64syscall-20040622.patch
+++ b/gdb-6.3-ppc64syscall-20040622.patch
@ -20,7 +20,7 @@ FileName: gdb-6.3-ppc64syscall-20040622.patch
 1 file changed, 54 insertions(+), 3 deletions(-)

 diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
-index 456dbcccb1..d27ce7b2af 100644
+index e5a265dbcb..23d0db3b8f 100644
 --- a/gdb/rs6000-tdep.c
 +++ b/gdb/rs6000-tdep.c
@@ -134,6 +134,7 @@ static const char *powerpc_vector_abi_string = "auto";
@ -31,7 +31,7 @@ index 456dbcccb1..d27ce7b2af 100644
     int offset;			/* total size of frame --- the distance
 				   by which we decrement sp to allocate
 				   the frame */
-@@ -1578,7 +1579,6 @@ static CORE_ADDR
+@@ -1577,7 +1578,6 @@ static CORE_ADDR
 skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
 	       struct rs6000_framedata *fdata)
 {
@ -39,7 +39,7 @@ index 456dbcccb1..d27ce7b2af 100644
   CORE_ADDR last_prologue_pc = pc;
   CORE_ADDR li_found_pc = 0;
   gdb_byte buf[4];
-@@ -1596,12 +1596,14 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
+@@ -1595,12 +1595,14 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
   int minimal_toc_loaded = 0;
   int prev_insn_was_prologue_insn = 1;
   int num_skip_non_prologue_insns = 0;
@ -54,7 +54,7 @@ index 456dbcccb1..d27ce7b2af 100644
   fdata->saved_gpr = -1;
   fdata->saved_fpr = -1;
   fdata->saved_vr = -1;
-@@ -1635,6 +1637,55 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
+@@ -1634,6 +1636,55 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
 	break;
       op = extract_unsigned_integer (buf, 4, byte_order);
 
@ -110,7 +110,7 @@ index 456dbcccb1..d27ce7b2af 100644
       if ((op & 0xfc1fffff) == 0x7c0802a6)
 	{			/* mflr Rx */
 	  /* Since shared library / PIC code, which needs to get its
-@@ -1826,9 +1877,9 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
+@@ -1825,9 +1876,9 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
 	     we have no line table information or the line info tells
 	     us that the subroutine call is not part of the line
 	     associated with the prologue.  */
--- a/gdb-6.3-readnever-20050907.patch
+++ b/gdb-6.3-readnever-20050907.patch
@ -27,7 +27,7 @@ Pushed upstream: https://sourceware.org/ml/gdb-cvs/2017-12/msg00007.html
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/gdb/gcore.in b/gdb/gcore.in
-index 44b2e98b27..5ff4b24bd3 100644
+index b7f57cd341..c7e0dec574 100644
 --- a/gdb/gcore.in
 +++ b/gdb/gcore.in
@@ -97,7 +97,7 @@ for pid in $*
--- a/gdb-6.3-rh-dummykfail-20041202.patch
+++ b/gdb-6.3-rh-dummykfail-20041202.patch
@ -16,7 +16,7 @@ FileName: gdb-6.3-rh-dummykfail-20041202.patch
 1 file changed, 9 insertions(+)

 diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
-index fc0278b9da..018367c161 100644
+index 7702d9c238..9884f004c5 100644
 --- a/gdb/testsuite/lib/gdb.exp
 +++ b/gdb/testsuite/lib/gdb.exp
@@ -124,6 +124,15 @@ set valnum_re "\\\$$decimal"
--- a/gdb-6.3-rh-testversion-20041202.patch
+++ b/gdb-6.3-rh-testversion-20041202.patch
@ -18,7 +18,7 @@ FileName: gdb-6.3-rh-testversion-20041202.patch
 1 file changed, 3 insertions(+)

 diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
-index 712060c9ae..a4a446f9df 100644
+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 { } {
--- a/gdb-6.3-test-self-20050110.patch
+++ b/gdb-6.3-test-self-20050110.patch
@ -20,7 +20,7 @@ FileName: gdb-6.3-test-self-20050110.patch
 1 file changed, 4 insertions(+), 4 deletions(-)

 diff --git a/gdb/testsuite/lib/selftest-support.exp b/gdb/testsuite/lib/selftest-support.exp
-index 798d19dd89..e26e095b17 100644
+index 89e2e3f4ef..ea027a6f7d 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} {
--- a/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
+++ b/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
@ -55,7 +55,7 @@ glibc-debuginfo-2.7-2.x86_64: /usr/lib/debug/lib64/libc.so.6.debug:
 create mode 100644 gdb/testsuite/gdb.dwarf2/dw2-errno2.exp

 diff --git a/gdb/printcmd.c b/gdb/printcmd.c
-index 9ff0d9e962..ed35004021 100644
+index c52e39f7fc..ad80b1bebf 100644
 --- a/gdb/printcmd.c
 +++ b/gdb/printcmd.c
@@ -1210,6 +1210,10 @@ print_command_1 (const char *exp, int voidprint)
--- a/gdb-6.5-bz203661-emit-relocs.patch
+++ b/gdb-6.5-bz203661-emit-relocs.patch
@ -12,7 +12,7 @@ FileName: gdb-6.5-bz203661-emit-relocs.patch
 1 file changed, 6 insertions(+)

 diff --git a/gdb/symfile.c b/gdb/symfile.c
-index 5a1447d9d5..0b82f8c6a0 100644
+index f7f75b05d3..7cda615e74 100644
 --- a/gdb/symfile.c
 +++ b/gdb/symfile.c
@@ -3629,6 +3629,12 @@ default_symfile_relocate (struct objfile *objfile, asection *sectp,
--- a/gdb-6.5-bz216711-clone-is-outermost.patch
+++ b/gdb-6.5-bz216711-clone-is-outermost.patch
@ -44,7 +44,7 @@ instead.
 create mode 100644 gdb/testsuite/gdb.threads/bt-clone-stop.exp

 diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
-index 87f09a4542..2a705ea41a 100644
+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 +128,7 @@ index 87f09a4542..2a705ea41a 100644
 static void
 amd64_linux_write_pc (struct regcache *regcache, CORE_ADDR pc)
 {
-@@ -1802,6 +1876,8 @@ amd64_linux_init_abi_common(struct gdbarch_info info, struct gdbarch *gdbarch)
+@@ -1807,6 +1881,8 @@ amd64_linux_init_abi_common(struct gdbarch_info info, struct gdbarch *gdbarch)
 
   tdep->xsave_xcr0_offset = I386_LINUX_XSAVE_XCR0_OFFSET;
 
@ -138,7 +138,7 @@ index 87f09a4542..2a705ea41a 100644
   set_gdbarch_write_pc (gdbarch, amd64_linux_write_pc);
 
 diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
-index 0eb3670af3..1a32d2f871 100644
+index 7b2851f0a6..7c70792b3f 100644
 --- a/gdb/amd64-tdep.c
 +++ b/gdb/amd64-tdep.c
@@ -2595,6 +2595,7 @@ amd64_frame_unwind_stop_reason (struct frame_info *this_frame,
@ -181,7 +181,7 @@ index 0eb3670af3..1a32d2f871 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 12d5a24bc6..7a1dffa66f 100644
+index 9ce329eb20..d1b461b538 100644
 --- a/gdb/i386-tdep.c
 +++ b/gdb/i386-tdep.c
@@ -8401,6 +8401,9 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
@ -195,7 +195,7 @@ index 12d5a24bc6..7a1dffa66f 100644
 
   set_gdbarch_long_long_align_bit (gdbarch, 32);
 diff --git a/gdb/i386-tdep.h b/gdb/i386-tdep.h
-index f190bb3002..6fb45ca59c 100644
+index a71c103a88..5ee336b8cb 100644
 --- a/gdb/i386-tdep.h
 +++ b/gdb/i386-tdep.h
@@ -251,6 +251,9 @@ struct gdbarch_tdep
--- a/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
+++ b/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
@ -14,10 +14,10 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
 1 file changed, 7 insertions(+)

 diff --git a/gdb/symtab.c b/gdb/symtab.c
-index 996d52199f..136da6a616 100644
+index 146dc2e421..e7223a9a98 100644
 --- a/gdb/symtab.c
 +++ b/gdb/symtab.c
-@@ -3140,6 +3140,13 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
+@@ -3167,6 +3167,13 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
 	     SYMBOL_LINKAGE_NAME (msymbol)); */
 	  ;
 	/* fall through */
--- a/gdb-6.6-buildid-locate-core-as-arg.patch
+++ b/gdb-6.6-buildid-locate-core-as-arg.patch
@ -69,7 +69,7 @@ Http://sourceware.org/ml/gdb-patches/2010-01/msg00517.html
 3 files changed, 72 insertions(+), 6 deletions(-)

 diff --git a/gdb/common/common-exceptions.h b/gdb/common/common-exceptions.h
-index 99aa876dfc..3b9ed3ee71 100644
+index 15c85e28ab..9fe2375bce 100644
 --- a/gdb/common/common-exceptions.h
 +++ b/gdb/common/common-exceptions.h
@@ -104,6 +104,9 @@ enum errors {
@ -83,7 +83,7 @@ index 99aa876dfc..3b9ed3ee71 100644
   NR_ERRORS
 };
 diff --git a/gdb/exec.c b/gdb/exec.c
-index adff980f02..f8cc206c12 100644
+index c8c32ecc27..b329e2b834 100644
 --- a/gdb/exec.c
 +++ b/gdb/exec.c
@@ -35,6 +35,7 @@
@ -126,7 +126,7 @@ index adff980f02..f8cc206c12 100644
 
       if (build_section_table (exec_bfd, &sections, &sections_end))
 diff --git a/gdb/main.c b/gdb/main.c
-index 8f04da107a..d5b4c3adb9 100644
+index 3c98787edb..17d35f4a8a 100644
 --- a/gdb/main.c
 +++ b/gdb/main.c
@@ -446,6 +446,37 @@ struct cmdarg
@ -167,7 +167,7 @@ index 8f04da107a..d5b4c3adb9 100644
 static void
 captured_main_1 (struct captured_main_args *context)
 {
-@@ -881,6 +912,8 @@ captured_main_1 (struct captured_main_args *context)
+@@ -882,6 +913,8 @@ captured_main_1 (struct captured_main_args *context)
 	{
 	  symarg = argv[optind];
 	  execarg = argv[optind];
@ -176,7 +176,7 @@ index 8f04da107a..d5b4c3adb9 100644
 	  optind++;
 	}
 
-@@ -1031,11 +1064,25 @@ captured_main_1 (struct captured_main_args *context)
+@@ -1032,11 +1065,25 @@ captured_main_1 (struct captured_main_args *context)
       && symarg != NULL
       && strcmp (execarg, symarg) == 0)
     {
--- a/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+++ b/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
@ -33,7 +33,7 @@ Comments by Sergio Durigan Junior <sergiodj@redhat.com>:
 create mode 100644 gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp

 diff --git a/gdb/build-id.c b/gdb/build-id.c
-index a1fd3bfaab..831f16459f 100644
+index 409a5b8c54..e2c1e81266 100644
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
@@ -592,7 +592,10 @@ build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id,
--- a/gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+++ b/gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
@ -13,7 +13,7 @@ FileName: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 2 files changed, 16 insertions(+)

 diff --git a/gdb/build-id.c b/gdb/build-id.c
-index d420e3f9e7..a1fd3bfaab 100644
+index d60cf622dc..409a5b8c54 100644
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
@@ -678,6 +678,19 @@ build_id_to_filename (const struct bfd_build_id *build_id, char **link_return)
@ -37,7 +37,7 @@ index d420e3f9e7..a1fd3bfaab 100644
    and avoid their duplicities during a single inferior run.  */
 
 diff --git a/gdb/proc-service.list b/gdb/proc-service.list
-index 79c2e5b7fc..ac8364928c 100644
+index 53f7ed8b1e..323f5e83c2 100644
 --- a/gdb/proc-service.list
 +++ b/gdb/proc-service.list
@@ -37,4 +37,7 @@
--- a/gdb-6.6-buildid-locate-rpm-scl.patch
+++ b/gdb-6.6-buildid-locate-rpm-scl.patch
@ -16,7 +16,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=953585
 2 files changed, 68 insertions(+)

 diff --git a/gdb/build-id.c b/gdb/build-id.c
-index 831f16459f..531e652e75 100644
+index e2c1e81266..1b75530f91 100644
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
@@ -715,7 +715,11 @@ static int missing_rpm_list_entries;
@ -104,7 +104,7 @@ index 831f16459f..531e652e75 100644
 {
   return strcoll (*ap, *bp);
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index b82b336260..5648a303ea 100644
+index ebded1753f..ba3bed6c63 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
@@ -3725,6 +3725,16 @@ read_index_from_section (struct objfile *objfile,
--- a/gdb-6.6-buildid-locate-rpm.patch
+++ b/gdb-6.6-buildid-locate-rpm.patch
@ -244,7 +244,7 @@ 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 11d3774d9e..d420e3f9e7 100644
+index 5740628386..d60cf622dc 100644
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
@@ -35,6 +35,8 @@
@ -714,7 +714,7 @@ index 1d11a97080..edd7028f76 100644
 #undef HAVE_LIBUNWIND_IA64_H
 
 diff --git a/gdb/configure b/gdb/configure
-index 7b250079de..e314e28ff3 100755
+index db610f32fc..da188f195f 100755
 --- a/gdb/configure
 +++ b/gdb/configure
@@ -716,6 +716,11 @@ PKGVERSION
@ -1268,7 +1268,7 @@ index 7b250079de..e314e28ff3 100755
 
 subdirs="$subdirs testsuite"
 diff --git a/gdb/configure.ac b/gdb/configure.ac
-index 8e706b6e27..9de441fe79 100644
+index 3db44ae758..8473f065eb 100644
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
@@ -167,6 +167,199 @@ AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escape_dir,
@ -1472,7 +1472,7 @@ index 8e706b6e27..9de441fe79 100644
 
 # Check whether to support alternative target configurations
 diff --git a/gdb/corelow.c b/gdb/corelow.c
-index 398dd30a2d..fe1e0727a6 100644
+index c5b642db81..6e027c12e2 100644
 --- a/gdb/corelow.c
 +++ b/gdb/corelow.c
@@ -309,7 +309,7 @@ build_id_locate_exec (int from_tty)
@ -1485,7 +1485,7 @@ index 398dd30a2d..fe1e0727a6 100644
   do_cleanups (back_to);
 
 diff --git a/gdb/event-top.c b/gdb/event-top.c
-index 89936965a9..a1866f0c88 100644
+index 0c1528e5eb..0d668f35e0 100644
 --- a/gdb/event-top.c
 +++ b/gdb/event-top.c
@@ -40,6 +40,7 @@
@ -1505,7 +1505,7 @@ index 89936965a9..a1866f0c88 100644
   /* Do not call the python hook on an explicit prompt change as
      passed to this function, as this forms a secondary/local prompt,
      IE, displayed but not set.  */
-@@ -773,7 +776,10 @@ command_line_handler (char *rl)
+@@ -774,7 +777,10 @@ command_line_handler (char *rl)
       command_handler (cmd);
 
       if (ui->prompt_state != PROMPTED)
@ -1518,7 +1518,7 @@ index 89936965a9..a1866f0c88 100644
 }
 
 diff --git a/gdb/symfile.h b/gdb/symfile.h
-index 035733a8cf..6c4cd315ed 100644
+index 0d51f46d78..82c76431e1 100644
 --- a/gdb/symfile.h
 +++ b/gdb/symfile.h
@@ -546,6 +546,8 @@ void map_symbol_filenames (symbol_filename_ftype *fun, void *data,
--- a/gdb-6.6-buildid-locate-solib-missing-ids.patch
+++ b/gdb-6.6-buildid-locate-solib-missing-ids.patch
@ -23,7 +23,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1339862
 create mode 100644 gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp

 diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
-index 08788092dc..12207ac6e9 100644
+index a3399ad8f7..d7eeb6350d 100644
 --- a/gdb/solib-svr4.c
 +++ b/gdb/solib-svr4.c
@@ -1387,14 +1387,27 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
--- a/gdb-6.6-buildid-locate.patch
+++ b/gdb-6.6-buildid-locate.patch
@ -26,7 +26,7 @@ FileName: gdb-6.6-buildid-locate.patch
 15 files changed, 940 insertions(+), 40 deletions(-)

 diff --git a/gdb/build-id.c b/gdb/build-id.c
-index 4b2b63ecb4..11d3774d9e 100644
+index 945da4f3cf..5740628386 100644
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
@@ -26,11 +26,67 @@
@ -873,7 +873,7 @@ index 4b2b63ecb4..11d3774d9e 100644
 +  observer_attach_executable_changed (debug_print_executable_changed);
 +}
 diff --git a/gdb/build-id.h b/gdb/build-id.h
-index 137d9e18c5..c90472d63a 100644
+index 0f13c7d4cf..2d105dba88 100644
 --- a/gdb/build-id.h
 +++ b/gdb/build-id.h
@@ -22,9 +22,10 @@
@ -912,7 +912,7 @@ index 137d9e18c5..c90472d63a 100644
 
 #endif /* BUILD_ID_H */
 diff --git a/gdb/coffread.c b/gdb/coffread.c
-index 98f6eec820..f22b2b7df1 100644
+index fbbbb68f71..9698ec2191 100644
 --- a/gdb/coffread.c
 +++ b/gdb/coffread.c
@@ -735,7 +735,7 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
@ -925,7 +925,7 @@ index 98f6eec820..f22b2b7df1 100644
       if (debugfile == NULL)
 	debugfile = find_separate_debug_file_by_debuglink (objfile);
 diff --git a/gdb/corelow.c b/gdb/corelow.c
-index 4214896aaf..398dd30a2d 100644
+index 3a5256cb17..c5b642db81 100644
 --- a/gdb/corelow.c
 +++ b/gdb/corelow.c
@@ -45,6 +45,10 @@
@ -1022,10 +1022,10 @@ index 4214896aaf..398dd30a2d 100644
 +			   &setlist, &showlist);
 }
 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
-index da3ed28dfe..8e7ff6c4ef 100644
+index 8bdafb0ba4..2f2cbd3dea 100644
 --- a/gdb/doc/gdb.texinfo
 +++ b/gdb/doc/gdb.texinfo
-@@ -19298,6 +19298,27 @@ information files.
+@@ -19447,6 +19447,27 @@ information files.
 
 @end table
 
@ -1054,7 +1054,7 @@ index da3ed28dfe..8e7ff6c4ef 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 f32b115500..10c193d9f0 100644
+index a1bc7eda75..86d496312e 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
@@ -2907,7 +2907,7 @@ dwarf2_get_dwz_file (void)
@ -1067,7 +1067,7 @@ index f32b115500..10c193d9f0 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 7a41c26370..7c0411bec0 100644
+index 103b2144c3..fb32e03af5 100644
 --- a/gdb/elfread.c
 +++ b/gdb/elfread.c
@@ -1259,8 +1259,9 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
@ -1093,7 +1093,7 @@ index 7a41c26370..7c0411bec0 100644
 }
 
 diff --git a/gdb/objfiles.h b/gdb/objfiles.h
-index 62bd45400d..81cf0f542b 100644
+index 28e66eca36..5ab0e33fb6 100644
 --- a/gdb/objfiles.h
 +++ b/gdb/objfiles.h
@@ -470,6 +470,10 @@ struct objfile
@ -1108,7 +1108,7 @@ index 62bd45400d..81cf0f542b 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 52f2e1f792..418086fa8b 100644
+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)
@ -1130,7 +1130,7 @@ index 52f2e1f792..418086fa8b 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 6e834fb5d7..08788092dc 100644
+index 4973cc2f25..a3399ad8f7 100644
 --- a/gdb/solib-svr4.c
 +++ b/gdb/solib-svr4.c
@@ -45,6 +45,7 @@
@ -1198,7 +1198,7 @@ index 6e834fb5d7..08788092dc 100644
 
       /* If this entry has no name, or its name matches the name
 diff --git a/gdb/symfile.h b/gdb/symfile.h
-index 93fbe68440..035733a8cf 100644
+index 7c3fd8240a..0d51f46d78 100644
 --- a/gdb/symfile.h
 +++ b/gdb/symfile.h
@@ -543,6 +543,10 @@ void expand_symtabs_matching
@ -1213,7 +1213,7 @@ index 93fbe68440..035733a8cf 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 9be4aef7f4..54cb5d0d42 100644
+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 {
@ -1251,7 +1251,7 @@ index 9be4aef7f4..54cb5d0d42 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 37d6e4a670..38706ed341 100644
+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 {} {
@ -1263,7 +1263,7 @@ index 37d6e4a670..38706ed341 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 018367c161..ff8218bf3d 100644
+index 9884f004c5..fe2e79a681 100644
 --- a/gdb/testsuite/lib/gdb.exp
 +++ b/gdb/testsuite/lib/gdb.exp
@@ -1703,6 +1703,16 @@ proc default_gdb_start { } {
@ -1284,7 +1284,7 @@ index 018367c161..ff8218bf3d 100644
 }
 
 diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
-index 5682b7e2e1..60e4f7db55 100644
+index 2846da74e4..004c3e6c1c 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 } {
--- a/gdb-6.6-bz235197-fork-detach-info.patch
+++ b/gdb-6.6-bz235197-fork-detach-info.patch
@ -22,7 +22,7 @@ FileName: gdb-6.6-bz235197-fork-detach-info.patch
 create mode 100644 gdb/testsuite/gdb.base/fork-detach.exp

 diff --git a/gdb/infrun.c b/gdb/infrun.c
-index d7df3c7d57..a8a26fc36d 100644
+index 7e8d8da588..13d0fd2ad9 100644
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
@@ -461,7 +461,7 @@ holding the child stopped.  Try \"set detach-on-fork\" or \
@ -35,7 +35,7 @@ index d7df3c7d57..a8a26fc36d 100644
 	      /* Ensure that we have a process ptid.  */
 	      ptid_t process_ptid = pid_to_ptid (ptid_get_pid (child_ptid));
 diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp
-index 595ccbeae0..c9dbc3aba2 100644
+index 2a8bf27e5c..20fa041155 100644
 --- a/gdb/testsuite/gdb.base/catch-syscall.exp
 +++ b/gdb/testsuite/gdb.base/catch-syscall.exp
@@ -179,7 +179,7 @@ proc check_for_program_end {} {
--- a/gdb-6.6-scheduler_locking-step-is-default.patch
+++ b/gdb-6.6-scheduler_locking-step-is-default.patch
@ -16,7 +16,7 @@ FileName: gdb-6.6-scheduler_locking-step-is-default.patch
 5 files changed, 8 insertions(+), 5 deletions(-)

 diff --git a/gdb/infrun.c b/gdb/infrun.c
-index a8a26fc36d..db742f7398 100644
+index 13d0fd2ad9..8e30aed3b8 100644
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
@@ -2202,7 +2202,7 @@ static const char *const scheduler_enums[] = {
@ -29,7 +29,7 @@ index a8a26fc36d..db742f7398 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 3a9e1c354f..0f398276e9 100644
+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" \
@ -42,7 +42,7 @@ index 3a9e1c354f..0f398276e9 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 ae99c93b8a..378a2749e4 100644
+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
@ -56,7 +56,7 @@ index ae99c93b8a..378a2749e4 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 07eaff90d1..ae1a0c1b41 100644
+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
@ -78,7 +78,7 @@ index 07eaff90d1..ae1a0c1b41 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 8bd92c2d59..e69f3d4bbf 100644
+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} {
--- a/gdb-6.6-testsuite-timeouts.patch
+++ b/gdb-6.6-testsuite-timeouts.patch
@ -13,7 +13,7 @@ FileName: gdb-6.6-testsuite-timeouts.patch
 2 files changed, 4 insertions(+)

 diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
-index bb3dc2ffae..7080f264fc 100644
+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
@ -26,7 +26,7 @@ index bb3dc2ffae..7080f264fc 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 5a971f0018..0ee5c355db 100644
+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
--- a/gdb-6.7-testsuite-stable-results.patch
+++ b/gdb-6.7-testsuite-stable-results.patch
@ -65,7 +65,7 @@ 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 99afaffb05..92e9743c79 100644
+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] {
--- a/gdb-6.8-attach-signalled-detach-stopped.patch
+++ b/gdb-6.8-attach-signalled-detach-stopped.patch
@ -15,7 +15,7 @@ FileName: gdb-6.8-attach-signalled-detach-stopped.patch
 3 files changed, 111 insertions(+), 1 deletion(-)

 diff --git a/gdb/infrun.c b/gdb/infrun.c
-index c20a02e600..299585f350 100644
+index 91d6004d0a..64ff5f6bdf 100644
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
@@ -606,6 +606,13 @@ holding the child stopped.  Try \"set detach-on-fork\" or \
@ -33,7 +33,7 @@ index c20a02e600..299585f350 100644
 	}
 
 diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
-index 8c4750aaa2..d67a99a52a 100644
+index 1570a2bcb6..a101fbbe33 100644
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
@@ -194,6 +194,11 @@ enum tribool have_ptrace_getregset = TRIBOOL_UNKNOWN;
@ -124,7 +124,7 @@ index 8c4750aaa2..d67a99a52a 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 15a0352fc7..30dee99893 100644
+index 6c8c8bf10e..c953a9c60d 100644
 --- a/gdb/testsuite/gdb.threads/attach-stopped.exp
 +++ b/gdb/testsuite/gdb.threads/attach-stopped.exp
@@ -56,7 +56,65 @@ proc corefunc { threadtype } {
--- a/gdb-6.8-bz436037-reg-no-longer-active.patch
+++ b/gdb-6.8-bz436037-reg-no-longer-active.patch
@ -12,7 +12,7 @@ FileName: gdb-6.8-bz436037-reg-no-longer-active.patch
 1 file changed, 10 insertions(+), 2 deletions(-)

 diff --git a/gdb/valops.c b/gdb/valops.c
-index 4ecfa9fd96..30623efc6e 100644
+index 9b25980090..7aacd17d70 100644
 --- a/gdb/valops.c
 +++ b/gdb/valops.c
@@ -1103,6 +1103,8 @@ value_assign (struct value *toval, struct value *fromval)
--- a/gdb-6.8-quit-never-aborts.patch
+++ b/gdb-6.8-quit-never-aborts.patch
@ -22,7 +22,7 @@ on the debugger termination).
 4 files changed, 22 insertions(+)

 diff --git a/gdb/defs.h b/gdb/defs.h
-index 27f3becab0..95395b41a3 100644
+index 0c156d56c3..9a7f4d52b0 100644
 --- a/gdb/defs.h
 +++ b/gdb/defs.h
@@ -168,6 +168,10 @@ extern void default_quit_handler (void);
@ -37,7 +37,7 @@ index 27f3becab0..95395b41a3 100644
 
 /* Helper for the QUIT macro.  */
 diff --git a/gdb/extension.c b/gdb/extension.c
-index 4ffad038c9..d029a2f23d 100644
+index a1ee3510a6..229d702270 100644
 --- a/gdb/extension.c
 +++ b/gdb/extension.c
@@ -830,6 +830,11 @@ check_quit_flag (void)
@ -53,7 +53,7 @@ index 4ffad038c9..d029a2f23d 100644
     {
       if (extlang->ops->check_quit_flag != NULL)
 diff --git a/gdb/top.c b/gdb/top.c
-index 3fb113c381..2b69d08331 100644
+index 4749cf561d..e2665c8e22 100644
 --- a/gdb/top.c
 +++ b/gdb/top.c
@@ -1580,7 +1580,13 @@ quit_force (int *exit_arg, int from_tty)
@ -71,7 +71,7 @@ index 3fb113c381..2b69d08331 100644
   /* Get out of tfind mode, and kill or detach all inferiors.  */
   TRY
 diff --git a/gdb/utils.c b/gdb/utils.c
-index a0c7e9b03a..97bb9bcb18 100644
+index 6f0abc98a2..58c0380d17 100644
 --- a/gdb/utils.c
 +++ b/gdb/utils.c
@@ -107,6 +107,13 @@ static std::chrono::steady_clock::duration prompt_for_continue_wait_time;
--- a/gdb-6.8-sparc64-silence-memcpy-check.patch
+++ b/gdb-6.8-sparc64-silence-memcpy-check.patch
@ -12,7 +12,7 @@ FileName: gdb-6.8-sparc64-silence-memcpy-check.patch
 1 file changed, 1 insertion(+)

 diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
-index 809cb9ac2e..321c9244a9 100644
+index 12fd5b9e64..e304ba8dbc 100644
 --- a/gdb/sparc-tdep.c
 +++ b/gdb/sparc-tdep.c
@@ -1444,6 +1444,7 @@ sparc32_store_return_value (struct type *type, struct regcache *regcache,
--- a/gdb-7.2.50-sparc-add-workaround-to-broken-debug-files.patch
+++ b/gdb-7.2.50-sparc-add-workaround-to-broken-debug-files.patch
@ -22,7 +22,7 @@ FileName: gdb-7.2.50-sparc-add-workaround-to-broken-debug-files.patch
 1 file changed, 6 insertions(+)

 diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c
-index cc02740c1a..24155e7c55 100644
+index 80ddd427af..3e4d3e4444 100644
 --- a/gdb/gdb_bfd.c
 +++ b/gdb/gdb_bfd.c
@@ -24,12 +24,14 @@
--- a/gdb-archer-pie-addons-keep-disabled.patch
+++ b/gdb-archer-pie-addons-keep-disabled.patch
@ -13,7 +13,7 @@ FileName: gdb-archer-pie-addons-keep-disabled.patch
 3 files changed, 52 insertions(+)

 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
-index b68718d250..bfe92f679f 100644
+index 2b5eebbbee..814802a0a1 100644
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
@@ -15590,6 +15590,50 @@ initialize_breakpoint_ops (void)
@ -68,7 +68,7 @@ index b68718d250..bfe92f679f 100644
 _initialize_breakpoint (void)
 {
 diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
-index 6406a1d32b..eed2c968f2 100644
+index 8bb81d8d17..3fddbaa713 100644
 --- a/gdb/breakpoint.h
 +++ b/gdb/breakpoint.h
@@ -1656,6 +1656,9 @@ extern const char *ep_parse_optional_if_clause (const char **arg);
@ -82,7 +82,7 @@ index 6406a1d32b..eed2c968f2 100644
 extern void print_breakpoint (breakpoint *bp);
 
 diff --git a/gdb/objfiles.c b/gdb/objfiles.c
-index edde399802..1d24fa95ba 100644
+index 7adaef119d..2f061b47f7 100644
 --- a/gdb/objfiles.c
 +++ b/gdb/objfiles.c
@@ -879,6 +879,11 @@ objfile_relocate1 (struct objfile *objfile,
--- a/gdb-archer-pie-addons.patch
+++ b/gdb-archer-pie-addons.patch
@ -12,10 +12,10 @@ FileName: gdb-archer-pie-addons.patch
 2 files changed, 7 insertions(+), 1 deletion(-)

 diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
-index 33de8faf2b..53d1592318 100644
+index 923ba101ca..9703d966a7 100644
 --- a/gdb/gdbtypes.h
 +++ b/gdb/gdbtypes.h
-@@ -440,6 +440,7 @@ enum field_loc_kind
+@@ -443,6 +443,7 @@ enum field_loc_kind
   {
     FIELD_LOC_KIND_BITPOS,	/**< bitpos */
     FIELD_LOC_KIND_ENUMVAL,	/**< enumval */
@ -23,7 +23,7 @@ index 33de8faf2b..53d1592318 100644
     FIELD_LOC_KIND_PHYSADDR,	/**< physaddr */
     FIELD_LOC_KIND_PHYSNAME,	/**< physname */
     FIELD_LOC_KIND_DWARF_BLOCK	/**< dwarf_block */
-@@ -491,6 +492,7 @@ union field_location
+@@ -494,6 +495,7 @@ union field_location
      field.  Otherwise, physname is the mangled label of the
      static field.  */
 
@ -31,7 +31,7 @@ index 33de8faf2b..53d1592318 100644
   CORE_ADDR physaddr;
   const char *physname;
 
-@@ -1339,6 +1341,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
+@@ -1342,6 +1344,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
 #define FIELD_ENUMVAL_LVAL(thisfld) ((thisfld).loc.enumval)
 #define FIELD_ENUMVAL(thisfld) (FIELD_ENUMVAL_LVAL (thisfld) + 0)
 #define FIELD_STATIC_PHYSNAME(thisfld) ((thisfld).loc.physname)
@ -39,7 +39,7 @@ index 33de8faf2b..53d1592318 100644
 #define FIELD_STATIC_PHYSADDR(thisfld) ((thisfld).loc.physaddr)
 #define FIELD_DWARF_BLOCK(thisfld) ((thisfld).loc.dwarf_block)
 #define SET_FIELD_BITPOS(thisfld, bitpos)			\
-@@ -1350,6 +1353,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
+@@ -1353,6 +1356,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
 #define SET_FIELD_PHYSNAME(thisfld, name)			\
   (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSNAME,		\
    FIELD_STATIC_PHYSNAME (thisfld) = (name))
@ -47,7 +47,7 @@ index 33de8faf2b..53d1592318 100644
 #define SET_FIELD_PHYSADDR(thisfld, addr)			\
   (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSADDR,		\
    FIELD_STATIC_PHYSADDR (thisfld) = (addr))
-@@ -1366,6 +1370,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
+@@ -1369,6 +1373,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
 #define TYPE_FIELD_BITPOS(thistype, n) FIELD_BITPOS (TYPE_FIELD (thistype, n))
 #define TYPE_FIELD_ENUMVAL(thistype, n) FIELD_ENUMVAL (TYPE_FIELD (thistype, n))
 #define TYPE_FIELD_STATIC_PHYSNAME(thistype, n) FIELD_STATIC_PHYSNAME (TYPE_FIELD (thistype, n))
@ -56,7 +56,7 @@ index 33de8faf2b..53d1592318 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 3e0ca25fa7..a61f728550 100644
+index d4b4673f66..558d0bbd7a 100644
 --- a/gdb/value.c
 +++ b/gdb/value.c
@@ -2966,7 +2966,8 @@ value_static_field (struct type *type, int fieldno)
--- a/gdb-archer-vla-tests.patch
+++ b/gdb-archer-vla-tests.patch
@ -97,7 +97,7 @@ FileName: gdb-archer-vla-tests.patch
 create mode 100644 gdb/testsuite/gdb.pascal/arrays.pas

 diff --git a/gdb/testsuite/gdb.ada/packed_array.exp b/gdb/testsuite/gdb.ada/packed_array.exp
-index 3222a95faa..8dafb65cf9 100644
+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" {
@ -1181,7 +1181,7 @@ index 0000000000..4ef6214629
 +
 +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 511b86b728..e111479bb3 100644
+index 5a0d01d04f..9e4b16e902 100644
 --- a/gdb/testsuite/gdb.base/arrayidx.c
 +++ b/gdb/testsuite/gdb.base/arrayidx.c
@@ -17,6 +17,13 @@
@ -1199,7 +1199,7 @@ index 511b86b728..e111479bb3 100644
 main (void)
 {
 diff --git a/gdb/testsuite/gdb.base/arrayidx.exp b/gdb/testsuite/gdb.base/arrayidx.exp
-index c2d4fd958d..69ed450ae3 100644
+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" \
@ -3822,7 +3822,7 @@ index 0000000000..295602d68c
 +  writeln(s); { set breakpoint 2 here }
 +end.
 diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
-index ff8218bf3d..c5924f97af 100644
+index fe2e79a681..2845035caa 100644
 --- a/gdb/testsuite/lib/gdb.exp
 +++ b/gdb/testsuite/lib/gdb.exp
@@ -178,6 +178,11 @@ proc gdb_unload {} {
@ -3838,7 +3838,7 @@ index ff8218bf3d..c5924f97af 100644
 	    send_gdb "y\n"
 	    exp_continue
 diff --git a/gdb/testsuite/lib/pascal.exp b/gdb/testsuite/lib/pascal.exp
-index a0562c3fe5..8f0257196f 100644
+index 03d1b1bc06..9f9e143dff 100644
 --- a/gdb/testsuite/lib/pascal.exp
 +++ b/gdb/testsuite/lib/pascal.exp
@@ -37,6 +37,9 @@ proc pascal_init {} {
--- a/gdb-archer.patch
+++ b/gdb-archer.patch
@ -38,10 +38,10 @@ tromey/python
 create mode 100644 gdb/python/lib/gdb/function/in_scope.py

 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index edd0b239d4..0c3f89aa7e 100644
+index 3142ad6af1..28d8664236 100644
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
-@@ -2113,6 +2113,12 @@ stamp-h: $(srcdir)/config.in config.status
+@@ -2110,6 +2110,12 @@ stamp-h: $(srcdir)/config.in config.status
 	  CONFIG_LINKS= \
 	  $(SHELL) config.status
 
@ -55,7 +55,7 @@ index edd0b239d4..0c3f89aa7e 100644
 	$(SHELL) config.status --recheck
 
 diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
-index dadde8895a..19e436d725 100644
+index 5c7c0b4c2e..2014607e9e 100644
 --- a/gdb/data-directory/Makefile.in
 +++ b/gdb/data-directory/Makefile.in
@@ -80,6 +80,8 @@ PYTHON_FILE_LIST = \
@ -77,7 +77,7 @@ index dadde8895a..19e436d725 100644
 	gdb/printer/bound_registers.py
 
 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
-index 0e8ad7750d..6cfcdcc1f6 100644
+index 7b99ae1551..dea17fd5a7 100644
 --- a/gdb/doc/gdb.texinfo
 +++ b/gdb/doc/gdb.texinfo
@@ -1245,6 +1245,16 @@ for remote debugging.
@ -98,7 +98,7 @@ index 0e8ad7750d..6cfcdcc1f6 100644
 @item -tui
 @cindex @code{--tui}
 diff --git a/gdb/doc/python.texi b/gdb/doc/python.texi
-index d7a9620e6b..41052cc109 100644
+index ccf011e35e..461e900f77 100644
 --- a/gdb/doc/python.texi
 +++ b/gdb/doc/python.texi
@@ -88,8 +88,6 @@ containing @code{end}.  For example:
@ -131,7 +131,7 @@ index 05a38b2670..9801fdff67 100644
   set variable $gdb_init_done = 1
 
 diff --git a/gdb/main.c b/gdb/main.c
-index df1f12bd79..a530a632bf 100644
+index b079e79c93..b150af4e70 100644
 --- a/gdb/main.c
 +++ b/gdb/main.c
@@ -33,6 +33,7 @@
@ -151,7 +151,7 @@ index df1f12bd79..a530a632bf 100644
 {
   int argc = context->argc;
   char **argv = context->argv;
-@@ -695,10 +696,14 @@ captured_main_1 (struct captured_main_args *context)
+@@ -694,10 +695,14 @@ captured_main_1 (struct captured_main_args *context)
       {"args", no_argument, &set_args, 1},
       {"l", required_argument, 0, 'l'},
       {"return-child-result", no_argument, &return_child_result, 1},
@ -167,7 +167,7 @@ index df1f12bd79..a530a632bf 100644
       {
 	int option_index;
 
-@@ -716,6 +721,9 @@ captured_main_1 (struct captured_main_args *context)
+@@ -715,6 +720,9 @@ captured_main_1 (struct captured_main_args *context)
 	  case 0:
 	    /* Long option that just sets a flag.  */
 	    break;
@ -177,7 +177,7 @@ index df1f12bd79..a530a632bf 100644
 	  case OPT_SE:
 	    symarg = optarg;
 	    execarg = optarg;
-@@ -888,7 +896,31 @@ captured_main_1 (struct captured_main_args *context)
+@@ -889,7 +897,31 @@ captured_main_1 (struct captured_main_args *context)
 
   /* Now that gdb_init has created the initial inferior, we're in
      position to set args for that inferior.  */
@ -210,7 +210,7 @@ index df1f12bd79..a530a632bf 100644
     {
       /* The remaining options are the command-line options for the
 	 inferior.  The first one is the sym/exec file, and the rest
-@@ -1178,7 +1210,8 @@ captured_main_1 (struct captured_main_args *context)
+@@ -1179,7 +1211,8 @@ captured_main_1 (struct captured_main_args *context)
 
   /* Read in the old history after all the command files have been
      read.  */
@ -220,7 +220,7 @@ index df1f12bd79..a530a632bf 100644
 
   if (batch_flag)
     {
-@@ -1191,24 +1224,37 @@ static void
+@@ -1192,24 +1225,37 @@ static void
 captured_main (void *data)
 {
   struct captured_main_args *context = (struct captured_main_args *) data;
@ -271,7 +271,7 @@ index df1f12bd79..a530a632bf 100644
     }
   /* No exit -- exit is through quit_command.  */
 }
-@@ -1251,6 +1297,12 @@ print_gdb_help (struct ui_file *stream)
+@@ -1252,6 +1298,12 @@ print_gdb_help (struct ui_file *stream)
   fputs_unfiltered (_("\
 This is the GNU debugger.  Usage:\n\n\
     gdb [options] [executable-file [core-file or process-id]]\n\
@ -284,7 +284,7 @@ index df1f12bd79..a530a632bf 100644
     gdb [options] --args executable-file [inferior-arguments ...]\n\n\
 "), stream);
   fputs_unfiltered (_("\
-@@ -1296,6 +1348,13 @@ Output and user interface control:\n\n\
+@@ -1297,6 +1349,13 @@ Output and user interface control:\n\n\
 #endif
   fputs_unfiltered (_("\
   --dbx              DBX compatibility mode.\n\
@ -482,7 +482,7 @@ index 0000000000..8742680614
 +
 +InScope ()
 diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
-index f099ae437f..468b0ebd92 100644
+index 4556323472..826122b9b9 100644
 --- a/gdb/python/python-internal.h
 +++ b/gdb/python/python-internal.h
@@ -651,6 +651,9 @@ class gdbpy_enter_varobj : public gdbpy_enter
@ -496,7 +496,7 @@ index f099ae437f..468b0ebd92 100644
 extern const struct language_defn *python_language;
 
 diff --git a/gdb/python/python.c b/gdb/python/python.c
-index fe09a97d28..7c85e641aa 100644
+index 610dda828c..de5ffbd70b 100644
 --- a/gdb/python/python.c
 +++ b/gdb/python/python.c
@@ -95,6 +95,8 @@ const struct extension_language_defn extension_language_python =
@ -641,7 +641,7 @@ index fe09a97d28..7c85e641aa 100644
     "Return a gdb parameter's value" },
 
 diff --git a/gdb/python/python.h b/gdb/python/python.h
-index e407faabfd..fc1c6326a2 100644
+index de58fd81df..237a84a0b2 100644
 --- a/gdb/python/python.h
 +++ b/gdb/python/python.h
@@ -25,4 +25,6 @@
@ -652,7 +652,7 @@ index e407faabfd..fc1c6326a2 100644
 +
 #endif /* GDB_PYTHON_H */
 diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp
-index f5d4a3cc12..3546f7ba2a 100644
+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
@ -665,7 +665,7 @@ index f5d4a3cc12..3546f7ba2a 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 1781887c4a..8a2ddd6fae 100644
+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 {} {
@ -693,7 +693,7 @@ index 1781887c4a..8a2ddd6fae 100644
 # Test either C or C++ values. 
 
 diff --git a/gdb/varobj.c b/gdb/varobj.c
-index 93b97f6f70..753c6596b3 100644
+index 01dabef37c..c198731d0b 100644
 --- a/gdb/varobj.c
 +++ b/gdb/varobj.c
@@ -217,6 +217,14 @@ is_root_p (const struct varobj *var)
@ -712,7 +712,7 @@ index 93b97f6f70..753c6596b3 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 9163a34fd0..ed51b6ad34 100644
+index 6e80d1b89e..677547996f 100644
 --- a/gdb/varobj.h
 +++ b/gdb/varobj.h
@@ -327,6 +327,8 @@ extern bool varobj_has_more (const struct varobj *var, int to);
--- a/gdb-attach-fail-reasons-5of5.patch
+++ b/gdb-attach-fail-reasons-5of5.patch
@ -81,7 +81,7 @@ index edd7028f76..4de3e842d1 100644
 #undef HAVE_SETLOCALE
 
 diff --git a/gdb/configure b/gdb/configure
-index e314e28ff3..d99f28b9f2 100755
+index da188f195f..aa944a08c4 100755
 --- a/gdb/configure
 +++ b/gdb/configure
@@ -15679,6 +15679,64 @@ cat >>confdefs.h <<_ACEOF
@ -150,7 +150,7 @@ index e314e28ff3..d99f28b9f2 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 9de441fe79..830618dbe5 100644
+index 8473f065eb..1b6c4d77c3 100644
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
@@ -2042,6 +2042,10 @@ case $host_os in
@ -189,10 +189,10 @@ index dda7c1f150..b2a34b92ce 100644
 #undef HAVE_SETNS
 
 diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
-index 835dcca314..9028c82b01 100755
+index ca51321c84..8ba1fce5d4 100755
 --- a/gdb/gdbserver/configure
 +++ b/gdb/gdbserver/configure
-@@ -8452,6 +8452,64 @@ if $want_ipa ; then
+@@ -8453,6 +8453,64 @@ if $want_ipa ; then
    fi
 fi
 
@ -258,10 +258,10 @@ index 835dcca314..9028c82b01 100755
 
 
 diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
-index 456d3b360a..0074c437f1 100644
+index 7ea3654f63..6772479375 100644
 --- a/gdb/gdbserver/configure.ac
 +++ b/gdb/gdbserver/configure.ac
-@@ -486,6 +486,10 @@ if $want_ipa ; then
+@@ -487,6 +487,10 @@ if $want_ipa ; then
    fi
 fi
 
@ -273,7 +273,7 @@ index 456d3b360a..0074c437f1 100644
 AC_SUBST(GDBSERVER_LIBS)
 AC_SUBST(srv_xmlbuiltin)
 diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
-index f6a52d5859..ab3be27142 100644
+index cfb2b56a08..0faac80625 100644
 --- a/gdb/gdbserver/linux-low.c
 +++ b/gdb/gdbserver/linux-low.c
@@ -963,7 +963,21 @@ linux_ptrace_fun ()
@ -300,7 +300,7 @@ index f6a52d5859..ab3be27142 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 b8f3108937..8c4750aaa2 100644
+index c41ea391a0..1570a2bcb6 100644
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
@@ -1127,7 +1127,29 @@ linux_nat_create_inferior (struct target_ops *ops,
@ -335,7 +335,7 @@ index b8f3108937..8c4750aaa2 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 438177fa76..ab6ae86400 100644
+index ac6ba72390..be51e2449b 100644
 --- a/gdb/nat/linux-ptrace.c
 +++ b/gdb/nat/linux-ptrace.c
@@ -27,6 +27,10 @@
@ -382,10 +382,10 @@ index 438177fa76..ab6ae86400 100644
 
 int
 diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
-index 59549452c0..b951492102 100644
+index 1f960ed132..84912f909c 100644
 --- a/gdb/nat/linux-ptrace.h
 +++ b/gdb/nat/linux-ptrace.h
-@@ -185,6 +185,7 @@ extern void linux_ptrace_attach_fail_reason (pid_t pid, struct buffer *buffer);
+@@ -190,6 +190,7 @@ extern void linux_ptrace_attach_fail_reason (pid_t pid, struct buffer *buffer);
 extern char *linux_ptrace_attach_fail_reason_string (ptid_t ptid, int err);
 
 extern void linux_ptrace_init_warnings (void);
--- a/gdb-btrobust.patch
+++ b/gdb-btrobust.patch
@ -17,7 +17,7 @@ printed, but a default backtrace will occur in this case.
 1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
-index 75b055c98c..9f33a7aab9 100644
+index e887849c36..a8e4f49eb5 100644
 --- a/gdb/python/py-framefilter.c
 +++ b/gdb/python/py-framefilter.c
@@ -1388,6 +1388,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
--- a/gdb-bz1219747-attach-kills.patch
+++ b/gdb-bz1219747-attach-kills.patch
@ -87,10 +87,10 @@ gdb/testsuite/ChangeLog
 create mode 100644 gdb/testsuite/gdb.base/attach-kills.exp

 diff --git a/gdb/main.c b/gdb/main.c
-index d5b4c3adb9..df1f12bd79 100644
+index 17d35f4a8a..b079e79c93 100644
 --- a/gdb/main.c
 +++ b/gdb/main.c
-@@ -1113,7 +1113,10 @@ captured_main_1 (struct captured_main_args *context)
+@@ -1114,7 +1114,10 @@ captured_main_1 (struct captured_main_args *context)
       if (isdigit (pid_or_core_arg[0]))
 	{
 	  if (catch_command_errors (attach_command, pid_or_core_arg,
--- a/gdb-bz533176-fortran-omp-step.patch
+++ b/gdb-bz533176-fortran-omp-step.patch
@ -37,7 +37,7 @@ debugging problem of GOMP outside of the scope of this Bug.
 create mode 100644 gdb/testsuite/gdb.fortran/omp-step.f90

 diff --git a/gdb/infrun.c b/gdb/infrun.c
-index db742f7398..8c2c424883 100644
+index 8e30aed3b8..9b7b238f4d 100644
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
@@ -6663,6 +6663,16 @@ process_event_stop_test (struct execution_control_state *ecs)
--- a/gdb-bz541866-rwatch-before-run.patch
+++ b/gdb-bz541866-rwatch-before-run.patch
@ -21,7 +21,7 @@ FileName: gdb-bz541866-rwatch-before-run.patch
 create mode 100644 gdb/testsuite/gdb.base/watchpoint-hw-before-run.exp

 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
-index bfe92f679f..af0aad9cd2 100644
+index 814802a0a1..5a99de75e1 100644
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
@@ -8864,7 +8864,7 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch,
@ -111,7 +111,7 @@ index 0000000000..212daba477
 +
 +#endif /* NM_LINUX64_H */
 diff --git a/gdb/configure.nat b/gdb/configure.nat
-index 962abd6edf..404b6c8deb 100644
+index 8e14892722..6dbb072054 100644
 --- a/gdb/configure.nat
 +++ b/gdb/configure.nat
@@ -237,6 +237,7 @@ case ${gdb_host} in
@ -131,10 +131,10 @@ index 962abd6edf..404b6c8deb 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 7863a8d843..1e9aa9f8d2 100644
+index 4781fbc59c..e3a2882fe5 100644
 --- a/gdb/target.h
 +++ b/gdb/target.h
-@@ -1924,9 +1924,11 @@ extern struct thread_info *target_thread_handle_to_thread_info
+@@ -1915,9 +1915,11 @@ extern struct thread_info *target_thread_handle_to_thread_info
    one.  OTHERTYPE is the number of watchpoints of other types than
    this one used so far.  */
 
--- a/gdb-bz568248-oom-is-error.patch
+++ b/gdb-bz568248-oom-is-error.patch
@ -56,7 +56,7 @@ gdb/
 1 file changed, 2 insertions(+), 4 deletions(-)

 diff --git a/gdb/utils.c b/gdb/utils.c
-index 2f8f06fb5a..c306e0c384 100644
+index c531748fe4..0066bfcc4b 100644
 --- a/gdb/utils.c
 +++ b/gdb/utils.c
@@ -774,13 +774,11 @@ malloc_failure (long size)
--- a/gdb-ccache-workaround.patch
+++ b/gdb-ccache-workaround.patch
@ -12,7 +12,7 @@ FileName: gdb-ccache-workaround.patch
 1 file changed, 8 insertions(+)

 diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
-index d4242cceb1..6602bc591a 100644
+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-*"] } {
--- a/gdb-container-rh-pkg.patch
+++ b/gdb-container-rh-pkg.patch
@ -12,7 +12,7 @@ FileName: gdb-container-rh-pkg.patch
 1 file changed, 11 insertions(+), 1 deletion(-)

 diff --git a/gdb/remote.c b/gdb/remote.c
-index a33a70642b..e98d22cb20 100644
+index 1eee712466..fbade4f267 100644
 --- a/gdb/remote.c
 +++ b/gdb/remote.c
@@ -13431,7 +13431,17 @@ remote_pid_to_exec_file (struct target_ops *self, int pid)
--- a/gdb-core-open-vdso-warning.patch
+++ b/gdb-core-open-vdso-warning.patch
@ -22,7 +22,7 @@ Date:   Wed Sep 25 11:52:50 2013 +0000
 1 file changed, 21 insertions(+), 2 deletions(-)

 diff --git a/gdb/testsuite/gdb.base/solib-symbol.exp b/gdb/testsuite/gdb.base/solib-symbol.exp
-index dd2f6c77d4..53824f8142 100644
+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"
--- a/gdb-dts-rhel6-python-compat.patch
+++ b/gdb-dts-rhel6-python-compat.patch
@ -20,7 +20,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1020004
 create mode 100644 gdb/python/lib/gdb/command/backtrace.py

 diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
-index 304d4b05c0..dadde8895a 100644
+index 753e0b69a3..5c7c0b4c2e 100644
 --- a/gdb/data-directory/Makefile.in
 +++ b/gdb/data-directory/Makefile.in
@@ -71,6 +71,8 @@ PYTHON_FILE_LIST = \
--- a/gdb-fedora-libncursesw.patch
+++ b/gdb-fedora-libncursesw.patch
@ -16,7 +16,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1270534
 2 files changed, 8 insertions(+), 4 deletions(-)

 diff --git a/gdb/configure b/gdb/configure
-index 01210afccc..c1186fd294 100755
+index dbae54b42c..fcd2efd4d7 100755
 --- a/gdb/configure
 +++ b/gdb/configure
@@ -9238,6 +9238,7 @@ if test x"$prefer_curses" = xyes; then
@ -54,7 +54,7 @@ index 01210afccc..c1186fd294 100755
     ac_res="none required"
   else
 diff --git a/gdb/configure.ac b/gdb/configure.ac
-index 8c6a5f7d1e..c7d5f2de99 100644
+index e94280f773..ec82a09a0b 100644
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
@@ -755,7 +755,8 @@ if test x"$prefer_curses" = xyes; then
--- a/gdb-follow-child-stale-parent.patch
+++ b/gdb-follow-child-stale-parent.patch
@ -27,7 +27,7 @@ unwinders try to access it, breaking:
 1 file changed, 3 insertions(+)

 diff --git a/gdb/infrun.c b/gdb/infrun.c
-index 8c2c424883..c20a02e600 100644
+index 9b7b238f4d..91d6004d0a 100644
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
@@ -749,6 +749,9 @@ follow_fork (void)
--- a/gdb-gdb-add-index-script.patch
+++ b/gdb-gdb-add-index-script.patch
@ -46,10 +46,10 @@ Subject: [PATCH 4/4] add gdb-add-index
 3 files changed, 74 insertions(+), 1 deletion(-)

 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index f95505ea21..edd0b239d4 100644
+index e77d6a5c03..3142ad6af1 100644
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
-@@ -1773,6 +1773,15 @@ install-only: install-gstack $(CONFIG_INSTALL)
+@@ -1770,6 +1770,15 @@ install-only: install-gstack $(CONFIG_INSTALL)
 		  $(INSTALL_SCRIPT) gcore \
 			  $(DESTDIR)$(bindir)/$$transformed_name; \
 	fi
@ -66,7 +66,7 @@ index f95505ea21..edd0b239d4 100644
 
 install-strip:
 diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
-index e0e50c166e..3cdcbbd567 100644
+index eafadee899..0323bc4ecb 100644
 --- a/gdb/doc/Makefile.in
 +++ b/gdb/doc/Makefile.in
@@ -174,7 +174,7 @@ POD2MAN5 = pod2man --center="GNU Development Tools" \
@ -93,10 +93,10 @@ index e0e50c166e..3cdcbbd567 100644
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dgdbinit < $(srcdir)/gdb.texinfo > gdbinit.pod
 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
-index 8e7ff6c4ef..0e8ad7750d 100644
+index 2f2cbd3dea..7b99ae1551 100644
 --- a/gdb/doc/gdb.texinfo
 +++ b/gdb/doc/gdb.texinfo
-@@ -19647,6 +19647,14 @@ There are currently some limitation on indices.  They only work when
+@@ -19796,6 +19796,14 @@ There are currently some limitation on indices.  They only work when
 for DWARF debugging information, not stabs.  And, they do not
 currently work for programs using Ada.
 
@ -111,7 +111,7 @@ index 8e7ff6c4ef..0e8ad7750d 100644
 @node Symbol Errors
 @section Errors Reading Symbol Files
 
-@@ -42607,6 +42615,7 @@ switch (die->tag)
+@@ -42759,6 +42767,7 @@ switch (die->tag)
 * gdbserver man::               Remote Server for the GNU Debugger man page
 * gcore man::                   Generate a core file of a running program
 * gdbinit man::                 gdbinit scripts
@ -119,7 +119,7 @@ index 8e7ff6c4ef..0e8ad7750d 100644
 @end menu
 
 @node gdb man
-@@ -43283,6 +43292,54 @@ Richard M. Stallman and Roland H. Pesch, July 1991.
+@@ -43435,6 +43444,54 @@ Richard M. Stallman and Roland H. Pesch, July 1991.
 @end ifset
 @c man end
 
--- a/gdb-glibc-strstr-workaround.patch
+++ b/gdb-glibc-strstr-workaround.patch
@ -14,10 +14,10 @@ FileName: gdb-glibc-strstr-workaround.patch
 create mode 100644 gdb/testsuite/gdb.base/gnu-ifunc-strstr-workaround.exp

 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 10c193d9f0..e2fc1310d8 100644
+index 86d496312e..babe659539 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -21293,6 +21293,26 @@ new_symbol_full (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
+@@ -21330,6 +21330,26 @@ new_symbol_full (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
       /* Cache this symbol's name and the name's demangled form (if any).  */
       SYMBOL_SET_LANGUAGE (sym, cu->language, &objfile->objfile_obstack);
       linkagename = dwarf2_physname (name, die, cu);
--- a/gdb-glibc-vdso-workaround.patch
+++ b/gdb-glibc-vdso-workaround.patch
@ -24,7 +24,7 @@ gdb/
 1 file changed, 5 insertions(+), 2 deletions(-)

 diff --git a/gdb/solib.c b/gdb/solib.c
-index cb7a5c0b51..511671ea9d 100644
+index 3dba5eaa8a..17c0a02f27 100644
 --- a/gdb/solib.c
 +++ b/gdb/solib.c
@@ -884,8 +884,11 @@ update_solib_list (int from_tty)
--- a/gdb-gnat-dwarf-crash-3of3.patch
+++ b/gdb-gnat-dwarf-crash-3of3.patch
@ -45,10 +45,10 @@ gdb/
 1 file changed, 8 insertions(+)

 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index d47497cec7..b82b336260 100644
+index 1a62c58614..ebded1753f 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -10602,6 +10602,14 @@ private:
+@@ -10614,6 +10614,14 @@ private:
 static void
 process_die (struct die_info *die, struct dwarf2_cu *cu)
 {
--- a/gdb-jit-reader-multilib.patch
+++ b/gdb-jit-reader-multilib.patch
@ -13,7 +13,7 @@ FileName: gdb-jit-reader-multilib.patch
 2 files changed, 10 insertions(+), 6 deletions(-)

 diff --git a/gdb/configure b/gdb/configure
-index d99f28b9f2..01210afccc 100755
+index aa944a08c4..dbae54b42c 100755
 --- a/gdb/configure
 +++ b/gdb/configure
@@ -9528,10 +9528,12 @@ _ACEOF
@ -33,7 +33,7 @@ index d99f28b9f2..01210afccc 100755
   TARGET_PTR="unsigned __int128"
 else
 diff --git a/gdb/configure.ac b/gdb/configure.ac
-index 830618dbe5..8c6a5f7d1e 100644
+index 1b6c4d77c3..e94280f773 100644
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
@@ -832,10 +832,12 @@ AC_CHECK_SIZEOF(unsigned long long)
--- a/gdb-libexec-add-index.patch
+++ b/gdb-libexec-add-index.patch
@ -12,7 +12,7 @@ FileName: gdb-libexec-add-index.patch
 1 file changed, 5 insertions(+)

 diff --git a/gdb/contrib/gdb-add-index.sh b/gdb/contrib/gdb-add-index.sh
-index 02b17f0fc0..bd8fc429a1 100755
+index 71146966ab..500b2f62d5 100755
 --- a/gdb/contrib/gdb-add-index.sh
 +++ b/gdb/contrib/gdb-add-index.sh
@@ -21,6 +21,11 @@
--- a/gdb-linux_perf-bundle.patch
+++ b/gdb-linux_perf-bundle.patch
@ -15,7 +15,7 @@ FileName: gdb-linux_perf-bundle.patch
 4 files changed, 181 insertions(+), 2 deletions(-)

 diff --git a/gdb/configure b/gdb/configure
-index c1186fd294..1cc220d281 100755
+index fcd2efd4d7..26f5259b64 100755
 --- a/gdb/configure
 +++ b/gdb/configure
@@ -11907,7 +11907,7 @@ else
@ -28,7 +28,7 @@ index c1186fd294..1cc220d281 100755
 
 _ACEOF
 diff --git a/gdb/configure.ac b/gdb/configure.ac
-index c7d5f2de99..0bd9fcace9 100644
+index ec82a09a0b..6a07648239 100644
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
@@ -1466,7 +1466,7 @@ else
@ -41,7 +41,7 @@ index c7d5f2de99..0bd9fcace9 100644
   ]]), [perf_event=yes], [perf_event=no])
   if test "$perf_event" != yes; then
 diff --git a/gdb/gdb.c b/gdb/gdb.c
-index fbf6711203..8dcde4e6d8 100644
+index b97500e579..151545105c 100644
 --- a/gdb/gdb.c
 +++ b/gdb/gdb.c
@@ -20,11 +20,19 @@
@ -65,7 +65,7 @@ index fbf6711203..8dcde4e6d8 100644
   args.argc = argc;
   args.argv = argv;
 diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h
-index c08b2eb9ae..4b4f22f5ec 100644
+index 31a8d9e67b..72faf23c5f 100644
 --- a/gdb/nat/linux-btrace.h
 +++ b/gdb/nat/linux-btrace.h
@@ -28,6 +28,177 @@
--- a/gdb-moribund-utrace-workaround.patch
+++ b/gdb-moribund-utrace-workaround.patch
@ -17,7 +17,7 @@ Bug in FSF GDB exploited by the ptrace-on-utrace interaction.
 1 file changed, 2 insertions(+)

 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
-index af0aad9cd2..2d8a8d1a50 100644
+index 5a99de75e1..6a0c15b239 100644
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
@@ -12089,6 +12089,8 @@ update_global_location_list (enum ugll_insert_mode insert_mode)
--- a/gdb-python-gil.patch
+++ b/gdb-python-gil.patch
@ -20,7 +20,7 @@ FileName: gdb-python-gil.patch
 create mode 100644 gdb/testsuite/gdb.python/py-gil-mthread.py

 diff --git a/gdb/doc/python.texi b/gdb/doc/python.texi
-index 28a7a1a9f5..d7a9620e6b 100644
+index ebd48fffe7..ccf011e35e 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
@ -39,7 +39,7 @@ index 28a7a1a9f5..d7a9620e6b 100644
 
 @findex gdb.breakpoints
 diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
-index 8fc8cc5a5d..f099ae437f 100644
+index f32a258209..4556323472 100644
 --- a/gdb/python/python-internal.h
 +++ b/gdb/python/python-internal.h
@@ -142,6 +142,8 @@ typedef int Py_ssize_t;
@ -52,7 +52,7 @@ index 8fc8cc5a5d..f099ae437f 100644
 #endif
 
 diff --git a/gdb/python/python.c b/gdb/python/python.c
-index 44ca121ff2..fe09a97d28 100644
+index 4844c86c54..610dda828c 100644
 --- a/gdb/python/python.c
 +++ b/gdb/python/python.c
@@ -554,12 +554,16 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
--- a/gdb-readline62-ask-more-rh.patch
+++ b/gdb-readline62-ask-more-rh.patch
@ -12,10 +12,10 @@ FileName: gdb-readline62-ask-more-rh.patch
 1 file changed, 7 insertions(+)

 diff --git a/gdb/event-top.c b/gdb/event-top.c
-index a1866f0c88..e7d3c1fc20 100644
+index 0d668f35e0..4aa26125f9 100644
 --- a/gdb/event-top.c
 +++ b/gdb/event-top.c
-@@ -1182,6 +1182,13 @@ gdb_setup_readline (int editing)
+@@ -1183,6 +1183,13 @@ gdb_setup_readline (int editing)
 {
   struct ui *ui = current_ui;
 
--- a/gdb-rhbz1350436-type-printers-error.patch
+++ b/gdb-rhbz1350436-type-printers-error.patch
@ -20,7 +20,7 @@ https://sourceware.org/ml/gdb-patches/2016-06/msg00455.html
 3 files changed, 32 insertions(+), 2 deletions(-)

 diff --git a/gdb/testsuite/gdb.python/py-typeprint.cc b/gdb/testsuite/gdb.python/py-typeprint.cc
-index 9ab6c4643d..39079fbd3a 100644
+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;
@ -37,7 +37,7 @@ index 9ab6c4643d..39079fbd3a 100644
 {
   return 0;
 diff --git a/gdb/testsuite/gdb.python/py-typeprint.exp b/gdb/testsuite/gdb.python/py-typeprint.exp
-index 28e505331f..75e502b15c 100644
+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"
@ -49,7 +49,7 @@ index 28e505331f..75e502b15c 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 cf9c1ce8b9..7e28df2b9e 100644
+index db5ea71b3b..69fc8c3886 100644
 --- a/gdb/testsuite/gdb.python/py-typeprint.py
 +++ b/gdb/testsuite/gdb.python/py-typeprint.py
@@ -15,7 +15,7 @@
--- a/gdb-rhbz795424-bitpos-20of25.patch
+++ b/gdb-rhbz795424-bitpos-20of25.patch
@ -490,6 +490,7 @@ Content-Disposition: attachment; filename=bitpos-main.patch
 gdb/breakpoint.h                |   4 +-
 gdb/c-lang.c                    |   6 +--
 gdb/c-lang.h                    |   4 +-
+ gdb/c-typeprint.c               |   7 +--
 gdb/c-valprint.c                |  10 ++--
 gdb/compile/compile-c-support.c |   4 +-
 gdb/cp-abi.c                    |   6 +--
@ -555,10 +556,10 @@ Content-Disposition: attachment; filename=bitpos-main.patch
 gdb/value.c                     |  10 ++--
 gdb/value.h                     |  15 +++---
 gdb/x86-nat.c                   |   2 +-
- 83 files changed, 381 insertions(+), 362 deletions(-)
+ 84 files changed, 385 insertions(+), 365 deletions(-)

 diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
-index 9e317c04e4..8606111c00 100644
+index 9385659f14..08e6f4d4fd 100644
 --- a/gdb/aarch64-linux-nat.c
 +++ b/gdb/aarch64-linux-nat.c
@@ -708,7 +708,7 @@ aarch64_linux_remove_watchpoint (struct target_ops *self,
@ -571,7 +572,7 @@ index 9e317c04e4..8606111c00 100644
   return aarch64_linux_region_ok_for_watchpoint (addr, len);
 }
 diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
-index 9e637ebab6..b05b840292 100644
+index 748e8196ab..0fb4354bad 100644
 --- a/gdb/ada-lang.c
 +++ b/gdb/ada-lang.c
@@ -78,7 +78,7 @@ static struct type *desc_bounds_type (struct type *);
@ -773,7 +774,7 @@ index 9e637ebab6..b05b840292 100644
 
   val = value_cast (value_type (component), val);
 
-@@ -4473,7 +4475,7 @@ ensure_lval (struct value *val)
+@@ -4476,7 +4478,7 @@ ensure_lval (struct value *val)
   if (VALUE_LVAL (val) == not_lval
       || VALUE_LVAL (val) == lval_internalvar)
     {
@ -782,7 +783,7 @@ index 9e637ebab6..b05b840292 100644
       const CORE_ADDR addr =
         value_as_long (value_allocate_space_in_inferior (len));
 
-@@ -4557,7 +4559,7 @@ static CORE_ADDR
+@@ -4560,7 +4562,7 @@ static CORE_ADDR
 value_pointer (struct value *value, struct type *type)
 {
   struct gdbarch *gdbarch = get_type_arch (type);
@ -791,7 +792,7 @@ index 9e637ebab6..b05b840292 100644
   gdb_byte *buf = (gdb_byte *) alloca (len);
   CORE_ADDR addr;
 
-@@ -6703,7 +6705,7 @@ value_tag_from_contents_and_address (struct type *type,
+@@ -6701,7 +6703,7 @@ value_tag_from_contents_and_address (struct type *type,
 				     const gdb_byte *valaddr,
                                      CORE_ADDR address)
 {
@ -800,7 +801,7 @@ index 9e637ebab6..b05b840292 100644
   struct type *tag_type;
 
   if (find_struct_field ("_tag", type, 0, &tag_type, &tag_byte_offset,
-@@ -7196,7 +7198,7 @@ ada_in_variant (LONGEST val, struct type *type, int field_num)
+@@ -7194,7 +7196,7 @@ ada_in_variant (LONGEST val, struct type *type, int field_num)
    only in that it can handle packed values of arbitrary type.  */
 
 static struct value *
@ -809,7 +810,7 @@ index 9e637ebab6..b05b840292 100644
                            struct type *arg_type)
 {
   struct type *type;
-@@ -7208,7 +7210,7 @@ ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
+@@ -7206,7 +7208,7 @@ ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
 
   if (TYPE_FIELD_BITSIZE (arg_type, fieldno) != 0)
     {
@ -818,7 +819,7 @@ index 9e637ebab6..b05b840292 100644
       int bit_size = TYPE_FIELD_BITSIZE (arg_type, fieldno);
 
       return ada_value_primitive_packed_val (arg1, value_contents (arg1),
-@@ -7235,9 +7237,9 @@ ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
+@@ -7283,9 +7285,9 @@ ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
    Returns 1 if found, 0 otherwise.  */
 
 static int
@ -830,7 +831,7 @@ index 9e637ebab6..b05b840292 100644
 		   int *index_p)
 {
   int i;
-@@ -7255,8 +7257,8 @@ find_struct_field (const char *name, struct type *type, int offset,
+@@ -7304,8 +7306,8 @@ find_struct_field (const char *name, struct type *type, int offset,
 
   for (i = 0; i < TYPE_NFIELDS (type); i += 1)
     {
@ -841,8 +842,8 @@ index 9e637ebab6..b05b840292 100644
       const char *t_field_name = TYPE_FIELD_NAME (type, i);
 
       if (t_field_name == NULL)
-@@ -7326,7 +7328,7 @@ num_visible_fields (struct type *type)
-    Searches recursively through wrapper fields (e.g., '_parent').  */
+@@ -7407,7 +7409,7 @@ num_visible_fields (struct type *type)
+    long explanation in find_struct_field's function documentation.  */
 
 static struct value *
 -ada_search_struct_field (const char *name, struct value *arg, int offset,
@ -850,7 +851,7 @@ index 9e637ebab6..b05b840292 100644
                          struct type *type)
 {
   int i;
-@@ -7359,7 +7361,7 @@ ada_search_struct_field (const char *name, struct value *arg, int offset,
+@@ -7455,7 +7457,7 @@ ada_search_struct_field (const char *name, struct value *arg, int offset,
           int j;
           struct type *field_type = ada_check_typedef (TYPE_FIELD_TYPE (type,
 									i));
@ -859,7 +860,7 @@ index 9e637ebab6..b05b840292 100644
 
           for (j = 0; j < TYPE_NFIELDS (field_type); j += 1)
             {
-@@ -7377,8 +7379,8 @@ ada_search_struct_field (const char *name, struct value *arg, int offset,
+@@ -7487,8 +7489,8 @@ ada_search_struct_field (const char *name, struct value *arg, int offset,
   return NULL;
 }
 
@ -870,7 +871,7 @@ index 9e637ebab6..b05b840292 100644
 
 
 /* Return field #INDEX in ARG, where the index is that returned by
-@@ -7387,7 +7389,7 @@ static struct value *ada_index_struct_field_1 (int *, struct value *,
+@@ -7497,7 +7499,7 @@ static struct value *ada_index_struct_field_1 (int *, struct value *,
  * If found, return value, else return NULL.  */
 
 static struct value *
@ -879,7 +880,7 @@ index 9e637ebab6..b05b840292 100644
 			struct type *type)
 {
   return ada_index_struct_field_1 (&index, arg, offset, type);
-@@ -7399,7 +7401,7 @@ ada_index_struct_field (int index, struct value *arg, int offset,
+@@ -7509,7 +7511,7 @@ ada_index_struct_field (int index, struct value *arg, int offset,
  * *INDEX_P.  */
 
 static struct value *
@ -888,7 +889,7 @@ index 9e637ebab6..b05b840292 100644
 			  struct type *type)
 {
   int i;
-@@ -7489,7 +7491,8 @@ ada_value_struct_elt (struct value *arg, const char *name, int no_err)
+@@ -7599,7 +7601,8 @@ ada_value_struct_elt (struct value *arg, const char *name, int no_err)
     v = ada_search_struct_field (name, arg, 0, t);
   else
     {
@ -898,7 +899,7 @@ index 9e637ebab6..b05b840292 100644
       struct type *field_type;
       CORE_ADDR address;
 
-@@ -7780,8 +7783,8 @@ ada_coerce_ref (struct value *val0)
+@@ -7943,8 +7946,8 @@ ada_coerce_ref (struct value *val0)
 /* Return OFF rounded upward if necessary to a multiple of
    ALIGNMENT (a power of 2).  */
 
@ -909,7 +910,7 @@ index 9e637ebab6..b05b840292 100644
 {
   return (off + alignment - 1) & ~(alignment - 1);
 }
-@@ -8175,10 +8178,9 @@ ada_template_to_fixed_record_type_1 (struct type *type,
+@@ -8338,10 +8341,9 @@ ada_template_to_fixed_record_type_1 (struct type *type,
   struct value *mark = value_mark ();
   struct value *dval;
   struct type *rtype;
@ -922,7 +923,7 @@ index 9e637ebab6..b05b840292 100644
   int f;
 
   /* Compute the number of fields in this record type that are going
-@@ -8256,7 +8258,7 @@ ada_template_to_fixed_record_type_1 (struct type *type,
+@@ -8419,7 +8421,7 @@ ada_template_to_fixed_record_type_1 (struct type *type,
 	     that follow this one.  */
 	  if (ada_is_aligner_type (field_type))
 	    {
@ -931,7 +932,7 @@ index 9e637ebab6..b05b840292 100644
 
 	      field_valaddr = cond_offset_host (field_valaddr, field_offset);
 	      field_address = cond_offset_target (field_address, field_offset);
-@@ -8392,11 +8394,11 @@ ada_template_to_fixed_record_type_1 (struct type *type,
+@@ -8555,11 +8557,11 @@ ada_template_to_fixed_record_type_1 (struct type *type,
   if (TYPE_LENGTH (type) <= 0)
     {
       if (TYPE_NAME (rtype))
@ -947,7 +948,7 @@ index 9e637ebab6..b05b840292 100644
     }
   else
     {
-@@ -8862,7 +8864,8 @@ to_fixed_array_type (struct type *type0, struct value *dval,
+@@ -9025,7 +9027,8 @@ to_fixed_array_type (struct type *type0, struct value *dval,
 	 type was a regular (non-packed) array type.  As a result, the
 	 bitsize of the array elements needs to be set again, and the array
 	 length needs to be recomputed based on that bitsize.  */
@ -958,10 +959,10 @@ index 9e637ebab6..b05b840292 100644
 
       TYPE_FIELD_BITSIZE (result, 0) = TYPE_FIELD_BITSIZE (type0, 0);
 diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
-index 0530e9aacd..3230de7940 100644
+index bac6c06e40..784e4935a3 100644
 --- a/gdb/ada-lang.h
 +++ b/gdb/ada-lang.h
-@@ -174,7 +174,7 @@ extern void ada_print_type (struct type *, const char *, struct ui_file *, int,
+@@ -175,7 +175,7 @@ extern void ada_print_type (struct type *, const char *, struct ui_file *, int,
 extern void ada_print_typedef (struct type *type, struct symbol *new_symbol,
 			       struct ui_file *stream);
 
@ -970,7 +971,7 @@ index 0530e9aacd..3230de7940 100644
 			   struct ui_file *, int,
 			   struct value *,
 			   const struct value_print_options *);
-@@ -189,7 +189,7 @@ extern void ada_emit_char (int, struct type *, struct ui_file *, int, int);
+@@ -190,7 +190,7 @@ extern void ada_emit_char (int, struct type *, struct ui_file *, int, int);
 extern void ada_printchar (int, struct type *, struct ui_file *);
 
 extern void ada_printstr (struct ui_file *, struct type *, const gdb_byte *,
@ -979,7 +980,7 @@ index 0530e9aacd..3230de7940 100644
 			  const struct value_print_options *);
 
 struct value *ada_convert_actual (struct value *actual,
-@@ -261,7 +261,7 @@ extern int ada_is_constrained_packed_array_type (struct type *);
+@@ -262,7 +262,7 @@ extern int ada_is_constrained_packed_array_type (struct type *);
 
 extern struct value *ada_value_primitive_packed_val (struct value *,
 						     const gdb_byte *,
@ -989,7 +990,7 @@ index 0530e9aacd..3230de7940 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 9d23302865..e437cf1a0e 100644
+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,
@ -1014,7 +1015,7 @@ index 9d23302865..e437cf1a0e 100644
       case TYPE_CODE_ENUM:
 	if (show < 0)
 diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
-index 91dc301af5..4aa4d7a79f 100644
+index c5efdf1c1c..5912c6d016 100644
 --- a/gdb/ada-valprint.c
 +++ b/gdb/ada-valprint.c
@@ -34,11 +34,11 @@
@ -1162,7 +1163,7 @@ index 91dc301af5..4aa4d7a79f 100644
 	       struct value *val,
 	       const struct value_print_options *options)
 diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
-index 1a32d2f871..a0bd5c2337 100644
+index 7c70792b3f..651794a41f 100644
 --- a/gdb/amd64-tdep.c
 +++ b/gdb/amd64-tdep.c
@@ -727,7 +727,7 @@ amd64_return_value (struct gdbarch *gdbarch, struct value *function,
@ -1191,7 +1192,7 @@ index 1a32d2f871..a0bd5c2337 100644
     }
 
 diff --git a/gdb/annotate.c b/gdb/annotate.c
-index 6a02f73299..4c609672e0 100644
+index 0c70ff9553..6d169bfdae 100644
 --- a/gdb/annotate.c
 +++ b/gdb/annotate.c
@@ -531,21 +531,21 @@ annotate_frame_end (void)
@ -1221,7 +1222,7 @@ index 6a02f73299..4c609672e0 100644
 
 void
 diff --git a/gdb/annotate.h b/gdb/annotate.h
-index 8a9a64147d..91a4bcbe9a 100644
+index 1b9d9dd034..d79ccc56ed 100644
 --- a/gdb/annotate.h
 +++ b/gdb/annotate.h
@@ -102,8 +102,8 @@ extern void annotate_frame_source_end (void);
@ -1236,7 +1237,7 @@ index 8a9a64147d..91a4bcbe9a 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 6c0e0b3276..b22034322b 100644
+index 693d7e3dc8..b701010019 100644
 --- a/gdb/arch-utils.c
 +++ b/gdb/arch-utils.c
@@ -228,7 +228,7 @@ legacy_virtual_frame_pointer (struct gdbarch *gdbarch,
@ -1249,7 +1250,7 @@ index 6c0e0b3276..b22034322b 100644
   const struct floatformat **format = NULL;
 
 diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h
-index 6d3c3629ef..51a67e69f3 100644
+index b51a4ec1ee..2d344e7b93 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;
@ -1262,7 +1263,7 @@ index 6d3c3629ef..51a67e69f3 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 cc7a67a402..b5732cb48e 100644
+index 484bd4e4c4..3b7aa40db8 100644
 --- a/gdb/arm-linux-nat.c
 +++ b/gdb/arm-linux-nat.c
@@ -1067,7 +1067,7 @@ arm_linux_remove_hw_breakpoint (struct target_ops *self,
@ -1275,7 +1276,7 @@ index cc7a67a402..b5732cb48e 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 5a2a0a00cf..97db828920 100644
+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 *);
@ -1375,7 +1376,7 @@ index 5a2a0a00cf..97db828920 100644
   int i, rslt;
   int nbases = TYPE_N_BASECLASSES (type);
 diff --git a/gdb/ax-general.c b/gdb/ax-general.c
-index e07a469797..35298dd686 100644
+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)
@ -1388,7 +1389,7 @@ index e07a469797..35298dd686 100644
   /* N must fit in a byte.  */
   if (n < 0 || n > 255)
 diff --git a/gdb/ax.h b/gdb/ax.h
-index 066c5ee21e..e407b5b665 100644
+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);
@ -1401,7 +1402,7 @@ index 066c5ee21e..e407b5b665 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 2d8a8d1a50..79cd7d5e2e 100644
+index 6a0c15b239..05d7ed3ea1 100644
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
@@ -2064,9 +2064,9 @@ should_be_inserted (struct bp_location *bl)
@ -1435,7 +1436,7 @@ index 2d8a8d1a50..79cd7d5e2e 100644
 
 		  len = (target_exact_watchpoints
 diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
-index eed2c968f2..48e28a8fec 100644
+index 3fddbaa713..08463d4e5b 100644
 --- a/gdb/breakpoint.h
 +++ b/gdb/breakpoint.h
@@ -252,7 +252,7 @@ struct bp_target_info
@ -1457,7 +1458,7 @@ index eed2c968f2..48e28a8fec 100644
   /* Type of hardware watchpoint.  */
   target_hw_bp_type watchpoint_type {};
 diff --git a/gdb/c-lang.c b/gdb/c-lang.c
-index 8d96f94cbb..ec956f45c2 100644
+index a0b553e741..0616208d1d 100644
 --- a/gdb/c-lang.c
 +++ b/gdb/c-lang.c
@@ -184,7 +184,7 @@ c_printchar (int c, struct type *type, struct ui_file *stream)
@ -1488,7 +1489,7 @@ index 8d96f94cbb..ec956f45c2 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 5ce64861c4..7b851880b7 100644
+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 *,
@ -1509,11 +1510,36 @@ index 5ce64861c4..7b851880b7 100644
 			const char *user_encoding,
 			int force_ellipses,
 			const struct value_print_options *options);
+diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
+index 2e9ed1bc28..256b9c19e6 100644
+--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
+@@ -933,7 +933,8 @@ c_print_type_union_field_offset (struct type *type, unsigned int field_idx,
+ {
+   struct type *ftype = check_typedef (TYPE_FIELD_TYPE (type, field_idx));
+ 
+-  fprintf_filtered (stream, "/*              %4u */", TYPE_LENGTH (ftype));
+  fprintf_filtered (stream, "/*              %4s */",
+		    pulongest (TYPE_LENGTH (ftype)));
+ }
+ 
+ /* Print information about field at index FIELD_IDX of the struct type
+@@ -1507,8 +1508,8 @@ c_type_print_base_struct_union (struct type *type, struct ui_file *stream,
+ 	      print_spaces_filtered_with_print_options (level + 4,
+ 							stream,
+ 							flags);
+-	      fprintf_filtered (stream, "/* total size (bytes): %4u */\n",
+-				TYPE_LENGTH (type));
+	      fprintf_filtered (stream, "/* total size (bytes): %4s */\n",
+				pulongest (TYPE_LENGTH (type)));
+ 	    }
+ 
+ 	  print_spaces_filtered (OFFSET_SPC_LEN, stream);
 diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
-index 96e6c597cf..046469d7a4 100644
+index 3904fab260..a3b8e2551b 100644
 --- a/gdb/c-valprint.c
 +++ b/gdb/c-valprint.c
-@@ -244,7 +244,7 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
+@@ -247,7 +247,7 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
   if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (unresolved_elttype) > 0)
     {
       LONGEST low_bound, high_bound;
@ -1522,7 +1548,7 @@ index 96e6c597cf..046469d7a4 100644
       struct gdbarch *gdbarch = get_type_arch (type);
       enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
       unsigned int i = 0;	/* Number of characters printed.  */
-@@ -318,8 +318,8 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
+@@ -321,8 +321,8 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
 	  if (cp_is_vtbl_ptr_type (elttype))
 	    {
 	      i = 1;
@ -1533,7 +1559,7 @@ index 96e6c597cf..046469d7a4 100644
 	    }
 	  else
 	    {
-@@ -396,7 +396,7 @@ c_val_print_struct (struct type *type, const gdb_byte *valaddr,
+@@ -399,7 +399,7 @@ c_val_print_struct (struct type *type, const gdb_byte *valaddr,
 	 -fvtable_thunks.  (Otherwise, look under
 	 TYPE_CODE_PTR.)  */
       struct gdbarch *gdbarch = get_type_arch (type);
@ -1542,7 +1568,7 @@ index 96e6c597cf..046469d7a4 100644
 		    + TYPE_FIELD_BITPOS (type,
 					 VTBL_FNADDR_OFFSET) / 8);
       struct type *field_type = TYPE_FIELD_TYPE (type, VTBL_FNADDR_OFFSET);
-@@ -495,7 +495,7 @@ c_val_print_memberptr (struct type *type, const gdb_byte *valaddr,
+@@ -498,7 +498,7 @@ c_val_print_memberptr (struct type *type, const gdb_byte *valaddr,
 
 void
 c_val_print (struct type *type,
@ -1552,7 +1578,7 @@ index 96e6c597cf..046469d7a4 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 6f759abb54..14fcec34ac 100644
+index 006d3f811c..accd9a54b2 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,
@ -1570,7 +1596,7 @@ index 6f759abb54..14fcec34ac 100644
 	    fputs_unfiltered (";\n", stream);
 	  }
 diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
-index 11b8424856..199cdac26e 100644
+index eb2f01444d..2f65bffa1d 100644
 --- a/gdb/cp-abi.c
 +++ b/gdb/cp-abi.c
@@ -64,12 +64,12 @@ is_operator_name (const char *name)
@ -1598,7 +1624,7 @@ index 11b8424856..199cdac26e 100644
   if ((current_cp_abi.virtual_fn_field) == NULL)
     return NULL;
 diff --git a/gdb/cp-abi.h b/gdb/cp-abi.h
-index 6b82eacd01..154c4c83b1 100644
+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,
@ -1645,7 +1671,7 @@ index 6b82eacd01..154c4c83b1 100644
 			    struct type *type,
 			    struct ui_file *stream);
 diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
-index 609dabb660..38beb4d62a 100644
+index 486653f13f..db3ff338d1 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,
@ -1658,7 +1684,7 @@ index 609dabb660..38beb4d62a 100644
 
 		  if (valprint_check_validity (stream, i_type, i_offset, val))
 diff --git a/gdb/d-lang.h b/gdb/d-lang.h
-index f47050aa30..69d4829de6 100644
+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 *,
@ -1671,7 +1697,7 @@ index f47050aa30..69d4829de6 100644
 			 struct value *val,
 			 const struct value_print_options *options);
 diff --git a/gdb/d-valprint.c b/gdb/d-valprint.c
-index 9e18b22ff1..48770b65a8 100644
+index e2d8431362..5143f75c06 100644
 --- a/gdb/d-valprint.c
 +++ b/gdb/d-valprint.c
@@ -73,7 +73,7 @@ dynamic_array_type (struct type *type,
@ -1684,7 +1710,7 @@ index 9e18b22ff1..48770b65a8 100644
 	     struct value *val,
              const struct value_print_options *options)
 diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
-index d1d8dcc4bf..508815f91f 100644
+index 5486e4dc12..1fe45f6069 100644
 --- a/gdb/dwarf2loc.c
 +++ b/gdb/dwarf2loc.c
@@ -1817,7 +1817,7 @@ rw_pieced_value (struct value *v, struct value *from)
@ -1748,7 +1774,7 @@ index d1d8dcc4bf..508815f91f 100644
 
 	    if (subobj_byte_offset + len > max)
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index e2fc1310d8..d47497cec7 100644
+index babe659539..1a62c58614 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
@@ -2268,12 +2268,12 @@ dwarf2_complex_location_expr_complaint (void)
@ -1768,7 +1794,7 @@ index e2fc1310d8..d47497cec7 100644
 }
 
 static void
-@@ -15074,8 +15074,8 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
+@@ -15086,8 +15086,8 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
 	         object, and then subtract off the number of bits of
 	         the field itself.  The result is the bit offset of
 	         the LSB of the field.  */
@ -1780,7 +1806,7 @@ index e2fc1310d8..d47497cec7 100644
 	      attr = dwarf2_attr (die, DW_AT_byte_size, cu);
 	      if (attr)
 diff --git a/gdb/eval.c b/gdb/eval.c
-index 44f7a4edfe..f3acca6a69 100644
+index d9bca2791d..b42f14a406 100644
 --- a/gdb/eval.c
 +++ b/gdb/eval.c
@@ -302,7 +302,8 @@ evaluate_struct_tuple (struct value *struct_val,
@ -1836,7 +1862,7 @@ index 44f7a4edfe..f3acca6a69 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 fe909ff0f0..c6403bfb15 100644
+index 74f5622b6e..55fb97ceab 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)
@ -1849,7 +1875,7 @@ index fe909ff0f0..c6403bfb15 100644
 {
   const char *type_encoding = f_get_encoding (type);
 diff --git a/gdb/f-lang.h b/gdb/f-lang.h
-index 5633b4121d..fb00f37486 100644
+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 */
@ -1862,7 +1888,7 @@ index 5633b4121d..fb00f37486 100644
 			 struct value *,
 			 const struct value_print_options *);
 diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
-index aa46b0967f..27d63495af 100644
+index b4067a8460..0772f359f0 100644
 --- a/gdb/f-valprint.c
 +++ b/gdb/f-valprint.c
@@ -36,7 +36,7 @@
@ -1922,7 +1948,7 @@ index aa46b0967f..27d63495af 100644
 	     struct value *original_value,
 	     const struct value_print_options *options)
 diff --git a/gdb/findvar.c b/gdb/findvar.c
-index 2bc2095bf7..ced8418659 100644
+index ee8f57159d..fb4dfeca17 100644
 --- a/gdb/findvar.c
 +++ b/gdb/findvar.c
@@ -821,7 +821,7 @@ struct value *
@ -1953,7 +1979,7 @@ index 2bc2095bf7..ced8418659 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 e643823716..95e6b23254 100644
+index 1384ecca4f..db52eb5780 100644
 --- a/gdb/frame.c
 +++ b/gdb/frame.c
@@ -1386,7 +1386,7 @@ deprecated_frame_register_read (struct frame_info *frame, int regnum,
@ -1975,7 +2001,7 @@ index e643823716..95e6b23254 100644
   /* Copy the data.  */
   while (len > 0)
 diff --git a/gdb/frame.h b/gdb/frame.h
-index 0ed7a14d03..4705805c6e 100644
+index 8293a49ec2..a176873865 100644
 --- a/gdb/frame.h
 +++ b/gdb/frame.h
@@ -601,7 +601,7 @@ extern void put_frame_register (struct frame_info *frame, int regnum,
@ -1988,7 +2014,7 @@ index 0ed7a14d03..4705805c6e 100644
 				     int *optimizedp, int *unavailablep);
 
 diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
-index 8177f0539c..966cc65988 100644
+index fe3c12e295..f0cfb053b0 100644
 --- a/gdb/gdbarch.c
 +++ b/gdb/gdbarch.c
@@ -1811,7 +1811,7 @@ set_gdbarch_wchar_signed (struct gdbarch *gdbarch,
@ -2001,7 +2027,7 @@ index 8177f0539c..966cc65988 100644
   gdb_assert (gdbarch != NULL);
   gdb_assert (gdbarch->floatformat_for_type != NULL);
 diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
-index 1a654b6250..876b0767cb 100644
+index 5664c4dc58..62b83974a1 100644
 --- a/gdb/gdbarch.h
 +++ b/gdb/gdbarch.h
@@ -198,8 +198,8 @@ extern void set_gdbarch_wchar_signed (struct gdbarch *gdbarch, int wchar_signed)
@ -2016,7 +2042,7 @@ index 1a654b6250..876b0767cb 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 1f165cf11b..31b2528251 100755
+index a929e13b81..cc1def6a3d 100755
 --- a/gdb/gdbarch.sh
 +++ b/gdb/gdbarch.sh
@@ -388,7 +388,7 @@ v;int;wchar_signed;;;1;-1;1
@ -2029,10 +2055,10 @@ index 1f165cf11b..31b2528251 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 a25e0a84e9..775f120845 100644
+index b731a2f2c6..6fad967fb4 100644
 --- a/gdb/gdbtypes.c
 +++ b/gdb/gdbtypes.c
-@@ -2818,7 +2818,7 @@ floatformat_from_type (const struct type *type)
+@@ -2882,7 +2882,7 @@ floatformat_from_type (const struct type *type)
    least as long as OBJFILE.  */
 
 struct type *
@ -2041,7 +2067,7 @@ index a25e0a84e9..775f120845 100644
 	   const char *name)
 {
   struct type *type;
-@@ -3150,8 +3150,8 @@ is_public_ancestor (struct type *base, struct type *dclass)
+@@ -3214,8 +3214,8 @@ is_public_ancestor (struct type *base, struct type *dclass)
 
 static int
 is_unique_ancestor_worker (struct type *base, struct type *dclass,
@ -2052,7 +2078,7 @@ index a25e0a84e9..775f120845 100644
 			   CORE_ADDR address, struct value *val)
 {
   int i, count = 0;
-@@ -3162,7 +3162,7 @@ is_unique_ancestor_worker (struct type *base, struct type *dclass,
+@@ -3226,7 +3226,7 @@ is_unique_ancestor_worker (struct type *base, struct type *dclass,
   for (i = 0; i < TYPE_N_BASECLASSES (dclass) && count < 2; ++i)
     {
       struct type *iter;
@ -2061,7 +2087,7 @@ index a25e0a84e9..775f120845 100644
 
       iter = check_typedef (TYPE_BASECLASS (dclass, i));
 
-@@ -3203,7 +3203,7 @@ is_unique_ancestor_worker (struct type *base, struct type *dclass,
+@@ -3267,7 +3267,7 @@ is_unique_ancestor_worker (struct type *base, struct type *dclass,
 int
 is_unique_ancestor (struct type *base, struct value *val)
 {
@ -2070,7 +2096,7 @@ index a25e0a84e9..775f120845 100644
 
   return is_unique_ancestor_worker (base, value_type (val), &offset,
 				    value_contents_for_printing (val),
-@@ -4449,7 +4449,7 @@ recursive_dump_type (struct type *type, int spaces)
+@@ -4513,7 +4513,7 @@ recursive_dump_type (struct type *type, int spaces)
       break;
     }
   puts_filtered ("\n");
@ -2079,7 +2105,7 @@ index a25e0a84e9..775f120845 100644
   if (TYPE_OBJFILE_OWNED (type))
     {
       printfi_filtered (spaces, "objfile ");
-@@ -4890,7 +4890,7 @@ copy_type (const struct type *type)
+@@ -4954,7 +4954,7 @@ copy_type (const struct type *type)
 
 struct type *
 arch_type (struct gdbarch *gdbarch,
@ -2089,10 +2115,10 @@ index a25e0a84e9..775f120845 100644
   struct type *type;
 
 diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
-index 53d1592318..8a929113b8 100644
+index 9703d966a7..58f0c10645 100644
 --- a/gdb/gdbtypes.h
 +++ b/gdb/gdbtypes.h
-@@ -782,7 +782,7 @@ struct type
+@@ -785,7 +785,7 @@ struct type
      type_length_units function should be used in order to get the length
      expressed in target addressable memory units.  */
 
@ -2101,7 +2127,7 @@ index 53d1592318..8a929113b8 100644
 
   /* * Core type, shared by a group of qualified types.  */
 
-@@ -1684,7 +1684,7 @@ extern unsigned int type_length_units (struct type *type);
+@@ -1687,7 +1687,7 @@ extern unsigned int type_length_units (struct type *type);
 
 /* * Helper function to construct objfile-owned types.  */
 
@ -2110,7 +2136,7 @@ index 53d1592318..8a929113b8 100644
 			       const char *);
 extern struct type *init_integer_type (struct objfile *, int, int,
 				       const char *);
-@@ -1701,7 +1701,7 @@ extern struct type *init_pointer_type (struct objfile *, int, const char *,
+@@ -1704,7 +1704,7 @@ extern struct type *init_pointer_type (struct objfile *, int, const char *,
 				       struct type *);
 
 /* Helper functions to construct architecture-owned types.  */
@ -2120,7 +2146,7 @@ index 53d1592318..8a929113b8 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 c25b23089c..00c51c4b86 100644
+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)
@ -2161,7 +2187,7 @@ index c25b23089c..00c51c4b86 100644
 				    embedded_offset, address, val);
 
 diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
-index 2accc60efc..a42c4d487f 100644
+index 0965846ce6..d443c29443 100644
 --- a/gdb/gnu-v3-abi.c
 +++ b/gdb/gnu-v3-abi.c
@@ -109,7 +109,7 @@ build_gdb_vtable_type (struct gdbarch *arch)
@ -2228,7 +2254,7 @@ index 2accc60efc..a42c4d487f 100644
 
       if (BASETYPE_VIA_VIRTUAL (domain, i))
 diff --git a/gdb/go-lang.h b/gdb/go-lang.h
-index e08b2f0a80..5fb9b5d90d 100644
+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,
@ -2241,7 +2267,7 @@ index e08b2f0a80..5fb9b5d90d 100644
 			  struct value *val,
 			  const struct value_print_options *options);
 diff --git a/gdb/go-valprint.c b/gdb/go-valprint.c
-index 77d37387ad..896a71911e 100644
+index eccf9a8181..4cca802e59 100644
 --- a/gdb/go-valprint.c
 +++ b/gdb/go-valprint.c
@@ -86,7 +86,7 @@ print_go_string (struct type *type,
@ -2254,7 +2280,7 @@ index 77d37387ad..896a71911e 100644
 	      struct value *val,
 	      const struct value_print_options *options)
 diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
-index 7a1dffa66f..2f47affdc6 100644
+index d1b461b538..af4942ab2e 100644
 --- a/gdb/i386-tdep.c
 +++ b/gdb/i386-tdep.c
@@ -8175,7 +8175,7 @@ i386_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr,
@ -2267,7 +2293,7 @@ index 7a1dffa66f..2f47affdc6 100644
   if (len == 128 && name)
     if (strcmp (name, "__float128") == 0
 diff --git a/gdb/language.c b/gdb/language.c
-index c3872fc9a6..a851f4c966 100644
+index cacaf3f7d1..589515edb7 100644
 --- a/gdb/language.c
 +++ b/gdb/language.c
@@ -766,7 +766,7 @@ unk_lang_printchar (int c, struct type *type, struct ui_file *stream)
@ -2289,7 +2315,7 @@ index c3872fc9a6..a851f4c966 100644
 		    struct value *val,
 		    const struct value_print_options *options)
 diff --git a/gdb/language.h b/gdb/language.h
-index 47ad8da05d..0c4e53f0de 100644
+index 49828f3aee..70e6a4a7ef 100644
 --- a/gdb/language.h
 +++ b/gdb/language.h
@@ -188,7 +188,7 @@ struct language_defn
@ -2311,7 +2337,7 @@ index 47ad8da05d..0c4e53f0de 100644
 			  struct value *val,
 			  const struct value_print_options *options);
 diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c
-index 09050c0480..dab0136533 100644
+index 11ccab30c8..9081d01987 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)
@ -2349,7 +2375,7 @@ index 09050c0480..dab0136533 100644
 	  things_printed += options->repeat_count_threshold;
 	  need_comma = 1;
 diff --git a/gdb/m2-lang.h b/gdb/m2-lang.h
-index 30fddd7b4b..0764e7dd5a 100644
+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 *,
@ -2362,7 +2388,7 @@ index 30fddd7b4b..0764e7dd5a 100644
 			  struct value *,
 			  const struct value_print_options *);
 diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
-index 0dd6f19fc7..3701fbb728 100644
+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,
@ -2382,7 +2408,7 @@ index 0dd6f19fc7..3701fbb728 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 344a37678d..03e3925269 100644
+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,
@ -2455,7 +2481,7 @@ index 344a37678d..03e3925269 100644
 
 	  fputs_filtered ("{", stream);
 diff --git a/gdb/memrange.c b/gdb/memrange.c
-index 34feac53ab..002a359199 100644
+index 2a337cc3cd..74f4c95ca9 100644
 --- a/gdb/memrange.c
 +++ b/gdb/memrange.c
@@ -22,8 +22,8 @@
@ -2470,7 +2496,7 @@ index 34feac53ab..002a359199 100644
   ULONGEST h, l;
 
 diff --git a/gdb/memrange.h b/gdb/memrange.h
-index fb10cda2b7..c6647b3211 100644
+index 46088ade53..038cd2f92c 100644
 --- a/gdb/memrange.h
 +++ b/gdb/memrange.h
@@ -28,7 +28,7 @@ struct mem_range
@ -2501,7 +2527,7 @@ index fb10cda2b7..c6647b3211 100644
 /* Returns true if ADDR is in RANGE.  */
 
 diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
-index e6ef5a6170..f95d167d30 100644
+index 68fd1f83c3..ebb59dcc90 100644
 --- a/gdb/mips-linux-nat.c
 +++ b/gdb/mips-linux-nat.c
@@ -579,7 +579,7 @@ mips_linux_stopped_data_address (struct target_ops *t, CORE_ADDR *paddr)
@ -2514,7 +2540,7 @@ index e6ef5a6170..f95d167d30 100644
   struct pt_watch_regs dummy_regs;
   int i;
 diff --git a/gdb/nat/x86-dregs.c b/gdb/nat/x86-dregs.c
-index 478aa913e9..05ea2abf62 100644
+index c816473628..05f3868759 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,
@ -2536,7 +2562,7 @@ index 478aa913e9..05ea2abf62 100644
   int nregs;
 
 diff --git a/gdb/nat/x86-dregs.h b/gdb/nat/x86-dregs.h
-index 7f7d70a678..9cf474db29 100644
+index dd6242eda9..6508af93b3 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,
@ -2549,7 +2575,7 @@ index 7f7d70a678..9cf474db29 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 12677605b2..262a4e7eb9 100644
+index 268c3c5c37..91f4d8412a 100644
 --- a/gdb/opencl-lang.c
 +++ b/gdb/opencl-lang.c
@@ -76,11 +76,11 @@ builtin_opencl_type (struct gdbarch *gdbarch)
@ -2621,7 +2647,7 @@ index 12677605b2..262a4e7eb9 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 e93c15b95f..5c8282b4e4 100644
+index 03db2df2e5..9c9810e226 100644
 --- a/gdb/p-lang.c
 +++ b/gdb/p-lang.c
@@ -93,8 +93,8 @@ pascal_main_name (void)
@ -2672,7 +2698,7 @@ index e93c15b95f..5c8282b4e4 100644
 	  things_printed += options->repeat_count_threshold;
 	  need_comma = 1;
 diff --git a/gdb/p-lang.h b/gdb/p-lang.h
-index 1f82c1ac1f..dbe7703fd8 100644
+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 *,
@ -2701,7 +2727,7 @@ index 1f82c1ac1f..dbe7703fd8 100644
 
 extern struct type **const pascal_builtin_types[];
 diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
-index d12b63638b..3cdc847fe3 100644
+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 =
@ -2725,7 +2751,7 @@ index d12b63638b..3cdc847fe3 100644
   CORE_ADDR addr;
   int want_space = 0;
 diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
-index f645221cb4..429b9c6231 100644
+index 8418e4d35d..4a82434c0d 100644
 --- a/gdb/ppc-linux-nat.c
 +++ b/gdb/ppc-linux-nat.c
@@ -1445,7 +1445,7 @@ ppc_linux_can_use_hw_breakpoint (struct target_ops *self,
@ -2738,7 +2764,7 @@ index f645221cb4..429b9c6231 100644
   /* Handle sub-8-byte quantities.  */
   if (len <= 0)
 diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
-index 0e43a64b69..20be2da63b 100644
+index 286c02a26d..7242c7f89a 100644
 --- a/gdb/ppc-linux-tdep.c
 +++ b/gdb/ppc-linux-tdep.c
@@ -1620,7 +1620,7 @@ ppc_init_linux_record_tdep (struct linux_record_tdep *record_tdep,
@ -2751,7 +2777,7 @@ index 0e43a64b69..20be2da63b 100644
   if (len == 128 && name)
     {
 diff --git a/gdb/printcmd.c b/gdb/printcmd.c
-index ed35004021..f7c4623399 100644
+index ad80b1bebf..a126a0f8b9 100644
 --- a/gdb/printcmd.c
 +++ b/gdb/printcmd.c
@@ -277,7 +277,7 @@ print_formatted (struct value *val, int size,
@ -2773,7 +2799,7 @@ index ed35004021..f7c4623399 100644
 
   /* String printing should go through val_print_scalar_formatted.  */
 diff --git a/gdb/procfs.c b/gdb/procfs.c
-index 888dc695c5..1dd383aecb 100644
+index a939dedb00..887f1201fe 100644
 --- a/gdb/procfs.c
 +++ b/gdb/procfs.c
@@ -3399,7 +3399,7 @@ procfs_remove_watchpoint (struct target_ops *self,
@ -2786,7 +2812,7 @@ index 888dc695c5..1dd383aecb 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 ac905c6e49..7aea9df06a 100644
+index fb6a904dec..3694616069 100644
 --- a/gdb/regcache.c
 +++ b/gdb/regcache.c
@@ -897,7 +897,7 @@ typedef void (regcache_write_ftype) (struct regcache *regcache, int regnum,
@ -2865,7 +2891,7 @@ index ac905c6e49..7aea9df06a 100644
 {
   gdb_assert (regnum >= 0 && regnum < m_descr->nr_cooked_registers);
 diff --git a/gdb/regcache.h b/gdb/regcache.h
-index c5ef41b7a6..0d4f2cdccc 100644
+index 9e3da8c3fc..a803b58516 100644
 --- a/gdb/regcache.h
 +++ b/gdb/regcache.h
@@ -82,9 +82,9 @@ extern void regcache_raw_set_cached_value
@ -2927,7 +2953,7 @@ index c5ef41b7a6..0d4f2cdccc 100644
   void transfer_regset (const struct regset *regset,
 			struct regcache *out_regcache,
 diff --git a/gdb/remote.c b/gdb/remote.c
-index 852fdef490..e8e40c7f9b 100644
+index 9ff6028b8d..f9f8f973a2 100644
 --- a/gdb/remote.c
 +++ b/gdb/remote.c
@@ -9963,7 +9963,7 @@ int remote_hw_breakpoint_limit = -1;
@ -2940,7 +2966,7 @@ index 852fdef490..e8e40c7f9b 100644
   if (remote_hw_watchpoint_length_limit == 0)
     return 0;
 diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
-index 95dd9bd8a7..1283814364 100644
+index cb924e084d..c18f2d0ed5 100644
 --- a/gdb/rust-lang.c
 +++ b/gdb/rust-lang.c
@@ -472,7 +472,7 @@ rust_printchar (int c, struct type *type, struct ui_file *stream)
@ -2962,7 +2988,7 @@ index 95dd9bd8a7..1283814364 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 03b14a9ecc..2f84b41244 100644
+index 8a3fcff9b6..a8b7d63938 100644
 --- a/gdb/s390-linux-nat.c
 +++ b/gdb/s390-linux-nat.c
@@ -921,7 +921,7 @@ s390_remove_hw_breakpoint (struct target_ops *self,
@ -2975,7 +3001,7 @@ index 03b14a9ecc..2f84b41244 100644
   return 1;
 }
 diff --git a/gdb/spu-multiarch.c b/gdb/spu-multiarch.c
-index 392995900e..a174bf5cb2 100644
+index 7152ddabbd..1cfa7780af 100644
 --- a/gdb/spu-multiarch.c
 +++ b/gdb/spu-multiarch.c
@@ -128,7 +128,7 @@ spu_thread_architecture (struct target_ops *ops, ptid_t ptid)
@ -2988,7 +3014,7 @@ index 392995900e..a174bf5cb2 100644
   struct target_ops *ops_beneath = find_target_beneath (self);
 
 diff --git a/gdb/stack.c b/gdb/stack.c
-index 6bd0d45c32..b27fd158e7 100644
+index 9993ae654a..6e1336da02 100644
 --- a/gdb/stack.c
 +++ b/gdb/stack.c
@@ -190,7 +190,7 @@ print_stack_frame (struct frame_info *frame, int print_level,
@ -3030,7 +3056,7 @@ index 6bd0d45c32..b27fd158e7 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 96aa30f4fb..ea760e10e5 100644
+index 9adde044cd..2bd1464a01 100644
 --- a/gdb/symmisc.c
 +++ b/gdb/symmisc.c
@@ -585,11 +585,11 @@ print_symbol (struct gdbarch *gdbarch, struct symbol *symbol,
@ -3079,7 +3105,7 @@ index aaf11d81b8..2b449cbf01 100644
   target_debug_print_int (result);
   fputs_unfiltered ("\n", gdb_stdlog);
 diff --git a/gdb/target.c b/gdb/target.c
-index 767a2ad45a..0942645a2a 100644
+index 748d5bb7a2..a1ac6d0697 100644
 --- a/gdb/target.c
 +++ b/gdb/target.c
@@ -56,7 +56,7 @@ static int default_watchpoint_addr_within_range (struct target_ops *,
@ -3101,10 +3127,10 @@ index 767a2ad45a..0942645a2a 100644
   return (len <= gdbarch_ptr_bit (target_gdbarch ()) / TARGET_CHAR_BIT);
 }
 diff --git a/gdb/target.h b/gdb/target.h
-index 1e9aa9f8d2..b65e34a14a 100644
+index e3a2882fe5..7a70c3f6da 100644
 --- a/gdb/target.h
 +++ b/gdb/target.h
-@@ -550,7 +550,7 @@ struct target_ops
+@@ -541,7 +541,7 @@ struct target_ops
     /* Documentation of this routine is provided with the corresponding
        target_* macro.  */
     int (*to_region_ok_for_hw_watchpoint) (struct target_ops *,
@ -3114,7 +3140,7 @@ index 1e9aa9f8d2..b65e34a14a 100644
 
     int (*to_can_accel_watchpoint_condition) (struct target_ops *,
 diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
-index 550a72fe5e..e7f1cc0d11 100644
+index b0f855a6f4..23033fa9de 100644
 --- a/gdb/tracepoint.c
 +++ b/gdb/tracepoint.c
@@ -852,10 +852,10 @@ collection_list::add_register (unsigned int regno)
@ -3211,7 +3237,7 @@ index 550a72fe5e..e7f1cc0d11 100644
       if (BLOCK_FUNCTION (block))
 	break;
 diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
-index 60caa7ad39..f67079cdcf 100644
+index 9f4596ecd1..8554cad3ba 100644
 --- a/gdb/tracepoint.h
 +++ b/gdb/tracepoint.h
@@ -255,7 +255,7 @@ public:
@ -3224,7 +3250,7 @@ index 60caa7ad39..f67079cdcf 100644
 		       struct gdbarch *gdbarch,
 		       long frame_regno, long frame_offset,
 diff --git a/gdb/valarith.c b/gdb/valarith.c
-index eddfdb367d..c5357f9981 100644
+index 035def5466..67bd7cf03a 100644
 --- a/gdb/valarith.c
 +++ b/gdb/valarith.c
@@ -184,7 +184,7 @@ value_subscript (struct value *array, LONGEST index)
@ -3270,7 +3296,7 @@ index eddfdb367d..c5357f9981 100644
   for (i = 0; i < len; i++)
     {
 diff --git a/gdb/valops.c b/gdb/valops.c
-index 30623efc6e..a7c3613d84 100644
+index 7aacd17d70..fdcb7e49e6 100644
 --- a/gdb/valops.c
 +++ b/gdb/valops.c
@@ -80,7 +80,7 @@ oload_classification classify_oload_match (struct badness_vector *,
@ -3352,7 +3378,7 @@ index 30623efc6e..a7c3613d84 100644
 {
   struct type *real_type;
 diff --git a/gdb/valprint.c b/gdb/valprint.c
-index 20e3a4178b..e34874c461 100644
+index d01d02fc09..e2d87c05bc 100644
 --- a/gdb/valprint.c
 +++ b/gdb/valprint.c
@@ -882,7 +882,7 @@ generic_val_print_complex (struct type *type,
@ -3415,7 +3441,7 @@ index 20e3a4178b..e34874c461 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 302626d9d6..a92acfacec 100644
+index f005c31f87..6ffb58c04e 100644
 --- a/gdb/valprint.h
 +++ b/gdb/valprint.h
@@ -119,7 +119,7 @@ extern void val_print_array_elements (struct type *, LONGEST,
@ -3455,7 +3481,7 @@ index 302626d9d6..a92acfacec 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 a61f728550..0c87ae75ee 100644
+index 558d0bbd7a..b6406fedc9 100644
 --- a/gdb/value.c
 +++ b/gdb/value.c
@@ -363,7 +363,8 @@ value_bytes_available (const struct value *value,
@ -3490,7 +3516,7 @@ index a61f728550..0c87ae75ee 100644
   mark_value_bits_optimized_out (value,
 				 offset * TARGET_CHAR_BIT,
 diff --git a/gdb/value.h b/gdb/value.h
-index 8e85452969..5c8597f38c 100644
+index 03ca06448f..9c73464cf0 100644
 --- a/gdb/value.h
 +++ b/gdb/value.h
@@ -245,7 +245,7 @@ struct lval_funcs
@ -3550,7 +3576,7 @@ index 8e85452969..5c8597f38c 100644
 /* User function handler.  */
 
 diff --git a/gdb/x86-nat.c b/gdb/x86-nat.c
-index a26685914a..255cd5749f 100644
+index b126c47c94..825b487a9a 100644
 --- a/gdb/x86-nat.c
 +++ b/gdb/x86-nat.c
@@ -174,7 +174,7 @@ x86_remove_watchpoint (struct target_ops *self, CORE_ADDR addr, int len,
--- a/gdb-rhbz795424-bitpos-21of25.patch
+++ b/gdb-rhbz795424-bitpos-21of25.patch
@ -72,7 +72,7 @@ Content-Disposition: attachment; filename=bitpos-ensure-size_t.patch
 8 files changed, 29 insertions(+)

 diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
-index 21199bd988..220dc58ef4 100644
+index 52a46d96ea..ea53b9ee10 100644
 --- a/gdb/alpha-tdep.c
 +++ b/gdb/alpha-tdep.c
@@ -415,6 +415,13 @@ alpha_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@ -90,7 +90,7 @@ index 21199bd988..220dc58ef4 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 38beb4d62a..bcb59507bd 100644
+index db3ff338d1..4d06680239 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,
@ -102,7 +102,7 @@ index 38beb4d62a..bcb59507bd 100644
 
 		  if (target_read_memory (address + boffset, buf.data (),
 diff --git a/gdb/defs.h b/gdb/defs.h
-index f76293fedf..27f3becab0 100644
+index 4fb2129b30..0c156d56c3 100644
 --- a/gdb/defs.h
 +++ b/gdb/defs.h
@@ -705,4 +705,6 @@ DEF_ENUM_FLAGS_TYPE (enum user_selected_what_flag, user_selected_what);
@ -113,10 +113,10 @@ index f76293fedf..27f3becab0 100644
 +
 #endif /* #ifndef DEFS_H */
 diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
-index 3cdc847fe3..8d5b395afd 100644
+index e5c1b07040..06fb3b77c9 100644
 --- a/gdb/p-valprint.c
 +++ b/gdb/p-valprint.c
-@@ -771,6 +771,7 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
+@@ -773,6 +773,7 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
 
 	  if (boffset < 0 || boffset >= TYPE_LENGTH (type))
 	    {
@ -125,7 +125,7 @@ index 3cdc847fe3..8d5b395afd 100644
 
 	      base_valaddr = buf.data ();
 diff --git a/gdb/utils.c b/gdb/utils.c
-index c306e0c384..a0c7e9b03a 100644
+index 0066bfcc4b..6f0abc98a2 100644
 --- a/gdb/utils.c
 +++ b/gdb/utils.c
@@ -2836,6 +2836,18 @@ string_to_core_addr (const char *my_string)
@ -148,7 +148,7 @@ index c306e0c384..a0c7e9b03a 100644
 gdb_realpath (const char *filename)
 {
 diff --git a/gdb/valops.c b/gdb/valops.c
-index a7c3613d84..eebcb8e5e1 100644
+index fdcb7e49e6..ddc53f131e 100644
 --- a/gdb/valops.c
 +++ b/gdb/valops.c
@@ -2087,6 +2087,7 @@ search_struct_method (const char *name, struct value **arg1p,
@ -160,7 +160,7 @@ index a7c3613d84..eebcb8e5e1 100644
 	      address = value_address (*arg1p);
 
 diff --git a/gdb/value.c b/gdb/value.c
-index 0c87ae75ee..105c28bea7 100644
+index b6406fedc9..ac7d07a7b5 100644
 --- a/gdb/value.c
 +++ b/gdb/value.c
@@ -926,6 +926,7 @@ allocate_value_lazy (struct type *type)
@ -189,7 +189,7 @@ index 0c87ae75ee..105c28bea7 100644
 	= (gdb_byte *) xrealloc (val->contents, TYPE_LENGTH (new_encl_type));
     }
 diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c
-index c1f10c8b65..f31acc8f01 100644
+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,
--- a/gdb-rhbz795424-bitpos-22of25.patch
+++ b/gdb-rhbz795424-bitpos-22of25.patch
@ -118,7 +118,7 @@ Content-Disposition: attachment; filename=bitpos-wp.patch
 10 files changed, 38 insertions(+), 37 deletions(-)

 diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
-index 8606111c00..9a29445320 100644
+index 08e6f4d4fd..f08bf039e4 100644
 --- a/gdb/aarch64-linux-nat.c
 +++ b/gdb/aarch64-linux-nat.c
@@ -767,7 +767,7 @@ aarch64_linux_stopped_by_watchpoint (struct target_ops *ops)
@ -131,7 +131,7 @@ index 8606111c00..9a29445320 100644
   return start <= addr && start + length - 1 >= addr;
 }
 diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
-index b5732cb48e..f7249fa799 100644
+index 3b7aa40db8..48dfe22ce1 100644
 --- a/gdb/arm-linux-nat.c
 +++ b/gdb/arm-linux-nat.c
@@ -1177,7 +1177,7 @@ arm_linux_stopped_by_watchpoint (struct target_ops *ops)
@ -144,7 +144,7 @@ index b5732cb48e..f7249fa799 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 9800d9a59c..ee1ea40664 100644
+index ce26f28fad..e9ebc5fba8 100644
 --- a/gdb/nat/aarch64-linux-hw-point.c
 +++ b/gdb/nat/aarch64-linux-hw-point.c
@@ -111,7 +111,7 @@ aarch64_point_encode_ctrl_reg (enum target_hw_bp_type type, int len)
@ -218,7 +218,7 @@ index 9800d9a59c..ee1ea40664 100644
 		  : (type == hw_read ? "hw-read-watchpoint"
 		     : (type == hw_access ? "hw-access-watchpoint"
 diff --git a/gdb/nat/aarch64-linux-hw-point.h b/gdb/nat/aarch64-linux-hw-point.h
-index 610a5f1215..18e1c826c3 100644
+index 7c42b96d1b..e1d4fc8dbc 100644
 --- a/gdb/nat/aarch64-linux-hw-point.h
 +++ b/gdb/nat/aarch64-linux-hw-point.h
@@ -172,7 +172,7 @@ int aarch64_handle_breakpoint (enum target_hw_bp_type type, CORE_ADDR addr,
@ -240,7 +240,7 @@ index 610a5f1215..18e1c826c3 100644
 void aarch64_linux_get_debug_reg_capacity (int tid);
 
 diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
-index 429b9c6231..39004c1a77 100644
+index 4a82434c0d..49a27d8daa 100644
 --- a/gdb/ppc-linux-nat.c
 +++ b/gdb/ppc-linux-nat.c
@@ -1798,11 +1798,11 @@ can_use_watchpoint_cond_accel (void)
@ -295,7 +295,7 @@ index 429b9c6231..39004c1a77 100644
   int mask;
 
 diff --git a/gdb/procfs.c b/gdb/procfs.c
-index 1dd383aecb..dbb98c165d 100644
+index 887f1201fe..edd1be632a 100644
 --- a/gdb/procfs.c
 +++ b/gdb/procfs.c
@@ -1563,7 +1563,7 @@ procfs_address_to_host_pointer (CORE_ADDR addr)
@ -317,7 +317,7 @@ index 1dd383aecb..dbb98c165d 100644
 {
   int       pflags = 0;
 diff --git a/gdb/remote.c b/gdb/remote.c
-index e8e40c7f9b..a33a70642b 100644
+index f9f8f973a2..1eee712466 100644
 --- a/gdb/remote.c
 +++ b/gdb/remote.c
@@ -9891,7 +9891,7 @@ remote_insert_watchpoint (struct target_ops *self, CORE_ADDR addr, int len,
@ -411,7 +411,7 @@ index 2b449cbf01..f725215fff 100644
   target_debug_print_int (arg3);
   fputs_unfiltered (", ", gdb_stdlog);
 diff --git a/gdb/target.c b/gdb/target.c
-index 0942645a2a..25a4c3194e 100644
+index a1ac6d0697..eb0538cb82 100644
 --- a/gdb/target.c
 +++ b/gdb/target.c
@@ -53,7 +53,7 @@ static void generic_tls_error (void) ATTRIBUTE_NORETURN;
@ -433,10 +433,10 @@ index 0942645a2a..25a4c3194e 100644
   return addr >= start && addr < start + length;
 }
 diff --git a/gdb/target.h b/gdb/target.h
-index b65e34a14a..c2118f9639 100644
+index 7a70c3f6da..35eee91a83 100644
 --- a/gdb/target.h
 +++ b/gdb/target.h
-@@ -544,7 +544,7 @@ struct target_ops
+@@ -535,7 +535,7 @@ struct target_ops
     int (*to_stopped_data_address) (struct target_ops *, CORE_ADDR *)
       TARGET_DEFAULT_RETURN (0);
     int (*to_watchpoint_addr_within_range) (struct target_ops *,
@ -445,7 +445,7 @@ index b65e34a14a..c2118f9639 100644
       TARGET_DEFAULT_FUNC (default_watchpoint_addr_within_range);
 
     /* Documentation of this routine is provided with the corresponding
-@@ -554,7 +554,7 @@ struct target_ops
+@@ -545,7 +545,7 @@ struct target_ops
       TARGET_DEFAULT_FUNC (default_region_ok_for_hw_watchpoint);
 
     int (*to_can_accel_watchpoint_condition) (struct target_ops *,
--- a/gdb-rhbz795424-bitpos-23of25.patch
+++ b/gdb-rhbz795424-bitpos-23of25.patch
@ -183,7 +183,7 @@ Content-Disposition: attachment; filename=bitpos-tdep.patch
 34 files changed, 151 insertions(+), 143 deletions(-)

 diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
-index 220dc58ef4..79d2a4da34 100644
+index ea53b9ee10..34dfb661f8 100644
 --- a/gdb/alpha-tdep.c
 +++ b/gdb/alpha-tdep.c
@@ -301,17 +301,17 @@ alpha_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@ -229,7 +229,7 @@ index 220dc58ef4..79d2a4da34 100644
 	      offset += tlen;
 	      contents += tlen;
 diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
-index a0bd5c2337..916c228277 100644
+index 651794a41f..c96790a6af 100644
 --- a/gdb/amd64-tdep.c
 +++ b/gdb/amd64-tdep.c
@@ -880,8 +880,8 @@ amd64_push_arguments (struct regcache *regcache, int nargs,
@ -262,7 +262,7 @@ index a0bd5c2337..916c228277 100644
 	    }
 	}
 diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
-index 975c6848a4..a0eedb2a9b 100644
+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,
@ -275,7 +275,7 @@ index 975c6848a4..a0eedb2a9b 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 ac92c88b59..8291136764 100644
+index bc83326ae7..d38dd4918b 100644
 --- a/gdb/arm-tdep.c
 +++ b/gdb/arm-tdep.c
@@ -3477,7 +3477,7 @@ arm_vfp_cprc_reg_char (enum arm_vfp_cprc_base_type b)
@ -349,7 +349,7 @@ index ac92c88b59..8291136764 100644
       struct type *target_type;
       enum type_code typecode;
 diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
-index f4ce2706d4..9bd51fd643 100644
+index aa65a76e07..f74b927854 100644
 --- a/gdb/avr-tdep.c
 +++ b/gdb/avr-tdep.c
@@ -1191,13 +1191,13 @@ avr_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame)
@ -385,7 +385,7 @@ index f4ce2706d4..9bd51fd643 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 f9594d7947..1628f2a820 100644
+index d87fd4d896..f8b02daf29 100644
 --- a/gdb/bfin-tdep.c
 +++ b/gdb/bfin-tdep.c
@@ -504,7 +504,7 @@ bfin_push_dummy_call (struct gdbarch *gdbarch,
@ -407,7 +407,7 @@ index f9594d7947..1628f2a820 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 9fbb8b4fac..82f25084bd 100644
+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,
@ -445,7 +445,7 @@ index 9fbb8b4fac..82f25084bd 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 acc2da93a4..9e380e12ba 100644
+index 809a647984..6c7059fff4 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,
@ -481,7 +481,7 @@ index acc2da93a4..9e380e12ba 100644
 	      for (offset = 0; offset < padded_len; offset += wordsize)
 		{
 diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
-index 141399f6a3..8223f84da4 100644
+index 513f0e0391..0872d5e809 100644
 --- a/gdb/hppa-tdep.c
 +++ b/gdb/hppa-tdep.c
@@ -989,7 +989,7 @@ hppa64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@ -503,7 +503,7 @@ index 141399f6a3..8223f84da4 100644
 
   if (len > 16)
 diff --git a/gdb/i386-darwin-tdep.c b/gdb/i386-darwin-tdep.c
-index c642040432..1b30a50639 100644
+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,
@ -516,7 +516,7 @@ index c642040432..1b30a50639 100644
 
       if (struct_return)
 diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
-index 2f47affdc6..38553089a8 100644
+index af4942ab2e..6b1586a9e3 100644
 --- a/gdb/i386-tdep.c
 +++ b/gdb/i386-tdep.c
@@ -2677,7 +2677,7 @@ i386_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@ -583,7 +583,7 @@ index 2f47affdc6..38553089a8 100644
   if (i386_fp_regnum_p (get_frame_arch (frame), regnum))
     {
 diff --git a/gdb/iq2000-tdep.c b/gdb/iq2000-tdep.c
-index e47cc06a1f..7dc999d10e 100644
+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,
@ -599,7 +599,7 @@ index e47cc06a1f..7dc999d10e 100644
   CORE_ADDR struct_ptr;
 
 diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
-index c00455bb5f..663ca20486 100644
+index 0fe6754412..9a27740691 100644
 --- a/gdb/m32r-tdep.c
 +++ b/gdb/m32r-tdep.c
@@ -679,7 +679,7 @@ m32r_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@ -612,7 +612,7 @@ index c00455bb5f..663ca20486 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 9dc1fe6f01..19c75f21d3 100644
+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)
@ -638,7 +638,7 @@ index 9dc1fe6f01..19c75f21d3 100644
       /* Non-scalars bigger than 4 bytes are left aligned, others are
 	 right aligned.  */
 diff --git a/gdb/m88k-tdep.c b/gdb/m88k-tdep.c
-index 6be27a96c6..8f186c75a2 100644
+index 6a50126548..5a3a67a06a 100644
 --- a/gdb/m88k-tdep.c
 +++ b/gdb/m88k-tdep.c
@@ -254,13 +254,13 @@ m88k_store_arguments (struct regcache *regcache, int nargs,
@ -669,7 +669,7 @@ index 6be27a96c6..8f186c75a2 100644
       if (m88k_in_register_p (type))
 	{
 diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
-index 202cccb6e4..75398e442c 100644
+index ecfd4f36db..0cc4574425 100644
 --- a/gdb/mep-tdep.c
 +++ b/gdb/mep-tdep.c
@@ -2253,7 +2253,7 @@ push_large_arguments (CORE_ADDR sp, int argc, struct value **argv,
@ -682,7 +682,7 @@ index 202cccb6e4..75398e442c 100644
       if (arg_len > MEP_GPR_SIZE)
         {
 diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
-index a09f644aaa..4f8fda4bbb 100644
+index 981959ad4b..9572f92f65 100644
 --- a/gdb/mips-tdep.c
 +++ b/gdb/mips-tdep.c
@@ -477,7 +477,7 @@ static void
@ -831,7 +831,7 @@ index a09f644aaa..4f8fda4bbb 100644
       val = value_contents (arg);
 
 diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
-index eadbbb367e..39d24b2ad1 100644
+index 93c02d67b4..17ce536a90 100644
 --- a/gdb/mn10300-tdep.c
 +++ b/gdb/mn10300-tdep.c
@@ -1212,7 +1212,7 @@ mn10300_push_dummy_call (struct gdbarch *gdbarch,
@ -844,7 +844,7 @@ index eadbbb367e..39d24b2ad1 100644
   int argnum;
   const gdb_byte *val;
 diff --git a/gdb/mt-tdep.c b/gdb/mt-tdep.c
-index 7992394ca2..5dd20ca8b0 100644
+index a4ad0c65f1..953002a7c6 100644
 --- a/gdb/mt-tdep.c
 +++ b/gdb/mt-tdep.c
@@ -789,9 +789,9 @@ mt_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@ -860,7 +860,7 @@ index 7992394ca2..5dd20ca8b0 100644
 
   /* First handle however many args we can fit into MT_1ST_ARGREG thru
 diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c
-index b43f22da17..24820fa6ab 100644
+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,
@ -954,7 +954,7 @@ index b43f22da17..24820fa6ab 100644
       if (writebuf != NULL)
 	regcache_cooked_write_part (regcache, regnum,
 diff --git a/gdb/rl78-tdep.c b/gdb/rl78-tdep.c
-index 19f8098b7b..92a48ba513 100644
+index 3db72a1e96..0f4172d553 100644
 --- a/gdb/rl78-tdep.c
 +++ b/gdb/rl78-tdep.c
@@ -1347,8 +1347,8 @@ rl78_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@ -969,7 +969,7 @@ index 19f8098b7b..92a48ba513 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 8cc7539a8c..fc953c33d4 100644
+index 38c86d4cd8..f6d4816401 100644
 --- a/gdb/rs6000-aix-tdep.c
 +++ b/gdb/rs6000-aix-tdep.c
@@ -187,9 +187,9 @@ rs6000_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@ -994,7 +994,7 @@ index 8cc7539a8c..fc953c33d4 100644
       if (argbytes)
 	{
 diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c
-index a0d4cdd740..2617919e8a 100644
+index bdde5c34c8..975b072b39 100644
 --- a/gdb/s390-linux-tdep.c
 +++ b/gdb/s390-linux-tdep.c
@@ -3132,7 +3132,7 @@ s390_function_arg_vector (struct type *type)
@ -1025,7 +1025,7 @@ index a0d4cdd740..2617919e8a 100644
 
   if (code == TYPE_CODE_FLT || code == TYPE_CODE_DECFLOAT)
 diff --git a/gdb/score-tdep.c b/gdb/score-tdep.c
-index 5b68a2b332..9a16cc809e 100644
+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,
@ -1038,7 +1038,7 @@ index 5b68a2b332..9a16cc809e 100644
   CORE_ADDR addr = 0;
 
 diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
-index 23675bb6cc..60cc6d3f4e 100644
+index fbc5c9f1d0..1f6052fa97 100644
 --- a/gdb/sh-tdep.c
 +++ b/gdb/sh-tdep.c
@@ -813,7 +813,7 @@ sh_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
@ -1080,7 +1080,7 @@ index 23675bb6cc..60cc6d3f4e 100644
   int last_reg_arg = INT_MAX;
 
 diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c
-index 3004f15b03..01d0ca870c 100644
+index ad533c9d79..7700e68402 100644
 --- a/gdb/sh64-tdep.c
 +++ b/gdb/sh64-tdep.c
@@ -1079,7 +1079,7 @@ sh64_push_dummy_call (struct gdbarch *gdbarch,
@ -1102,7 +1102,7 @@ index 3004f15b03..01d0ca870c 100644
   int fp_args[12];
 
 diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
-index 55aef132d9..ce1cf41d2f 100644
+index 7400c24fc5..39db22947c 100644
 --- a/gdb/sparc64-tdep.c
 +++ b/gdb/sparc64-tdep.c
@@ -1205,7 +1205,7 @@ sparc64_16_byte_align_p (struct type *type)
@ -1160,7 +1160,7 @@ index 55aef132d9..ce1cf41d2f 100644
       gdb_byte buf[16];
 
 diff --git a/gdb/spu-tdep.c b/gdb/spu-tdep.c
-index fb9a5d8730..5c15ddc7c8 100644
+index b82bb0ebc3..f87e6f57e1 100644
 --- a/gdb/spu-tdep.c
 +++ b/gdb/spu-tdep.c
@@ -1430,7 +1430,7 @@ spu_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
@ -1182,7 +1182,7 @@ index fb9a5d8730..5c15ddc7c8 100644
 	  
 	  if (spu_scalar_value_p (type))
 diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c
-index 66f2259612..3c7f55f500 100644
+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,
@ -1223,7 +1223,7 @@ index 66f2259612..3c7f55f500 100644
 	  addr = sp + stack_offset;
 	  write_memory (addr, val, len);
 diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
-index 3a630c33d8..33a3caafcf 100644
+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,
@ -1236,7 +1236,7 @@ index 3a630c33d8..33a3caafcf 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 065cc9b882..79b877325b 100644
+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,
@ -1258,7 +1258,7 @@ index 065cc9b882..79b877325b 100644
       gdb_byte valbuf[v850_reg_size];
 
 diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c
-index f31acc8f01..03d7c61dcd 100644
+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,
@ -1280,7 +1280,7 @@ index f31acc8f01..03d7c61dcd 100644
       sp -= (len + 3) & ~3;
       count += (len + 3) / 4;
 diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
-index 153375a1bd..5ae186d7fb 100644
+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,
@ -1296,7 +1296,7 @@ index 153375a1bd..5ae186d7fb 100644
   gdb_byte buf[xstormy16_pc_size];
 
 diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 4af6184200..ebad66a051 100644
+index e09592a94e..95133a5871 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
@@ -1628,8 +1628,7 @@ xtensa_store_return_value (struct type *type,
--- a/gdb-rhbz795424-bitpos-25of25.patch
+++ b/gdb-rhbz795424-bitpos-25of25.patch
@ -62,7 +62,7 @@ Content-Disposition: attachment; filename=f77-bounds.patch
 3 files changed, 9 insertions(+), 9 deletions(-)

 diff --git a/gdb/f-lang.h b/gdb/f-lang.h
-index fb00f37486..625af96e16 100644
+index 9171a13bdf..9ec58f808e 100644
 --- a/gdb/f-lang.h
 +++ b/gdb/f-lang.h
@@ -49,9 +49,9 @@ struct common_block
@ -78,7 +78,7 @@ index fb00f37486..625af96e16 100644
 extern void f77_get_dynamic_array_length (struct type *);
 
 diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
-index dccdfe79c6..418693eaba 100644
+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,
@ -127,7 +127,7 @@ index dccdfe79c6..418693eaba 100644
       break;
 
 diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
-index 27d63495af..bd2e2a7d32 100644
+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];
--- a/gdb-runtest-pie-override.patch
+++ b/gdb-runtest-pie-override.patch
@ -28,7 +28,7 @@ a problem with make -j parallelization of the testsuite.
 1 file changed, 4 insertions(+), 4 deletions(-)

 diff --git a/gdb/testsuite/lib/future.exp b/gdb/testsuite/lib/future.exp
-index aed2cfd476..240d2253ec 100644
+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} {
--- a/gdb-stale-frame_info.patch
+++ b/gdb-stale-frame_info.patch
@ -44,7 +44,7 @@ gdb/
 1 file changed, 16 insertions(+), 2 deletions(-)

 diff --git a/gdb/progspace-and-thread.c b/gdb/progspace-and-thread.c
-index a48faa0f96..8446bfa336 100644
+index 27d626b05f..ee6342d96a 100644
 --- a/gdb/progspace-and-thread.c
 +++ b/gdb/progspace-and-thread.c
@@ -23,15 +23,29 @@
--- a/gdb-testsuite-readline63-sigint.patch
+++ b/gdb-testsuite-readline63-sigint.patch
@ -18,7 +18,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1301175
 1 file changed, 19 insertions(+), 3 deletions(-)

 diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
-index a4a446f9df..cc80d171dc 100644
+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 { } {
--- a/gdb-vla-intel-fix-print-char-array.patch
+++ b/gdb-vla-intel-fix-print-char-array.patch
@ -26,7 +26,7 @@ And adjust its testcase.
 2 files changed, 17 insertions(+), 3 deletions(-)

 diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
-index bd2e2a7d32..88ca97cbcc 100644
+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,
@ -55,7 +55,7 @@ index bd2e2a7d32..88ca97cbcc 100644
 
     case TYPE_CODE_STRUCT:
 diff --git a/gdb/testsuite/gdb.fortran/printing-types.exp b/gdb/testsuite/gdb.fortran/printing-types.exp
-index 085de4fc8f..7b2c6516da 100644
+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 {
--- a/gdb-vla-intel-fortran-strides.patch
+++ b/gdb-vla-intel-fortran-strides.patch
@ -66,7 +66,7 @@ dbfd7140bf4c0500d1f5d192be781f83f78f7922
 create mode 100644 gdb/testsuite/gdb.fortran/vla-stride.f90

 diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
-index 83a8c34229..1eb6182281 100644
+index 51f133f1b5..5105c8d23a 100644
 --- a/gdb/dwarf2loc.c
 +++ b/gdb/dwarf2loc.c
@@ -2601,11 +2601,14 @@ dwarf2_locexpr_baton_eval (const struct dwarf2_locexpr_baton *dlbaton,
@ -157,7 +157,7 @@ index 83a8c34229..1eb6182281 100644
 
 /* See dwarf2loc.h.  */
 diff --git a/gdb/dwarf2loc.h b/gdb/dwarf2loc.h
-index db026d3e68..6d24a027a3 100644
+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,
@ -174,10 +174,10 @@ index db026d3e68..6d24a027a3 100644
    property to C code.
 
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index b4e60a4409..3f04c6f8d4 100644
+index a3028e5c52..59e749e416 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -17522,7 +17522,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17553,7 +17553,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
   struct type *base_type, *orig_base_type;
   struct type *range_type;
   struct attribute *attr;
@ -186,7 +186,7 @@ index b4e60a4409..3f04c6f8d4 100644
   int low_default_is_valid;
   int high_bound_is_count = 0;
   const char *name;
-@@ -17542,7 +17542,9 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17573,7 +17573,9 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
 
   low.kind = PROP_CONST;
   high.kind = PROP_CONST;
@ -196,7 +196,7 @@ index b4e60a4409..3f04c6f8d4 100644
 
   /* Set LOW_DEFAULT_IS_VALID if current language and DWARF version allow
      omitting DW_AT_lower_bound.  */
-@@ -17575,6 +17577,13 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17606,6 +17608,13 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
       break;
     }
 
@ -210,7 +210,7 @@ index b4e60a4409..3f04c6f8d4 100644
   attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
   if (attr)
     attr_to_dynamic_prop (attr, die, cu, &low);
-@@ -17651,7 +17660,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17682,7 +17691,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
       && !TYPE_UNSIGNED (base_type) && (high.data.const_val & negative_mask))
     high.data.const_val |= negative_mask;
 
@ -220,7 +220,7 @@ index b4e60a4409..3f04c6f8d4 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 14a3e05ade..44f7a4edfe 100644
+index 6f74c41b9f..d9bca2791d 100644
 --- a/gdb/eval.c
 +++ b/gdb/eval.c
@@ -384,29 +384,325 @@ init_array_element (struct value *array, struct value *element,
@ -649,7 +649,7 @@ index 14a3e05ade..44f7a4edfe 100644
     error (_("Can't get dimensions for a non-array type"));
 
 diff --git a/gdb/expprint.c b/gdb/expprint.c
-index a99832c7ab..7135fb50e2 100644
+index ac5ae0fea1..41bb357a27 100644
 --- a/gdb/expprint.c
 +++ b/gdb/expprint.c
@@ -581,12 +581,10 @@ print_subexp_standard (struct expression *exp, int *pos,
@ -703,7 +703,7 @@ index a99832c7ab..7135fb50e2 100644
       }
       break;
 diff --git a/gdb/expression.h b/gdb/expression.h
-index 271baa9f0d..2781d355bf 100644
+index a783ea5fef..be24792eb6 100644
 --- a/gdb/expression.h
 +++ b/gdb/expression.h
@@ -153,17 +153,17 @@ extern void dump_raw_expression (struct expression *,
@ -734,7 +734,7 @@ index 271baa9f0d..2781d355bf 100644
 
 #endif /* !defined (EXPRESSION_H) */
 diff --git a/gdb/f-exp.y b/gdb/f-exp.y
-index 217191ac88..71c61cab69 100644
+index 6495e03cc5..cd89bb7ca2 100644
 --- a/gdb/f-exp.y
 +++ b/gdb/f-exp.y
@@ -257,31 +257,63 @@ arglist :	subrange
@ -807,7 +807,7 @@ index 217191ac88..71c61cab69 100644
 	;
 
 diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
-index d16dc0593d..aa46b0967f 100644
+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,
@ -827,7 +827,7 @@ index d16dc0593d..aa46b0967f 100644
       for (i = lowerbound;
 	   (i < upperbound + 1 && (*elts) < options->print_max);
 diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
-index 01ab6fa8c7..63ada5a46c 100644
+index 7ba62df474..519dfebba8 100644
 --- a/gdb/gdbtypes.c
 +++ b/gdb/gdbtypes.c
@@ -864,7 +864,8 @@ allocate_stub_method (struct type *type)
@ -870,7 +870,7 @@ index 01ab6fa8c7..63ada5a46c 100644
 
   return result_type;
 }
-@@ -1112,16 +1118,20 @@ create_array_type_with_stride (struct type *result_type,
+@@ -1133,16 +1139,20 @@ create_array_type_with_stride (struct type *result_type,
       && (!type_not_associated (result_type)
 	  && !type_not_allocated (result_type)))
     {
@ -892,7 +892,7 @@ index 01ab6fa8c7..63ada5a46c 100644
       else if (bit_stride > 0)
 	TYPE_LENGTH (result_type) =
 	  (bit_stride * (high_bound - low_bound + 1) + 7) / 8;
-@@ -1914,12 +1924,12 @@ resolve_dynamic_range (struct type *dyn_range_type,
+@@ -1954,12 +1964,12 @@ resolve_dynamic_range (struct type *dyn_range_type,
   CORE_ADDR value;
   struct type *static_range_type, *static_target_type;
   const struct dynamic_prop *prop;
@ -907,7 +907,7 @@ index 01ab6fa8c7..63ada5a46c 100644
     {
       low_bound.kind = PROP_CONST;
       low_bound.data.const_val = value;
-@@ -1931,7 +1941,7 @@ resolve_dynamic_range (struct type *dyn_range_type,
+@@ -1971,7 +1981,7 @@ resolve_dynamic_range (struct type *dyn_range_type,
     }
 
   prop = &TYPE_RANGE_DATA (dyn_range_type)->high;
@ -916,7 +916,7 @@ index 01ab6fa8c7..63ada5a46c 100644
     {
       high_bound.kind = PROP_CONST;
       high_bound.data.const_val = value;
-@@ -1946,12 +1956,20 @@ resolve_dynamic_range (struct type *dyn_range_type,
+@@ -1986,12 +1996,20 @@ resolve_dynamic_range (struct type *dyn_range_type,
       high_bound.data.const_val = 0;
     }
 
@ -939,10 +939,10 @@ index 01ab6fa8c7..63ada5a46c 100644
   return static_range_type;
 }
 diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
-index 68ffaf832c..33de8faf2b 100644
+index 5942b5ad48..923ba101ca 100644
 --- a/gdb/gdbtypes.h
 +++ b/gdb/gdbtypes.h
-@@ -547,6 +547,10 @@ struct range_bounds
+@@ -550,6 +550,10 @@ struct range_bounds
 
   struct dynamic_prop high;
 
@ -953,7 +953,7 @@ index 68ffaf832c..33de8faf2b 100644
   /* True if HIGH range bound contains the number of elements in the
      subrange. This affects how the final hight bound is computed.  */
 
-@@ -708,7 +712,6 @@ struct main_type
+@@ -711,7 +715,6 @@ struct main_type
     /* * Union member used for range types.  */
 
     struct range_bounds *bounds;
@ -961,7 +961,7 @@ index 68ffaf832c..33de8faf2b 100644
   } flds_bnds;
 
   /* * Slot to point to additional language-specific fields of this
-@@ -1230,6 +1233,15 @@ extern void allocate_gnat_aux_type (struct type *);
+@@ -1233,6 +1236,15 @@ extern void allocate_gnat_aux_type (struct type *);
   TYPE_RANGE_DATA(range_type)->high.kind
 #define TYPE_LOW_BOUND_KIND(range_type) \
   TYPE_RANGE_DATA(range_type)->low.kind
@ -977,7 +977,7 @@ index 68ffaf832c..33de8faf2b 100644
 
 /* Property accessors for the type data location.  */
 #define TYPE_DATA_LOCATION(thistype) \
-@@ -1264,6 +1276,9 @@ extern void allocate_gnat_aux_type (struct type *);
+@@ -1267,6 +1279,9 @@ extern void allocate_gnat_aux_type (struct type *);
    TYPE_HIGH_BOUND_UNDEFINED(TYPE_INDEX_TYPE(arraytype))
 #define TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED(arraytype) \
    TYPE_LOW_BOUND_UNDEFINED(TYPE_INDEX_TYPE(arraytype))
@ -987,8 +987,8 @@ index 68ffaf832c..33de8faf2b 100644
 
 #define TYPE_ARRAY_UPPER_BOUND_VALUE(arraytype) \
    (TYPE_HIGH_BOUND(TYPE_INDEX_TYPE((arraytype))))
-@@ -1794,6 +1809,7 @@ extern struct type *create_array_type_with_stride
-   (struct type *, struct type *, struct type *, unsigned int);
+@@ -1798,6 +1813,7 @@ extern struct type *create_array_type_with_stride
+    struct dynamic_prop *, unsigned int);
 
 extern struct type *create_range_type (struct type *, struct type *,
 +				       const struct dynamic_prop *,
@ -996,10 +996,10 @@ index 68ffaf832c..33de8faf2b 100644
 				       const struct dynamic_prop *);
 
 diff --git a/gdb/parse.c b/gdb/parse.c
-index dff519ba63..922f0d5fe5 100644
+index 8b2bb22c76..e1bf3edbe2 100644
 --- a/gdb/parse.c
 +++ b/gdb/parse.c
-@@ -986,22 +986,20 @@ operator_length_standard (const struct expression *expr, int endpos,
+@@ -984,22 +984,20 @@ operator_length_standard (const struct expression *expr, int endpos,
 
     case OP_RANGE:
       oplen = 3;
@ -1034,7 +1034,7 @@ index dff519ba63..922f0d5fe5 100644
       break;
 
 diff --git a/gdb/rust-exp.y b/gdb/rust-exp.y
-index 731a0391a6..b82009a2a2 100644
+index 199e87671e..397a92dfdb 100644
 --- a/gdb/rust-exp.y
 +++ b/gdb/rust-exp.y
@@ -2448,23 +2448,17 @@ convert_ast_to_expression (struct parser_state *state,
@ -1065,7 +1065,7 @@ index 731a0391a6..b82009a2a2 100644
 	write_exp_elt_opcode (state, OP_RANGE);
 	write_exp_elt_longcst (state, kind);
 diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
-index 535a72bda8..95dd9bd8a7 100644
+index f7bec33a42..cb924e084d 100644
 --- a/gdb/rust-lang.c
 +++ b/gdb/rust-lang.c
@@ -1366,9 +1366,9 @@ rust_range (struct expression *exp, int *pos, enum noside noside)
@ -1623,7 +1623,7 @@ index 0000000000..f22fcbe124
 +  call sub
 +end
 diff --git a/gdb/testsuite/gdb.fortran/vla-ptype.exp b/gdb/testsuite/gdb.fortran/vla-ptype.exp
-index c8e72e92e7..76f47708d8 100644
+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"
@ -1635,7 +1635,7 @@ index c8e72e92e7..76f47708d8 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 87b76835db..27403f1f47 100644
+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"
@ -1732,7 +1732,7 @@ index 0000000000..8d2425222e
 +  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 0006b3364a..b3ada0a41b 100644
+index 508290a36e..d87f59b92b 100644
 --- a/gdb/testsuite/gdb.fortran/vla.f90
 +++ b/gdb/testsuite/gdb.fortran/vla.f90
@@ -54,4 +54,14 @@ program vla
@ -1751,7 +1751,7 @@ index 0006b3364a..b3ada0a41b 100644
 +
 end program vla
 diff --git a/gdb/valarith.c b/gdb/valarith.c
-index f3b44f9682..eddfdb367d 100644
+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)
@ -1774,7 +1774,7 @@ index f3b44f9682..eddfdb367d 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 ccc2bc2afe..4715912b94 100644
+index 9525dc8499..4cd4fd96ae 100644
 --- a/gdb/valops.c
 +++ b/gdb/valops.c
@@ -3776,56 +3776,195 @@ value_of_this_silent (const struct language_defn *lang)
@ -2004,7 +2004,7 @@ index ccc2bc2afe..4715912b94 100644
 
 /* Create a value for a FORTRAN complex number.  Currently most of the
 diff --git a/gdb/value.h b/gdb/value.h
-index e0de84427e..8e85452969 100644
+index 7dc67dc721..03ca06448f 100644
 --- a/gdb/value.h
 +++ b/gdb/value.h
@@ -1128,6 +1128,8 @@ extern struct value *varying_to_slice (struct value *);
--- a/gdb-vla-intel-fortran-vla-strings.patch
+++ b/gdb-vla-intel-fortran-vla-strings.patch
@ -34,24 +34,24 @@ git diff --stat -p gdb/master...gdb/users/bheckel/fortran-vla-strings
 ---
 gdb/NEWS                                  |   2 +
 gdb/c-valprint.c                          |  22 ++++
- gdb/dwarf2read.c                          | 160 +++++++++++++++++++++++++-----
+ gdb/dwarf2read.c                          | 163 +++++++++++++++++++++++++-----
 gdb/f-typeprint.c                         |  93 +++++++++--------
- gdb/gdbtypes.c                            |  44 +++++++-
+ gdb/gdbtypes.c                            |  40 +++++++-
 gdb/testsuite/gdb.cp/vla-cxx.cc           |   9 ++
 gdb/testsuite/gdb.cp/vla-cxx.exp          |   9 ++
 gdb/testsuite/gdb.fortran/pointers.exp    | 143 ++++++++++++++++++++++++++
 gdb/testsuite/gdb.fortran/pointers.f90    | 109 ++++++++++++++++++++
- gdb/testsuite/gdb.fortran/print_type.exp  | 100 +++++++++++++++++++
+ gdb/testsuite/gdb.fortran/print_type.exp  | 100 ++++++++++++++++++
 gdb/testsuite/gdb.fortran/vla-ptype.exp   |  12 +--
 gdb/testsuite/gdb.fortran/vla-strings.exp | 103 +++++++++++++++++++
- gdb/testsuite/gdb.fortran/vla-strings.f90 |  39 ++++++++
+ gdb/testsuite/gdb.fortran/vla-strings.f90 |  39 +++++++
 gdb/testsuite/gdb.fortran/vla-type.exp    |   7 +-
 gdb/testsuite/gdb.fortran/vla-value.exp   |   4 +-
 gdb/testsuite/gdb.mi/mi-vla-fortran.exp   |   8 +-
 gdb/typeprint.c                           |  19 ++++
 gdb/valops.c                              |  16 ++-
 gdb/valprint.c                            |   6 --
- 19 files changed, 807 insertions(+), 98 deletions(-)
+ 19 files changed, 807 insertions(+), 97 deletions(-)
 create mode 100644 gdb/testsuite/gdb.fortran/pointers.exp
 create mode 100644 gdb/testsuite/gdb.fortran/pointers.f90
 create mode 100644 gdb/testsuite/gdb.fortran/print_type.exp
@ -59,7 +59,7 @@ git diff --stat -p gdb/master...gdb/users/bheckel/fortran-vla-strings
 create mode 100644 gdb/testsuite/gdb.fortran/vla-strings.f90

 diff --git a/gdb/NEWS b/gdb/NEWS
-index c6fe297159..c0830619fe 100644
+index 14fcdf8674..6b45cc27db 100644
 --- a/gdb/NEWS
 +++ b/gdb/NEWS
@@ -1,6 +1,8 @@
@ -70,12 +70,12 @@ index c6fe297159..c0830619fe 100644
 +
 *** Changes since GDB 8.0
 
- * New "--readnever" command line option instructs GDB to not read each
+ * GDB now supports dynamically creating arbitrary register groups specified
 diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
-index 653fed657a..96e6c597cf 100644
+index c4c0918e26..3904fab260 100644
 --- a/gdb/c-valprint.c
 +++ b/gdb/c-valprint.c
-@@ -650,6 +650,28 @@ c_value_print (struct value *val, struct ui_file *stream,
+@@ -653,6 +653,28 @@ c_value_print (struct value *val, struct ui_file *stream,
       else
 	{
 	  /* normal case */
@ -105,7 +105,7 @@ index 653fed657a..96e6c597cf 100644
 	  type_print (value_type (val), "", stream, -1);
 	  fprintf_filtered (stream, ") ");
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 3f04c6f8d4..f32b115500 100644
+index 59e749e416..a1bc7eda75 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
@@ -2077,7 +2077,8 @@ static void read_signatured_type (struct signatured_type *);
@ -118,7 +118,7 @@ index 3f04c6f8d4..f32b115500 100644
 
 /* memory allocation interface */
 
-@@ -13735,7 +13736,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -13747,7 +13748,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
     {
       newobj->static_link
 	= XOBNEW (&objfile->objfile_obstack, struct dynamic_prop);
@ -127,7 +127,17 @@ index 3f04c6f8d4..f32b115500 100644
     }
 
   cu->list_in_scope = &local_symbols;
-@@ -17046,29 +17047,94 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -16329,7 +16330,8 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
+ 
+       byte_stride_prop
+ 	= (struct dynamic_prop *) alloca (sizeof (struct dynamic_prop));
+-      stride_ok = attr_to_dynamic_prop (attr, die, cu, byte_stride_prop);
+      stride_ok = attr_to_dynamic_prop (attr, die, cu, byte_stride_prop,
+					NULL, 0);
+       if (!stride_ok)
+ 	{
+ 	  complaint (&symfile_complaints,
+@@ -17077,29 +17079,94 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
   struct gdbarch *gdbarch = get_objfile_arch (objfile);
   struct type *type, *range_type, *index_type, *char_type;
   struct attribute *attr;
@ -233,7 +243,7 @@ index 3f04c6f8d4..f32b115500 100644
   char_type = language_string_char_type (cu->language_defn, gdbarch);
   type = create_string_type (NULL, char_type, range_type);
 
-@@ -17417,7 +17483,8 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17448,7 +17515,8 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu)
 
 static int
 attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
@ -243,7 +253,7 @@ index 3f04c6f8d4..f32b115500 100644
 {
   struct dwarf2_property_baton *baton;
   struct obstack *obstack = &cu->objfile->objfile_obstack;
-@@ -17427,14 +17494,33 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
+@@ -17458,14 +17526,33 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
 
   if (attr_form_is_block (attr))
     {
@ -281,7 +291,7 @@ index 3f04c6f8d4..f32b115500 100644
     }
   else if (attr_form_is_ref (attr))
     {
-@@ -17467,8 +17553,28 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
+@@ -17498,8 +17585,28 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
 		baton = XOBNEW (obstack, struct dwarf2_property_baton);
 		baton->referenced_type = die_type (target_die, target_cu);
 		baton->locexpr.per_cu = cu->per_cu;
@ -312,7 +322,7 @@ index 3f04c6f8d4..f32b115500 100644
 		prop->data.baton = baton;
 		prop->kind = PROP_LOCEXPR;
 		gdb_assert (prop->data.baton != NULL);
-@@ -17579,24 +17685,24 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17610,24 +17717,24 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
 
   attr = dwarf2_attr (die, DW_AT_byte_stride, cu);
   if (attr)
@ -341,7 +351,7 @@ index 3f04c6f8d4..f32b115500 100644
 	{
 	  /* If bounds are constant do the final calculation here.  */
 	  if (low.kind == PROP_CONST && high.kind == PROP_CONST)
-@@ -25183,7 +25289,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -25225,7 +25332,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
   attr = dwarf2_attr (die, DW_AT_allocated, cu);
   if (attr_form_is_block (attr))
     {
@ -350,7 +360,7 @@ index 3f04c6f8d4..f32b115500 100644
         add_dyn_prop (DYN_PROP_ALLOCATED, prop, type, objfile);
     }
   else if (attr != NULL)
-@@ -25198,7 +25304,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -25240,7 +25347,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
   attr = dwarf2_attr (die, DW_AT_associated, cu);
   if (attr_form_is_block (attr))
     {
@ -359,7 +369,7 @@ index 3f04c6f8d4..f32b115500 100644
         add_dyn_prop (DYN_PROP_ASSOCIATED, prop, type, objfile);
     }
   else if (attr != NULL)
-@@ -25211,7 +25317,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -25253,7 +25360,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
 
   /* Read DW_AT_data_location and set in type.  */
   attr = dwarf2_attr (die, DW_AT_data_location, cu);
@ -369,7 +379,7 @@ index 3f04c6f8d4..f32b115500 100644
 
   if (dwarf2_per_objfile->die_type_hash == NULL)
 diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
-index 9d9a1f30b9..dccdfe79c6 100644
+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 *);
@ -522,10 +532,10 @@ index 9d9a1f30b9..dccdfe79c6 100644
 	    }
 	  fprintfi_filtered (level, stream, "End Type ");
 diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
-index 63ada5a46c..a25e0a84e9 100644
+index 519dfebba8..b731a2f2c6 100644
 --- a/gdb/gdbtypes.c
 +++ b/gdb/gdbtypes.c
-@@ -1842,7 +1842,8 @@ is_dynamic_type_internal (struct type *type, int top_level)
+@@ -1877,7 +1877,8 @@ is_dynamic_type_internal (struct type *type, int top_level)
   type = check_typedef (type);
 
   /* We only want to recognize references at the outermost level.  */
@ -535,7 +545,7 @@ index 63ada5a46c..a25e0a84e9 100644
     type = check_typedef (TYPE_TARGET_TYPE (type));
 
   /* Types that have a dynamic TYPE_DATA_LOCATION are considered
-@@ -1876,6 +1877,7 @@ is_dynamic_type_internal (struct type *type, int top_level)
+@@ -1911,6 +1912,7 @@ is_dynamic_type_internal (struct type *type, int top_level)
       }
 
     case TYPE_CODE_ARRAY:
@ -543,9 +553,9 @@ index 63ada5a46c..a25e0a84e9 100644
       {
 	gdb_assert (TYPE_NFIELDS (type) == 1);
 
-@@ -1988,7 +1990,8 @@ resolve_dynamic_array (struct type *type,
-   struct type *ary_dim;
+@@ -2029,7 +2031,8 @@ resolve_dynamic_array (struct type *type,
   struct dynamic_prop *prop;
+   unsigned int bit_stride = 0;
 
 -  gdb_assert (TYPE_CODE (type) == TYPE_CODE_ARRAY);
 +  gdb_assert (TYPE_CODE (type) == TYPE_CODE_ARRAY
@ -553,7 +563,7 @@ index 63ada5a46c..a25e0a84e9 100644
 
   type = copy_type (type);
 
-@@ -2013,13 +2016,17 @@ resolve_dynamic_array (struct type *type,
+@@ -2054,11 +2057,15 @@ resolve_dynamic_array (struct type *type,
 
   ary_dim = check_typedef (TYPE_TARGET_TYPE (elt_type));
 
@ -564,17 +574,13 @@ index 63ada5a46c..a25e0a84e9 100644
   else
     elt_type = TYPE_TARGET_TYPE (type);
 
-  return create_array_type_with_stride (type, elt_type, range_type,
-                                        TYPE_FIELD_BITSIZE (type, 0));
 +  if (TYPE_CODE (type) == TYPE_CODE_STRING)
 +    return create_string_type (type, elt_type, range_type);
-+  else
-+    return create_array_type_with_stride (type, elt_type, range_type,
-+					  TYPE_FIELD_BITSIZE (type, 0));
- }
- 
- /* Resolve dynamic bounds of members of the union TYPE to static
-@@ -2149,6 +2156,28 @@ resolve_dynamic_struct (struct type *type,
+
+   prop = get_dyn_prop (DYN_PROP_BYTE_STRIDE, type);
+   if (prop != NULL)
+     {
+@@ -2213,6 +2220,28 @@ resolve_dynamic_struct (struct type *type,
   return resolved_type;
 }
 
@ -603,7 +609,7 @@ index 63ada5a46c..a25e0a84e9 100644
 /* Worker for resolved_dynamic_type.  */
 
 static struct type *
-@@ -2197,7 +2226,12 @@ resolve_dynamic_type_internal (struct type *type,
+@@ -2261,7 +2290,12 @@ resolve_dynamic_type_internal (struct type *type,
 	    break;
 	  }
 
@ -617,7 +623,7 @@ index 63ada5a46c..a25e0a84e9 100644
 	  break;
 
 diff --git a/gdb/testsuite/gdb.cp/vla-cxx.cc b/gdb/testsuite/gdb.cp/vla-cxx.cc
-index 83bd24b190..15c683e89c 100644
+index 1b5b27bf3d..06198b41e0 100644
 --- a/gdb/testsuite/gdb.cp/vla-cxx.cc
 +++ b/gdb/testsuite/gdb.cp/vla-cxx.cc
@@ -15,6 +15,10 @@
@ -649,7 +655,7 @@ index 83bd24b190..15c683e89c 100644
   return vla[2];
 }
 diff --git a/gdb/testsuite/gdb.cp/vla-cxx.exp b/gdb/testsuite/gdb.cp/vla-cxx.exp
-index a8d811dcf2..04b4ae6e10 100644
+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] {
@ -1043,7 +1049,7 @@ index 0000000000..45b4968f6c
 +}
 +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 76f47708d8..eea93534d2 100644
+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]
@ -1238,7 +1244,7 @@ index 0000000000..3c22735fdb
 +  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 6728b48be7..87aac396a2 100755
+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" \
@ -1263,7 +1269,7 @@ index 6728b48be7..87aac396a2 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 60022c5f62..7f03b76cd1 100644
+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"]
@ -1285,7 +1291,7 @@ index 60022c5f62..7f03b76cd1 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 bee6ebe156..f6eb0469a9 100644
+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" \
@ -1315,10 +1321,10 @@ index bee6ebe156..f6eb0469a9 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 9d9d6f5a49..7dd978013a 100644
+index 9a125076a1..586f644c49 100644
 --- a/gdb/typeprint.c
 +++ b/gdb/typeprint.c
-@@ -513,6 +513,25 @@ whatis_exp (const char *exp, int show)
+@@ -534,6 +534,25 @@ whatis_exp (const char *exp, int show)
       printf_filtered (" */\n");    
     }
 
@ -1345,7 +1351,7 @@ index 9d9d6f5a49..7dd978013a 100644
   printf_filtered ("\n");
 
 diff --git a/gdb/valops.c b/gdb/valops.c
-index 4715912b94..4ecfa9fd96 100644
+index 4cd4fd96ae..9b25980090 100644
 --- a/gdb/valops.c
 +++ b/gdb/valops.c
@@ -1564,6 +1564,19 @@ value_ind (struct value *arg1)
@ -1379,7 +1385,7 @@ index 4715912b94..4ecfa9fd96 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 9b07221f1f..20e3a4178b 100644
+index b19123f23e..d01d02fc09 100644
 --- a/gdb/valprint.c
 +++ b/gdb/valprint.c
@@ -1111,12 +1111,6 @@ value_check_printable (struct value *val, struct ui_file *stream,
--- a/gdb-vla-intel-stringbt-fix.patch
+++ b/gdb-vla-intel-stringbt-fix.patch
@ -40,7 +40,7 @@ Jan
 create mode 100644 gdb/testsuite/gdb.fortran/dynamic-other-frame.f90

 diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
-index 1eb6182281..d1d8dcc4bf 100644
+index 5105c8d23a..5486e4dc12 100644
 --- a/gdb/dwarf2loc.c
 +++ b/gdb/dwarf2loc.c
@@ -42,6 +42,7 @@
--- a/gdb-x86_64-i386-syscall-restart.patch
+++ b/gdb-x86_64-i386-syscall-restart.patch
@ -91,7 +91,7 @@ gdb/
 1 file changed, 18 insertions(+), 2 deletions(-)

 diff --git a/gdb/amd64-nat.c b/gdb/amd64-nat.c
-index b046052954..e0b0762c7c 100644
+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,
--- a/gdb.spec
+++ b/gdb.spec
@ -18,15 +18,15 @@
 Name: %{?scl_prefix}gdb

 # Freeze it when GDB gets branched
-%global snapsrc    20171213
+%global snapsrc    20180109
 # See timestamp of source gnulib installed into gdb/gnulib/ .
 %global snapgnulib 20161115
 %global tarname gdb-%{version}
-Version: 8.0.50.%{snapsrc}
+Version: 8.0.90.%{snapsrc}

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

 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
 Group: Development/Debuggers
@ -1017,6 +1017,9 @@ then
 fi

 %changelog
+* Wed Jan 10 2018 Sergio Durigan Junior <sergiodj@redhat.com> - 8.0.90.20180109-1.fc26
+- Rebase to pre-FSF GDB 8.1 (8.1.90.20180109).
+
 * Sat Dec 16 2017 Sergio Durigan Junior <sergiodj@redhat.com> - 8.0.50.20171204-35.fc26
 - Rebase to FSF GDB 8.0.50.20171213 (8.1pre).