[packages/gdb] - updated to 8.0

baggins baggins at pld-linux.org
Wed Jun 7 00:50:14 CEST 2017


commit 140f805741d2bd11d6ac79fc01f702a0fcd419be
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Jun 7 00:41:40 2017 +0200

    - updated to 8.0

 gdb-6.6-buildid-locate-core-as-arg.patch           |   38 +-
 ...ding-warning-missing-debuginfo-rhbz981154.patch |   12 +-
 gdb-6.6-buildid-locate-rpm-scl.patch               |  121 ++
 gdb-6.6-buildid-locate-rpm.patch                   |  167 +-
 gdb-6.6-buildid-locate-solib-missing-ids.patch     |  163 ++
 gdb-6.6-buildid-locate.patch                       |  270 +--
 gdb-archer-vla-tests.patch                         | 1127 ++++++++++-
 gdb-vla-intel-04of23-fix.patch                     |   42 -
 gdb-vla-intel-fortran-strides.patch                | 1975 ++++++++++++++++++++
 gdb-vla-intel-fortran-vla-strings.patch            | 1488 +++++++++++++++
 gdb-vla-intel-logical-not.patch                    |   11 -
 gdb-vla-intel-stringbt-fix.patch                   |   61 +-
 gdb-vla-intel-tests.patch                          |  293 +++
 gdb-vla-intel.patch                                | 1480 ---------------
 gdb.spec                                           |   21 +-
 15 files changed, 5350 insertions(+), 1919 deletions(-)
---
diff --git a/gdb.spec b/gdb.spec
index a3b957b..89cad7f 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -20,12 +20,12 @@ Summary(zh_CN.UTF-8):	[开发]C和其他语言的调试器
 Summary(zh_TW.UTF-8):	[.-A開發]C和.$)B其.-A他語.$)B言的調試器
 %define		snap	20120926
 Name:		gdb
-Version:	7.11.1
-Release:	3
+Version:	8.0
+Release:	1
 License:	GPL v3+
 Group:		Development/Debuggers
 Source0:	http://ftp.gnu.org/gnu/gdb/%{name}-%{version}.tar.xz
-# Source0-md5:	5aa71522e488e358243917967db87476
+# Source0-md5:	c3d35cd949084be53b92cc1e03485f88
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	2e8a48939ae282c12bbacdd54e398247
 Source3:	%{name}-gstack.man
@@ -39,13 +39,14 @@ Patch102:	gdb-6.6-buildid-locate-rpm.patch
 Patch103:	gdb-6.6-buildid-locate-core-as-arg.patch
 Patch104:	gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 Patch105:	gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch106:	gdb-6.6-buildid-locate-rpm-scl.patch
 Patch110:	gdb-6.3-gstack-20050411.patch
 Patch111:	gdb-gdb-add-index-script.patch
 Patch112:	gdb-archer-vla-tests.patch
-Patch113:	gdb-vla-intel.patch
-Patch114:	gdb-vla-intel-04of23-fix.patch
-Patch115:	gdb-vla-intel-stringbt-fix.patch
-Patch116:	gdb-vla-intel-logical-not.patch
+Patch113:	gdb-vla-intel-fortran-strides.patch
+Patch114:	gdb-vla-intel-stringbt-fix.patch
+Patch115:	gdb-vla-intel-fortran-vla-strings.patch
+Patch116:	gdb-vla-intel-tests.patch
 Patch1000:	%{name}-readline.patch
 Patch1001:	%{name}-info.patch
 Patch1002:	%{name}-passflags.patch
@@ -57,7 +58,7 @@ BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	babeltrace-devel
 BuildRequires:	expat-devel
-BuildRequires:	flex
+BuildRequires:	flex >= 2.6.4
 BuildRequires:	gettext-tools
 %{?with_guile:BuildRequires:	guile-devel >= 2.0}
 BuildRequires:	libselinux-devel
@@ -176,9 +177,6 @@ GDB w postaci biblioteki statycznej.
 %prep
 %setup -q
 
-%patch0 -p1
-%patch1 -p1
-
 # Files have `# <number> <file>' statements breaking VPATH / find-debuginfo.sh .
 rm -f gdb/ada-exp.c gdb/ada-lex.c gdb/c-exp.c gdb/cp-name-parser.c gdb/f-exp.c
 rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
@@ -189,6 +187,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
 %patch103 -p1
 %patch104 -p1
 %patch105 -p1
+%patch106 -p1
 %patch110 -p1
 %patch111 -p1
 %patch112 -p1
diff --git a/gdb-6.6-buildid-locate-core-as-arg.patch b/gdb-6.6-buildid-locate-core-as-arg.patch
index 523b7e0..85d4fe5 100644
--- a/gdb-6.6-buildid-locate-core-as-arg.patch
+++ b/gdb-6.6-buildid-locate-core-as-arg.patch
@@ -58,10 +58,10 @@ Http://sourceware.org/ml/gdb-patches/2010-01/msg00517.html
 	* exec.c (exec_file_attach): Print a more useful error message if the
 	user did "gdb core".
 
-Index: gdb-7.9.50.20150531/gdb/exec.c
+Index: gdb-7.12.50.20170226/gdb/exec.c
 ===================================================================
---- gdb-7.9.50.20150531.orig/gdb/exec.c	2015-05-31 03:48:29.000000000 +0200
-+++ gdb-7.9.50.20150531/gdb/exec.c	2015-05-31 20:07:35.092878685 +0200
+--- gdb-7.12.50.20170226.orig/gdb/exec.c	2017-02-27 22:18:00.945026211 +0100
++++ gdb-7.12.50.20170226/gdb/exec.c	2017-02-27 22:18:08.111076350 +0100
 @@ -35,6 +35,7 @@
  #include "progspace.h"
  #include "gdb_bfd.h"
@@ -70,7 +70,7 @@ Index: gdb-7.9.50.20150531/gdb/exec.c
  
  #include <fcntl.h>
  #include "readline/readline.h"
-@@ -298,12 +299,27 @@ exec_file_attach (const char *filename,
+@@ -359,12 +360,27 @@
  
        if (!bfd_check_format_matches (exec_bfd, bfd_object, &matching))
  	{
@@ -101,13 +101,13 @@ Index: gdb-7.9.50.20150531/gdb/exec.c
  	}
  
        if (build_section_table (exec_bfd, &sections, &sections_end))
-Index: gdb-7.9.50.20150531/gdb/main.c
+Index: gdb-7.12.50.20170226/gdb/main.c
 ===================================================================
---- gdb-7.9.50.20150531.orig/gdb/main.c	2015-05-31 20:07:34.183872824 +0200
-+++ gdb-7.9.50.20150531/gdb/main.c	2015-05-31 20:10:05.095845935 +0200
-@@ -435,6 +435,37 @@ typedef struct cmdarg {
- /* Define type VEC (cmdarg_s).  */
- DEF_VEC_O (cmdarg_s);
+--- gdb-7.12.50.20170226.orig/gdb/main.c	2017-02-27 22:18:00.945026211 +0100
++++ gdb-7.12.50.20170226/gdb/main.c	2017-02-27 22:18:08.112076357 +0100
+@@ -459,6 +459,37 @@
+   char *string;
+ };
  
 +/* Call exec_file_attach.  If it detected FILENAME is a core file call
 +   core_file_command.  Print the original exec_file_attach error only if
@@ -140,10 +140,10 @@ Index: gdb-7.9.50.20150531/gdb/main.c
 +  END_CATCH
 +}
 +
- static int
- captured_main (void *data)
+ static void
+ captured_main_1 (struct captured_main_args *context, int &python_script)
  {
-@@ -923,6 +954,8 @@ captured_main (void *data)
+@@ -910,6 +941,8 @@
  	{
  	  symarg = argv[optind];
  	  execarg = argv[optind];
@@ -152,7 +152,7 @@ Index: gdb-7.9.50.20150531/gdb/main.c
  	  optind++;
  	}
  
-@@ -1080,11 +1113,25 @@ captured_main (void *data)
+@@ -1060,11 +1093,25 @@
        && symarg != NULL
        && strcmp (execarg, symarg) == 0)
      {
@@ -178,14 +178,14 @@ Index: gdb-7.9.50.20150531/gdb/main.c
 +	 as a core file.  */
 +      if (catch_command_errors_const (func, execarg, !batch_flag)
 +	  && core_bfd == NULL)
- 	catch_command_errors_const (symbol_file_add_main, symarg,
+ 	catch_command_errors_const (symbol_file_add_main_adapter, symarg,
  				    !batch_flag);
      }
-Index: gdb-7.9.50.20150531/gdb/common/common-exceptions.h
+Index: gdb-7.12.50.20170226/gdb/common/common-exceptions.h
 ===================================================================
---- gdb-7.9.50.20150531.orig/gdb/common/common-exceptions.h	2015-05-31 03:48:29.000000000 +0200
-+++ gdb-7.9.50.20150531/gdb/common/common-exceptions.h	2015-05-31 20:07:35.093878692 +0200
-@@ -105,6 +105,9 @@ enum errors {
+--- gdb-7.12.50.20170226.orig/gdb/common/common-exceptions.h	2017-02-27 22:18:00.946026218 +0100
++++ gdb-7.12.50.20170226/gdb/common/common-exceptions.h	2017-02-27 22:18:08.112076357 +0100
+@@ -106,6 +106,9 @@
       "_ERROR" is appended to the name.  */
    MAX_COMPLETIONS_REACHED_ERROR,
  
diff --git a/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch b/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
index 64fe1d0..32f2a83 100644
--- a/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+++ b/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
@@ -15,10 +15,10 @@ Comments by Sergio Durigan Junior <sergiodj at redhat.com>:
   NULL after it is free'd, otherwise the code below thinks that it is still
   valid and doesn't print the necessary warning ("Try: yum install ...").
 
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp	2016-02-15 23:31:06.327941085 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp	2017-02-26 19:14:58.492609659 +0100
 @@ -0,0 +1,97 @@
 +#   Copyright (C) 2014  Free Software Foundation, Inc.
 +
@@ -117,10 +117,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-ins
 +
 +# Leaving the link there will cause breakage in the next run.
 +remote_exec build "rm -f [standard_output_file ${build_id_without_debug}]"
-Index: gdb-7.10.90.20160211/gdb/build-id.c
+Index: gdb-7.12.50.20170207/gdb/build-id.c
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/build-id.c	2016-02-15 23:30:55.389863424 +0100
-+++ gdb-7.10.90.20160211/gdb/build-id.c	2016-02-15 23:30:55.778866186 +0100
+--- gdb-7.12.50.20170207.orig/gdb/build-id.c	2017-02-26 19:14:51.943562799 +0100
++++ gdb-7.12.50.20170207/gdb/build-id.c	2017-02-26 19:14:58.492609659 +0100
 @@ -589,7 +589,10 @@
  	  do_cleanups (inner);
  
@@ -131,5 +131,5 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 +	      continue;
 +	    }
  
- 	  if (build_id_verify (abfd, build_id_len, build_id))
+ 	  if (build_id_verify (abfd.get(), build_id_len, build_id))
  	    break;
diff --git a/gdb-6.6-buildid-locate-rpm-scl.patch b/gdb-6.6-buildid-locate-rpm-scl.patch
new file mode 100644
index 0000000..f2f605d
--- /dev/null
+++ b/gdb-6.6-buildid-locate-rpm-scl.patch
@@ -0,0 +1,121 @@
+warning: Skipping deprecated .gdb_index section
+https://bugzilla.redhat.com/show_bug.cgi?id=953585
+
+diff -dup -rup gdb-7.10.50.20160106-orig/gdb/build-id.c gdb-7.10.50.20160106/gdb/build-id.c
+--- gdb-7.10.50.20160106-orig/gdb/build-id.c	2016-01-09 14:40:39.420385241 +0100
++++ gdb-7.10.50.20160106/gdb/build-id.c	2016-01-09 14:41:05.944549393 +0100
+@@ -713,7 +713,11 @@ static int missing_rpm_list_entries;
+ /* Returns the count of newly added rpms.  */
+ 
+ static int
++#ifndef GDB_INDEX_VERIFY_VENDOR
+ missing_rpm_enlist (const char *filename)
++#else
++missing_rpm_enlist_1 (const char *filename, int verify_vendor)
++#endif
+ {
+   static int rpm_init_done = 0;
+   rpmts ts;
+@@ -817,7 +821,11 @@ missing_rpm_enlist (const char *filename
+   mi = rpmtsInitIterator_p (ts, RPMTAG_BASENAMES, filename, 0);
+   if (mi != NULL)
+     {
++#ifndef GDB_INDEX_VERIFY_VENDOR
+       for (;;)
++#else
++      if (!verify_vendor) for (;;)
++#endif
+ 	{
+ 	  Header h;
+ 	  char *debuginfo, **slot, *s, *s2;
+@@ -935,6 +943,37 @@ missing_rpm_enlist (const char *filename
+ 	    xfree (debuginfo);
+ 	  count++;
+ 	}
++#ifdef GDB_INDEX_VERIFY_VENDOR
++      else /* verify_vendor */
++	{
++	  int vendor_pass = 0, vendor_fail = 0;
++
++	  for (;;)
++	    {
++	      Header h;
++	      errmsg_t err;
++	      char *vendor;
++
++	      h = rpmdbNextIterator_p (mi);
++	      if (h == NULL)
++		break;
++
++	      vendor = headerFormat_p (h, "%{vendor}", &err);
++	      if (!vendor)
++		{
++		  warning (_("Error querying the rpm file `%s': %s"), filename,
++			   err);
++		  continue;
++		}
++	      if (strcmp (vendor, "Red Hat, Inc.") == 0)
++		vendor_pass = 1;
++	      else
++		vendor_fail = 1;
++	      xfree (vendor);
++	    }
++	  count = vendor_pass != 0 && vendor_fail == 0;
++	}
++#endif
+ 
+       rpmdbFreeIterator_p (mi);
+     }
+@@ -945,6 +984,21 @@ missing_rpm_enlist (const char *filename
+ }
+ 
+ static int
++#ifdef GDB_INDEX_VERIFY_VENDOR
++missing_rpm_enlist (const char *filename)
++{
++  return missing_rpm_enlist_1 (filename, 0);
++}
++
++extern int rpm_verify_vendor (const char *filename);
++int
++rpm_verify_vendor (const char *filename)
++{
++  return missing_rpm_enlist_1 (filename, 1);
++}
++
++static int
++#endif
+ missing_rpm_list_compar (const char *const *ap, const char *const *bp)
+ {
+   return strcoll (*ap, *bp);
+diff -dup -rup gdb-7.10.50.20160106-orig/gdb/dwarf2read.c gdb-7.10.50.20160106/gdb/dwarf2read.c
+--- gdb-7.10.50.20160106-orig/gdb/dwarf2read.c	2016-01-09 14:40:39.416385216 +0100
++++ gdb-7.10.50.20160106/gdb/dwarf2read.c	2016-01-09 14:41:05.942549381 +0100
+@@ -3111,6 +3111,16 @@ read_index_from_section (struct objfile
+      "set use-deprecated-index-sections on".  */
+   if (version < 6 && !deprecated_ok)
+     {
++#ifdef GDB_INDEX_VERIFY_VENDOR
++      extern int rpm_verify_vendor (const char *filename);
++
++      /* Red Hat Developer Toolset exception.  */
++      if (rpm_verify_vendor (filename))
++	{}
++      else
++      {
++
++#endif
+       static int warning_printed = 0;
+       if (!warning_printed)
+ 	{
+@@ -3122,6 +3132,10 @@ to use the section anyway."),
+ 	  warning_printed = 1;
+ 	}
+       return 0;
++#ifdef GDB_INDEX_VERIFY_VENDOR
++
++      }
++#endif
+     }
+   /* Version 7 indices generated by gold refer to the CU for a symbol instead
+      of the TU (for symbols coming from TUs),
diff --git a/gdb-6.6-buildid-locate-rpm.patch b/gdb-6.6-buildid-locate-rpm.patch
index 5efcc5a..56ce7db 100644
--- a/gdb-6.6-buildid-locate-rpm.patch
+++ b/gdb-6.6-buildid-locate-rpm.patch
@@ -1,25 +1,16 @@
-Index: gdb-7.10.50.20160106/gdb/event-top.c
+Index: gdb-7.11.50.20160630/gdb/event-top.c
 ===================================================================
---- gdb-7.10.50.20160106.orig/gdb/event-top.c
-+++ gdb-7.10.50.20160106/gdb/event-top.c
-@@ -37,6 +37,7 @@
- #include "gdbcmd.h"		/* for dont_repeat() */
- #include "annotate.h"
- #include "maint.h"
+--- gdb-7.11.50.20160630.orig/gdb/event-top.c	2016-07-02 23:43:24.085214144 +0200
++++ gdb-7.11.50.20160630/gdb/event-top.c	2016-07-03 14:37:12.572130734 +0200
+@@ -40,6 +40,7 @@
+ #include "buffer.h"
+ #include "ser-event.h"
+ #include "gdb_select.h"
 +#include "symfile.h"
  
  /* readline include files.  */
  #include "readline/readline.h"
-@@ -180,6 +181,8 @@ rl_callback_read_char_wrapper (gdb_clien
- void
- cli_command_loop (void *data)
- {
-+  debug_flush_missing ();
-+
-   display_gdb_prompt (0);
- 
-   /* Now it's time to start the event loop.  */
-@@ -298,6 +301,8 @@ display_gdb_prompt (const char *new_prom
+@@ -347,6 +348,8 @@
    /* Reset the nesting depth used when trace-commands is set.  */
    reset_command_nest_depth ();
  
@@ -28,11 +19,23 @@ Index: gdb-7.10.50.20160106/gdb/event-top.c
    old_chain = make_cleanup (free_current_contents, &actual_gdb_prompt);
  
    /* Do not call the python hook on an explicit prompt change as
-Index: gdb-7.10.50.20160106/gdb/symfile.h
+@@ -794,7 +797,10 @@
+       command_handler (cmd);
+ 
+       if (ui->prompt_state != PROMPTED)
+-	display_gdb_prompt (0);
++	{
++	  debug_flush_missing ();
++	  display_gdb_prompt (0);
++	}
+     }
+ }
+ 
+Index: gdb-7.11.50.20160630/gdb/symfile.h
 ===================================================================
---- gdb-7.10.50.20160106.orig/gdb/symfile.h
-+++ gdb-7.10.50.20160106/gdb/symfile.h
-@@ -587,6 +587,8 @@ void map_symbol_filenames (symbol_filena
+--- gdb-7.11.50.20160630.orig/gdb/symfile.h	2016-07-03 14:34:32.032753668 +0200
++++ gdb-7.11.50.20160630/gdb/symfile.h	2016-07-03 14:37:12.573130742 +0200
+@@ -592,6 +592,8 @@
  /* build-id support.  */
  extern struct bfd_build_id *build_id_addr_get (CORE_ADDR addr);
  extern void debug_print_missing (const char *binary, const char *debug);
@@ -41,48 +44,10 @@ Index: gdb-7.10.50.20160106/gdb/symfile.h
  
  /* From dwarf2read.c */
  
-Index: gdb-7.10.50.20160106/gdb/testsuite/lib/gdb.exp
-===================================================================
---- gdb-7.10.50.20160106.orig/gdb/testsuite/lib/gdb.exp
-+++ gdb-7.10.50.20160106/gdb/testsuite/lib/gdb.exp
-@@ -1642,7 +1642,7 @@ proc default_gdb_start { } {
- 	    warning "Couldn't set the width to 0."
- 	}
-     }
--    # Turn off the missing warnings as the testsuite does not expect it.
-+    # Turn off the missing RPMs warnings as the testsuite does not expect it.
-     send_gdb "set build-id-verbose 0\n"
-     gdb_expect 10 {
- 	-re "$gdb_prompt $" {
-Index: gdb-7.10.50.20160106/gdb/testsuite/lib/mi-support.exp
-===================================================================
---- gdb-7.10.50.20160106.orig/gdb/testsuite/lib/mi-support.exp
-+++ gdb-7.10.50.20160106/gdb/testsuite/lib/mi-support.exp
-@@ -204,7 +204,7 @@ proc default_mi_gdb_start { args } {
- 	    warning "Couldn't set the width to 0."
- 	}
-     }
--    # Turn off the missing warnings as the testsuite does not expect it.
-+    # Turn off the missing RPMs warnings as the testsuite does not expect it.
-     send_gdb "190-gdb-set build-id-verbose 0\n"
-     gdb_expect 10 {
- 	-re ".*190-gdb-set build-id-verbose 0\r\n190\\\^done\r\n$mi_gdb_prompt$" {
-Index: gdb-7.10.50.20160106/gdb/tui/tui-interp.c
-===================================================================
---- gdb-7.10.50.20160106.orig/gdb/tui/tui-interp.c
-+++ gdb-7.10.50.20160106/gdb/tui/tui-interp.c
-@@ -31,6 +31,7 @@
- #include "tui/tui-io.h"
- #include "infrun.h"
- #include "observer.h"
-+#include "symfile.h"
- 
- static struct ui_out *tui_ui_out (struct interp *self);
- 
-Index: gdb-7.10.50.20160106/gdb/aclocal.m4
+Index: gdb-7.11.50.20160630/gdb/aclocal.m4
 ===================================================================
---- gdb-7.10.50.20160106.orig/gdb/aclocal.m4
-+++ gdb-7.10.50.20160106/gdb/aclocal.m4
+--- gdb-7.11.50.20160630.orig/gdb/aclocal.m4	2016-07-02 23:43:24.085214144 +0200
++++ gdb-7.11.50.20160630/gdb/aclocal.m4	2016-07-03 14:37:12.576130768 +0200
 @@ -11,6 +11,221 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
@@ -305,10 +270,10 @@ Index: gdb-7.10.50.20160106/gdb/aclocal.m4
  # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
  
  # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-Index: gdb-7.10.50.20160106/gdb/config.in
+Index: gdb-7.11.50.20160630/gdb/config.in
 ===================================================================
---- gdb-7.10.50.20160106.orig/gdb/config.in
-+++ gdb-7.10.50.20160106/gdb/config.in
+--- gdb-7.11.50.20160630.orig/gdb/config.in	2016-07-02 23:43:24.085214144 +0200
++++ gdb-7.11.50.20160630/gdb/config.in	2016-07-03 14:37:12.576130768 +0200
 @@ -33,6 +33,9 @@
  /* Define to BFD's default target vector. */
  #undef DEFAULT_BFD_VEC
@@ -319,7 +284,7 @@ Index: gdb-7.10.50.20160106/gdb/config.in
  /* Define to 1 if translation of program messages to the user's native
     language is requested. */
  #undef ENABLE_NLS
-@@ -258,6 +261,9 @@
+@@ -261,6 +264,9 @@
  /* Define if Python 2.7 is being used. */
  #undef HAVE_LIBPYTHON2_7
  
@@ -329,11 +294,11 @@ Index: gdb-7.10.50.20160106/gdb/config.in
  /* Define to 1 if you have the <libunwind-ia64.h> header file. */
  #undef HAVE_LIBUNWIND_IA64_H
  
-Index: gdb-7.10.50.20160106/gdb/configure
+Index: gdb-7.11.50.20160630/gdb/configure
 ===================================================================
---- gdb-7.10.50.20160106.orig/gdb/configure
-+++ gdb-7.10.50.20160106/gdb/configure
-@@ -705,6 +705,11 @@ PKGVERSION
+--- gdb-7.11.50.20160630.orig/gdb/configure	2016-07-02 23:43:24.085214144 +0200
++++ gdb-7.11.50.20160630/gdb/configure	2016-07-03 14:37:12.581130811 +0200
+@@ -705,6 +705,11 @@
  HAVE_NATIVE_GCORE_TARGET
  TARGET_OBS
  subdirs
@@ -345,7 +310,7 @@ Index: gdb-7.10.50.20160106/gdb/configure
  GDB_DATADIR
  DEBUGDIR
  MAKEINFO_EXTRA_FLAGS
-@@ -813,6 +818,7 @@ with_gdb_datadir
+@@ -814,6 +819,7 @@
  with_relocated_sources
  with_auto_load_dir
  with_auto_load_safe_path
@@ -353,7 +318,7 @@ Index: gdb-7.10.50.20160106/gdb/configure
  enable_targets
  enable_64_bit_bfd
  enable_gdbcli
-@@ -869,6 +875,11 @@ CCC
+@@ -870,6 +876,11 @@
  CPP
  MAKEINFO
  MAKEINFOFLAGS
@@ -365,7 +330,7 @@ Index: gdb-7.10.50.20160106/gdb/configure
  YACC
  YFLAGS
  XMKMF'
-@@ -1540,6 +1551,8 @@ Optional Packages:
+@@ -1541,6 +1552,8 @@
                            [--with-auto-load-dir]
    --without-auto-load-safe-path
                            do not restrict auto-loaded files locations
@@ -374,7 +339,7 @@ Index: gdb-7.10.50.20160106/gdb/configure
    --with-libunwind-ia64   use libunwind frame unwinding for ia64 targets
    --with-curses           use the curses library instead of the termcap
                            library
-@@ -1595,6 +1608,13 @@ Some influential environment variables:
+@@ -1595,6 +1608,13 @@
    MAKEINFO    Parent configure detects if it is of sufficient version.
    MAKEINFOFLAGS
                Parameters for MAKEINFO.
@@ -388,7 +353,7 @@ Index: gdb-7.10.50.20160106/gdb/configure
    YACC        The `Yet Another C Compiler' implementation to use. Defaults to
                the first program found out of: `bison -y', `byacc', `yacc'.
    YFLAGS      The list of arguments that will be passed by default to $YACC.
-@@ -5655,6 +5675,494 @@ _ACEOF
+@@ -5613,6 +5633,494 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_auto_load_safe_path" >&5
  $as_echo "$with_auto_load_safe_path" >&6; }
  
@@ -883,11 +848,11 @@ Index: gdb-7.10.50.20160106/gdb/configure
  
  
  subdirs="$subdirs testsuite"
-Index: gdb-7.10.50.20160106/gdb/configure.ac
+Index: gdb-7.11.50.20160630/gdb/configure.ac
 ===================================================================
---- gdb-7.10.50.20160106.orig/gdb/configure.ac
-+++ gdb-7.10.50.20160106/gdb/configure.ac
-@@ -177,6 +177,199 @@ AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escap
+--- gdb-7.11.50.20160630.orig/gdb/configure.ac	2016-07-02 23:43:24.085214144 +0200
++++ gdb-7.11.50.20160630/gdb/configure.ac	2016-07-03 14:37:12.582130819 +0200
+@@ -177,6 +177,199 @@
  	      [Directories safe to hold auto-loaded files.])
  AC_MSG_RESULT([$with_auto_load_safe_path])
  
@@ -1087,11 +1052,11 @@ Index: gdb-7.10.50.20160106/gdb/configure.ac
  AC_CONFIG_SUBDIRS(testsuite)
  
  # Check whether to support alternative target configurations
-Index: gdb-7.10.50.20160106/gdb/corelow.c
+Index: gdb-7.11.50.20160630/gdb/corelow.c
 ===================================================================
---- gdb-7.10.50.20160106.orig/gdb/corelow.c
-+++ gdb-7.10.50.20160106/gdb/corelow.c
-@@ -310,7 +310,7 @@ build_id_locate_exec (int from_tty)
+--- gdb-7.11.50.20160630.orig/gdb/corelow.c	2016-07-03 14:34:32.022753582 +0200
++++ gdb-7.11.50.20160630/gdb/corelow.c	2016-07-03 14:37:12.582130819 +0200
+@@ -310,7 +310,7 @@
          symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
      }
    else
@@ -1100,10 +1065,10 @@ Index: gdb-7.10.50.20160106/gdb/corelow.c
  
    do_cleanups (back_to);
  
-Index: gdb-7.10.50.20160106/gdb/build-id.c
+Index: gdb-7.11.50.20160630/gdb/build-id.c
 ===================================================================
---- gdb-7.10.50.20160106.orig/gdb/build-id.c
-+++ gdb-7.10.50.20160106/gdb/build-id.c
+--- gdb-7.11.50.20160630.orig/gdb/build-id.c	2016-07-03 14:36:50.124938187 +0200
++++ gdb-7.11.50.20160630/gdb/build-id.c	2016-07-03 14:42:25.171812134 +0200
 @@ -35,6 +35,7 @@
  #include "elf/common.h"
  #include "elf-bfd.h"
@@ -1112,7 +1077,7 @@ Index: gdb-7.10.50.20160106/gdb/build-id.c
  
  #define BUILD_ID_VERBOSE_NONE 0
  #define BUILD_ID_VERBOSE_FILENAMES 1
-@@ -665,8 +666,366 @@ build_id_to_filename (const struct bfd_b
+@@ -665,8 +666,366 @@
    return result;
  }
  
@@ -1221,13 +1186,13 @@ Index: gdb-7.10.50.20160106/gdb/build-id.c
 +	    return 0;
 +	  }
 +
-+	if (!((headerFormat_p = dlsym (h, "headerFormat"))
-+	      && (rpmReadConfigFiles_p = dlsym (h, "rpmReadConfigFiles"))
-+	      && (rpmdbFreeIterator_p = dlsym (h, "rpmdbFreeIterator"))
-+	      && (rpmdbNextIterator_p = dlsym (h, "rpmdbNextIterator"))
-+	      && (rpmtsCreate_p = dlsym (h, "rpmtsCreate"))
-+	      && (rpmtsFree_p = dlsym (h, "rpmtsFree"))
-+	      && (rpmtsInitIterator_p = dlsym (h, "rpmtsInitIterator"))))
++	if (!((headerFormat_p = (char *(*) (Header h, const char * fmt, errmsg_t *errmsg)) dlsym (h, "headerFormat"))
++	      && (rpmReadConfigFiles_p = (int (*) (const char * file, const char * target)) dlsym (h, "rpmReadConfigFiles"))
++	      && (rpmdbFreeIterator_p = (rpmdbMatchIterator (*) (rpmdbMatchIterator mi)) dlsym (h, "rpmdbFreeIterator"))
++	      && (rpmdbNextIterator_p = (Header (*) (rpmdbMatchIterator mi)) dlsym (h, "rpmdbNextIterator"))
++	      && (rpmtsCreate_p = (rpmts (*) (void)) dlsym (h, "rpmtsCreate"))
++	      && (rpmtsFree_p = (rpmts (*) (rpmts ts)) dlsym (h, "rpmtsFree"))
++	      && (rpmtsInitIterator_p = (rpmdbMatchIterator (*) (const rpmts ts, rpmTag rpmtag, const void *keyp, size_t keylen)) dlsym (h, "rpmtsInitIterator"))))
 +	  {
 +	    warning (_("Opened library \"%s\" is incompatible (%s), "
 +		      "missing debuginfos notifications will not be displayed"),
@@ -1283,12 +1248,12 @@ Index: gdb-7.10.50.20160106/gdb/build-id.c
 +	  if (s > debuginfo && memcmp (s, ".src.rpm", srcrpmlen) == 0)
 +	    {
 +	      /* s2 = `-%{release}.src.rpm-debuginfo.%{arch}' */
-+	      s2 = memrchr (debuginfo, '-', s - debuginfo);
++	      s2 = (char *) memrchr (debuginfo, '-', s - debuginfo);
 +	    }
 +	  if (s2)
 +	    {
 +	      /* s2 = `-%{version}-%{release}.src.rpm-debuginfo.%{arch}' */
-+	      s2 = memrchr (debuginfo, '-', s2 - debuginfo);
++	      s2 = (char *) memrchr (debuginfo, '-', s2 - debuginfo);
 +	    }
 +	  if (!s2)
 +	    {
@@ -1311,7 +1276,7 @@ Index: gdb-7.10.50.20160106/gdb/build-id.c
 +
 +	  /* RPMDBI_PACKAGES requires keylen == sizeof (int).  */
 +	  /* RPMDBI_LABEL is an interface for NVR-based dbiFindByLabel().  */
-+	  mi_debuginfo = rpmtsInitIterator_p (ts, RPMDBI_LABEL, debuginfo, 0);
++	  mi_debuginfo = rpmtsInitIterator_p (ts, (rpmTag) RPMDBI_LABEL, debuginfo, 0);
 +	  xfree (debuginfo);
 +	  if (mi_debuginfo)
 +	    {
@@ -1362,7 +1327,7 @@ Index: gdb-7.10.50.20160106/gdb/build-id.c
 +
 +	      *slot = debuginfo;
 +
-+	      missing_rpm = xmalloc (sizeof (*missing_rpm) + strlen (debuginfo));
++	      missing_rpm = (struct missing_rpm *) xmalloc (sizeof (*missing_rpm) + strlen (debuginfo));
 +	      strcpy (missing_rpm->rpm, debuginfo);
 +	      missing_rpm->next = missing_rpm_list;
 +	      missing_rpm_list = missing_rpm;
@@ -1400,7 +1365,7 @@ Index: gdb-7.10.50.20160106/gdb/build-id.c
 +  if (missing_rpm_list_entries == 0)
 +    return;
 +
-+  array = xmalloc (sizeof (*array) * missing_rpm_list_entries);
++  array = (char **) xmalloc (sizeof (*array) * missing_rpm_list_entries);
 +  cleanups = make_cleanup (xfree, array);
 +
 +  array_iter = array;
@@ -1480,7 +1445,7 @@ Index: gdb-7.10.50.20160106/gdb/build-id.c
     avoidance.  */
  
  struct missing_filepair
-@@ -720,11 +1079,17 @@ missing_filepair_change (void)
+@@ -720,11 +1079,17 @@
        /* All their memory came just from missing_filepair_OBSTACK.  */
        missing_filepair_hash = NULL;
      }
@@ -1498,7 +1463,7 @@ Index: gdb-7.10.50.20160106/gdb/build-id.c
    missing_filepair_change ();
  }
  
-@@ -791,14 +1156,39 @@ debug_print_missing (const char *binary,
+@@ -791,14 +1156,39 @@
  
    *slot = missing_filepair;
  
diff --git a/gdb-6.6-buildid-locate-solib-missing-ids.patch b/gdb-6.6-buildid-locate-solib-missing-ids.patch
index a89893c..f4dccc9 100644
--- a/gdb-6.6-buildid-locate-solib-missing-ids.patch
+++ b/gdb-6.6-buildid-locate-solib-missing-ids.patch
@@ -1,3 +1,6 @@
+gdb returns an incorrect back trace when applying a debuginfo
+https://bugzilla.redhat.com/show_bug.cgi?id=1339862
+
 Index: gdb-7.9.90.20150709/gdb/solib-svr4.c
 ===================================================================
 --- gdb-7.9.90.20150709.orig/gdb/solib-svr4.c	2015-07-09 18:18:54.526417766 +0200
@@ -57,3 +60,163 @@ Index: gdb-7.9.90.20150709/gdb/solib-svr4.c
  
  	    xfree (build_id_filename);
  	    xfree (build_id);
+--- /dev/null	2016-07-02 20:29:01.679404943 +0200
++++ gdb-7.11.50.20160721/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp	2016-07-31 23:04:49.062753722 +0200
+@@ -0,0 +1,105 @@
++# Copyright 2016 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++if {[skip_shlib_tests]} {
++    return 0
++}
++
++set testfile "gcore-buildid-exec-but-not-solib"
++set srcmainfile ${testfile}-main.c
++set srclibfile ${testfile}-lib.c
++set libfile [standard_output_file ${testfile}-lib.so]
++set objfile [standard_output_file ${testfile}-main.o]
++set executable ${testfile}-main
++set binfile [standard_output_file ${executable}]
++set gcorefile [standard_output_file ${executable}.gcore]
++set outdir [file dirname $binfile]
++
++if { [gdb_compile_shlib ${srcdir}/${subdir}/${srclibfile} ${libfile} "debug additional_flags=-Wl,--build-id"] != ""
++     || [gdb_compile ${srcdir}/${subdir}/${srcmainfile} ${objfile} object {debug}] != "" } {
++     unsupported "-Wl,--build-id compilation failed"
++     return -1
++}
++set opts [list debug shlib=${libfile} "additional_flags=-Wl,--build-id"]
++if { [gdb_compile ${objfile} ${binfile} executable $opts] != "" } {
++     unsupported "-Wl,--build-id compilation failed"
++     return -1
++}
++
++clean_restart $executable
++gdb_load_shlib $libfile
++
++# Does this gdb support gcore?
++set test "help gcore"
++gdb_test_multiple $test $test {
++    -re "Undefined command: .gcore.*\r\n$gdb_prompt $" {
++	# gcore command not supported -- nothing to test here.
++	unsupported "gdb does not support gcore on this target"
++	return -1;
++    }
++    -re "Save a core file .*\r\n$gdb_prompt $" {
++	pass $test
++    }
++}
++
++if { ![runto lib] } then {
++    return -1
++}
++
++set escapedfilename [string_to_regexp ${gcorefile}]
++
++set test "save a corefile"
++gdb_test_multiple "gcore ${gcorefile}" $test {
++    -re "Saved corefile ${escapedfilename}\r\n$gdb_prompt $" {
++	pass $test
++    }
++    -re "Can't create a corefile\r\n$gdb_prompt $" {
++	unsupported $test
++	return -1
++    }
++}
++
++# Now restart gdb and load the corefile.
++
++clean_restart $executable
++gdb_load_shlib $libfile
++
++set buildid [build_id_debug_filename_get $libfile]
++
++regsub {\.debug$} $buildid {} buildid
++
++set debugdir [standard_output_file ${testfile}-debugdir]
++file delete -force -- $debugdir
++
++file mkdir $debugdir/[file dirname $libfile]
++file copy $libfile $debugdir/${libfile}
++
++file mkdir $debugdir/[file dirname $buildid]
++file copy $libfile $debugdir/${buildid}
++
++remote_exec build "ln -s /lib       ${debugdir}/"
++remote_exec build "ln -s /lib64     ${debugdir}/"
++# /usr is not needed, all the libs are in /lib64: libm.so.6 libc.so.6 ld-linux-x86-64.so.2
++
++gdb_test "set solib-absolute-prefix $debugdir"
++
++gdb_test_no_output "set debug-file-directory $debugdir" "set debug-file-directory"
++
++gdb_test "core ${gcorefile}" "Core was generated by .*" "re-load generated corefile"
++
++gdb_test "frame" "#0 \[^\r\n\]* lib .*" "library got loaded"
++
++gdb_test "bt"
++gdb_test "info shared"
+--- /dev/null	2016-07-02 20:29:01.679404943 +0200
++++ gdb-7.11.50.20160721/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-main.c	2016-07-28 21:06:40.977786922 +0200
+@@ -0,0 +1,25 @@
++/* Copyright 2010 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++extern void lib (void);
++
++int
++main (void)
++{
++  lib ();
++  return 0;
++}
+--- /dev/null	2016-07-02 20:29:01.679404943 +0200
++++ gdb-7.11.50.20160721/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-lib.c	2016-07-28 21:06:40.977786922 +0200
+@@ -0,0 +1,21 @@
++/* Copyright 2010 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++void
++lib (void)
++{
++}
diff --git a/gdb-6.6-buildid-locate.patch b/gdb-6.6-buildid-locate.patch
index b25ad8e..3ab89cf 100644
--- a/gdb-6.6-buildid-locate.patch
+++ b/gdb-6.6-buildid-locate.patch
@@ -1,7 +1,7 @@
-Index: gdb-7.10.90.20160211/gdb/corelow.c
+Index: gdb-7.99.90.20170420/gdb/corelow.c
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/corelow.c	2016-02-15 23:25:00.859346221 +0100
-+++ gdb-7.10.90.20160211/gdb/corelow.c	2016-02-15 23:26:46.516096395 +0100
+--- gdb-7.99.90.20170420.orig/gdb/corelow.c	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/corelow.c	2017-04-20 23:00:43.358629183 +0200
 @@ -45,6 +45,10 @@
  #include "gdb_bfd.h"
  #include "completer.h"
@@ -13,7 +13,7 @@ Index: gdb-7.10.90.20160211/gdb/corelow.c
  
  #ifndef O_LARGEFILE
  #define O_LARGEFILE 0
-@@ -266,6 +270,53 @@
+@@ -266,6 +270,54 @@
      inferior_ptid = ptid;			/* Yes, make it current.  */
  }
  
@@ -52,7 +52,8 @@ Index: gdb-7.10.90.20160211/gdb/corelow.c
 +    {
 +      make_cleanup (xfree, execfilename);
 +      exec_file_attach (execfilename, from_tty);
-+      symbol_file_add_main (execfilename, from_tty);
++      symbol_file_add_main (execfilename,
++			    symfile_add_flag (!from_tty ? 0 : SYMFILE_VERBOSE));
 +      if (symfile_objfile != NULL)
 +        symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
 +    }
@@ -67,7 +68,7 @@ Index: gdb-7.10.90.20160211/gdb/corelow.c
  /* This routine opens and sets up the core file bfd.  */
  
  static void
-@@ -404,6 +455,14 @@
+@@ -402,6 +454,14 @@
  	switch_to_thread (thread->ptid);
      }
  
@@ -82,7 +83,7 @@ Index: gdb-7.10.90.20160211/gdb/corelow.c
    post_create_inferior (&core_ops, from_tty);
  
    /* Now go through the target stack looking for threads since there
-@@ -1068,4 +1127,11 @@
+@@ -1079,4 +1139,11 @@
    init_core_ops ();
  
    add_target_with_completer (&core_ops, filename_completer);
@@ -94,11 +95,11 @@ Index: gdb-7.10.90.20160211/gdb/corelow.c
 +			   NULL, NULL, NULL,
 +			   &setlist, &showlist);
  }
-Index: gdb-7.10.90.20160211/gdb/doc/gdb.texinfo
+Index: gdb-7.99.90.20170420/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/doc/gdb.texinfo	2016-02-15 23:25:36.455598958 +0100
-+++ gdb-7.10.90.20160211/gdb/doc/gdb.texinfo	2016-02-15 23:26:06.362811302 +0100
-@@ -18684,6 +18684,27 @@
+--- gdb-7.99.90.20170420.orig/gdb/doc/gdb.texinfo	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/doc/gdb.texinfo	2017-04-20 23:00:43.366629228 +0200
+@@ -18987,6 +18987,27 @@
  
  @end table
  
@@ -126,10 +127,10 @@ Index: gdb-7.10.90.20160211/gdb/doc/gdb.texinfo
  @cindex @code{.gnu_debuglink} sections
  @cindex debug link sections
  A debug link is a special section of the executable file named
-Index: gdb-7.10.90.20160211/gdb/solib-svr4.c
+Index: gdb-7.99.90.20170420/gdb/solib-svr4.c
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/solib-svr4.c	2016-02-15 23:25:00.859346221 +0100
-+++ gdb-7.10.90.20160211/gdb/solib-svr4.c	2016-02-15 23:26:46.613097083 +0100
+--- gdb-7.99.90.20170420.orig/gdb/solib-svr4.c	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/solib-svr4.c	2017-04-20 23:00:43.367629234 +0200
 @@ -45,6 +45,7 @@
  #include "auxv.h"
  #include "gdb_bfd.h"
@@ -138,7 +139,7 @@ Index: gdb-7.10.90.20160211/gdb/solib-svr4.c
  
  static struct link_map_offsets *svr4_fetch_link_map_offsets (void);
  static int svr4_have_link_map_offsets (void);
-@@ -1416,9 +1417,52 @@
+@@ -1420,9 +1421,52 @@
  	  continue;
  	}
  
@@ -194,41 +195,37 @@ Index: gdb-7.10.90.20160211/gdb/solib-svr4.c
        xfree (buffer);
  
        /* If this entry has no name, or its name matches the name
-Index: gdb-7.10.90.20160211/gdb/elfread.c
+Index: gdb-7.99.90.20170420/gdb/elfread.c
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/elfread.c	2016-02-15 23:25:00.859346221 +0100
-+++ gdb-7.10.90.20160211/gdb/elfread.c	2016-02-15 23:26:06.364811316 +0100
-@@ -1259,9 +1259,10 @@
+--- gdb-7.99.90.20170420.orig/gdb/elfread.c	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/elfread.c	2017-04-20 23:00:43.367629234 +0200
+@@ -1265,8 +1265,9 @@
  	   && objfile->separate_debug_objfile == NULL
  	   && objfile->separate_debug_objfile_backlink == NULL)
      {
--      char *debugfile;
-+      char *debugfile, *build_id_filename;
- 
--      debugfile = find_separate_debug_file_by_buildid (objfile);
-+      debugfile = find_separate_debug_file_by_buildid (objfile,
-+						       &build_id_filename);
++      gdb::unique_xmalloc_ptr<char> build_id_filename;
+       gdb::unique_xmalloc_ptr<char> debugfile
+-	(find_separate_debug_file_by_buildid (objfile));
++	(find_separate_debug_file_by_buildid (objfile, &build_id_filename));
  
        if (debugfile == NULL)
- 	debugfile = find_separate_debug_file_by_debuglink (objfile);
-@@ -1275,6 +1276,12 @@
- 	  symbol_file_add_separate (abfd, debugfile, symfile_flags, objfile);
- 	  do_cleanups (cleanup);
+ 	debugfile.reset (find_separate_debug_file_by_debuglink (objfile));
+@@ -1278,6 +1279,10 @@
+ 	  symbol_file_add_separate (abfd.get (), debugfile.get (),
+ 				    symfile_flags, objfile);
  	}
 +      /* Check if any separate debug info has been extracted out.  */
 +      else if (bfd_get_section_by_name (objfile->obfd, ".gnu_debuglink")
 +	       != NULL)
-+	debug_print_missing (objfile_name (objfile), build_id_filename);
-+
-+      xfree (build_id_filename);
++	debug_print_missing (objfile_name (objfile), build_id_filename.get ());
      }
  }
  
-Index: gdb-7.10.90.20160211/gdb/symfile.h
+Index: gdb-7.99.90.20170420/gdb/symfile.h
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/symfile.h	2016-02-15 23:25:00.859346221 +0100
-+++ gdb-7.10.90.20160211/gdb/symfile.h	2016-02-15 23:26:46.516096395 +0100
-@@ -584,6 +584,10 @@
+--- gdb-7.99.90.20170420.orig/gdb/symfile.h	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/symfile.h	2017-04-20 23:00:43.368629240 +0200
+@@ -567,6 +567,10 @@
  void map_symbol_filenames (symbol_filename_ftype *fun, void *data,
  			   int need_fullname);
  
@@ -239,11 +236,11 @@ Index: gdb-7.10.90.20160211/gdb/symfile.h
  /* From dwarf2read.c */
  
  /* Names for a dwarf2 debugging section.  The field NORMAL is the normal
-Index: gdb-7.10.90.20160211/gdb/testsuite/lib/gdb.exp
+Index: gdb-7.99.90.20170420/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/testsuite/lib/gdb.exp	2016-02-15 23:25:00.859346221 +0100
-+++ gdb-7.10.90.20160211/gdb/testsuite/lib/gdb.exp	2016-02-15 23:26:46.516096395 +0100
-@@ -1640,6 +1640,16 @@
+--- gdb-7.99.90.20170420.orig/gdb/testsuite/lib/gdb.exp	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/testsuite/lib/gdb.exp	2017-04-20 23:00:43.369629245 +0200
+@@ -1646,6 +1646,16 @@
  	    warning "Couldn't set the width to 0."
  	}
      }
@@ -260,11 +257,11 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/lib/gdb.exp
      return 0
  }
  
-Index: gdb-7.10.90.20160211/gdb/testsuite/lib/mi-support.exp
+Index: gdb-7.99.90.20170420/gdb/testsuite/lib/mi-support.exp
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/testsuite/lib/mi-support.exp	2016-02-15 23:25:00.859346221 +0100
-+++ gdb-7.10.90.20160211/gdb/testsuite/lib/mi-support.exp	2016-02-15 23:26:46.516096395 +0100
-@@ -204,6 +204,16 @@
+--- gdb-7.99.90.20170420.orig/gdb/testsuite/lib/mi-support.exp	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/testsuite/lib/mi-support.exp	2017-04-20 23:00:43.369629245 +0200
+@@ -309,6 +309,16 @@
  	    warning "Couldn't set the width to 0."
  	}
      }
@@ -279,27 +276,39 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/lib/mi-support.exp
 +	}
 +    }
  
-     # Create the new PTY for the inferior process.
      if { $separate_inferior_pty } {
-Index: gdb-7.10.90.20160211/gdb/objfiles.h
+ 	mi_create_inferior_pty
+Index: gdb-7.99.90.20170420/gdb/testsuite/gdb.base/new-ui-pending-input.exp
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/objfiles.h	2016-02-15 23:25:00.859346221 +0100
-+++ gdb-7.10.90.20160211/gdb/objfiles.h	2016-02-15 23:26:06.366811330 +0100
-@@ -489,6 +489,10 @@
- 
- #define OBJF_NOT_FILENAME (1 << 6)
+--- gdb-7.99.90.20170420.orig/gdb/testsuite/gdb.base/new-ui-pending-input.exp	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/testsuite/gdb.base/new-ui-pending-input.exp	2017-04-20 23:00:43.369629245 +0200
+@@ -62,6 +62,7 @@
+     set options ""
+     append options " -iex \"set height 0\""
+     append options " -iex \"set width 0\""
++    append options " -iex \"set build-id-verbose 0\""
+     append options " -iex \"new-ui console $extra_tty_name\""
+     append options " -ex \"b $bpline\""
+     append options " -ex \"run\""
+Index: gdb-7.99.90.20170420/gdb/objfiles.h
+===================================================================
+--- gdb-7.99.90.20170420.orig/gdb/objfiles.h	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/objfiles.h	2017-04-20 23:00:43.370629251 +0200
+@@ -444,6 +444,10 @@
+   htab_t static_links;
+ };
  
 +/* This file was loaded according to the BUILD_ID_CORE_LOADS rules.  */
 +
-+#define OBJF_BUILD_ID_CORE_LOADED (1 << 12)
++#define OBJF_BUILD_ID_CORE_LOADED static_cast<enum objfile_flag>(1 << 12)
 +
  /* Declarations for functions defined in objfiles.c */
  
- extern struct objfile *allocate_objfile (bfd *, const char *name, int);
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/corefile.exp
+ extern struct objfile *allocate_objfile (bfd *, const char *name,
+Index: gdb-7.99.90.20170420/gdb/testsuite/gdb.base/corefile.exp
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/testsuite/gdb.base/corefile.exp	2016-02-15 23:25:00.859346221 +0100
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/corefile.exp	2016-02-15 23:26:55.178157896 +0100
+--- gdb-7.99.90.20170420.orig/gdb/testsuite/gdb.base/corefile.exp	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/testsuite/gdb.base/corefile.exp	2017-04-20 23:00:43.370629251 +0200
 @@ -293,3 +293,33 @@
  	pass $test
      }
@@ -334,10 +343,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/corefile.exp
 +    gdb_test "info files" "Local exec file:\r\n\[ \t\]*`[string_to_regexp $debugdir/$buildid]', file type .*"
 +    pass $wholetest
 +}
-Index: gdb-7.10.90.20160211/gdb/build-id.c
+Index: gdb-7.99.90.20170420/gdb/build-id.c
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/build-id.c	2016-02-15 23:25:00.859346221 +0100
-+++ gdb-7.10.90.20160211/gdb/build-id.c	2016-02-15 23:26:46.516096395 +0100
+--- gdb-7.99.90.20170420.orig/gdb/build-id.c	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/build-id.c	2017-04-20 23:03:00.060399474 +0200
 @@ -26,11 +26,67 @@
  #include "objfiles.h"
  #include "filenames.h"
@@ -385,10 +394,10 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 +	  && memcmp (xnp->name, "GNU", sizeof "GNU") == 0)
 +	{
 +	  size_t size = descsz;
-+	  gdb_byte *data = (void *) descdata;
++	  gdb_byte *data = (gdb_byte *) descdata;
 +	  struct bfd_build_id *retval;
 +
-+	  retval = xmalloc (sizeof *retval - 1 + size);
++	  retval = (struct bfd_build_id *) xmalloc (sizeof *retval - 1 + size);
 +	  retval->size = size;
 +	  memcpy (retval->data, data, size);
 +
@@ -429,7 +438,7 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 +	gdb_byte *buf;
 +	int err;
 +
-+	buf = xmalloc (hdr->p_filesz);
++	buf = (gdb_byte *) xmalloc (hdr->p_filesz);
 +	err = target_read_memory (loadbase + i_phdr[i].p_vaddr, buf,
 +				  hdr->p_filesz);
 +	if (err == 0)
@@ -633,8 +642,8 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 +  x_phdrs_size = (bfd_get_arch_size (templ) == 64 ? sizeof (Elf64_External_Phdr)
 +						: sizeof (Elf32_External_Phdr));
 +
-+  i_phdrs = xmalloc (i_ehdr.e_phnum * (sizeof *i_phdrs + x_phdrs_size));
-+  x_phdrs_ptr = (void *) &i_phdrs[i_ehdr.e_phnum];
++  i_phdrs = (Elf_Internal_Phdr *) xmalloc (i_ehdr.e_phnum * (sizeof *i_phdrs + x_phdrs_size));
++  x_phdrs_ptr = (gdb_byte *) &i_phdrs[i_ehdr.e_phnum];
 +  err = target_read_memory (ehdr_vma + i_ehdr.e_phoff, (bfd_byte *) x_phdrs_ptr,
 +			    i_ehdr.e_phnum * x_phdrs_size);
 +  if (err)
@@ -700,7 +709,7 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 +    {
 +      struct build_id_addr_sect *candidate;
 +
-+      candidate = xmalloc (sizeof *candidate);
++      candidate = (struct build_id_addr_sect *) xmalloc (sizeof *candidate);
 +      candidate->next = build_id_addr_sect;
 +      build_id_addr_sect = candidate;
 +      candidate->sect = sect;
@@ -765,7 +774,7 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
  
    if (found == NULL)
      warning (_("File \"%s\" has no build-id, file skipped"),
-@@ -65,23 +463,56 @@
+@@ -65,23 +463,54 @@
    return retval;
  }
  
@@ -787,17 +796,15 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 +    target = xstrdup (buf);
 +  else
 +    {
-+      char *dir = ldirname (symlink);
++      const std::string dir (ldirname (symlink));
 +
-+      if (dir == NULL)
-+	return xstrdup (symlink);
 +      target = xstrprintf ("%s"
 +#ifndef HAVE_DOS_BASED_FILE_SYSTEM
 +			   "/"
 +#else /* HAVE_DOS_BASED_FILE_SYSTEM */
 +			   "\\"
 +#endif /* HAVE_DOS_BASED_FILE_SYSTEM */
-+			   "%s", dir, buf);
++			   "%s", dir.c_str(), buf);
 +    }
 +
 +  retval = link_resolve (target, level + 1);
@@ -807,7 +814,7 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 +
  /* See build-id.h.  */
  
- bfd *
+ gdb_bfd_ref_ptr
 -build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
 +build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id,
 +		       char **link_return, int add_debug_suffix)
@@ -817,7 +824,7 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
    VEC (char_ptr) *debugdir_vec;
    struct cleanup *back_to;
    int ix;
-   bfd *abfd = NULL;
+   gdb_bfd_ref_ptr abfd;
 -  int alloc_len;
  
    /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
@@ -825,11 +832,11 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 -	       + (sizeof "/.build-id/" - 1) + 1
 -	       + 2 * build_id_len + (sizeof ".debug" - 1) + 1);
 -  link = (char *) alloca (alloc_len);
-+  link = xmalloc (strlen (debug_file_directory) + 2 * build_id_len + 50);
++  link = (char *) xmalloc (strlen (debug_file_directory) + 2 * build_id_len + 50);
  
    /* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
       cause "/.build-id/..." lookups.  */
-@@ -94,9 +525,12 @@
+@@ -94,9 +523,12 @@
        size_t debugdir_len = strlen (debugdir);
        const gdb_byte *data = build_id;
        size_t size = build_id_len;
@@ -843,7 +850,7 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
  
        memcpy (link, debugdir, debugdir_len);
        s = &link[debugdir_len];
-@@ -110,47 +544,281 @@
+@@ -110,45 +542,290 @@
  	*s++ = '/';
        while (size-- > 0)
  	s += sprintf (s, "%02x", (unsigned) *data++);
@@ -893,38 +900,36 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 +	  inner = make_cleanup (xfree, filename);
 +	  abfd = gdb_bfd_open (filename, gnutarget, -1);
 +	  do_cleanups (inner);
++
++	  if (abfd == NULL)
++	    continue;
  
 -      if (filename == NULL)
 -	continue;
-+	  if (abfd == NULL)
-+	    continue;
++	  if (build_id_verify (abfd.get(), build_id_len, build_id))
++	    break;
  
 -      /* We expect to be silent on the non-existing files.  */
 -      inner = make_cleanup (xfree, filename);
 -      abfd = gdb_bfd_open (filename, gnutarget, -1);
 -      do_cleanups (inner);
-+	  if (build_id_verify (abfd, build_id_len, build_id))
-+	    break;
++	  abfd.release ();
  
 -      if (abfd == NULL)
 -	continue;
-+	  gdb_bfd_unref (abfd);
-+	  abfd = NULL;
- 
--      if (build_id_verify (abfd, build_id_len, build_id))
--	break;
 +	  filename = NULL;
 +	}
  
--      gdb_bfd_unref (abfd);
--      abfd = NULL;
+-      if (build_id_verify (abfd.get(), build_id_len, build_id))
+-	break;
 +      if (filename != NULL)
 +	{
 +	  /* LINK_ALL is not used below in this non-NULL FILENAME case.  */
 +	  xfree (link0);
 +	  break;
 +	}
-+
+ 
+-      abfd.release ();
 +      /* If the symlink has target request to install the target.
 +         BASE-debuginfo.rpm contains the symlink but BASE.rpm may be missing.
 +         https://bugzilla.redhat.com/show_bug.cgi?id=981154  */
@@ -937,8 +942,8 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 +	{
 +	  size_t len_orig = strlen (link_all);
 +
-+	  link_all = xrealloc (link_all,
-+			       len_orig + 1 + strlen (link0_resolved) + 1);
++	  link_all = (char *) xrealloc (link_all,
++					len_orig + 1 + strlen (link0_resolved) + 1);
 +
 +	  /* Use whitespace instead of DIRNAME_SEPARATOR to be compatible with
 +	     its possible use as an argument for installation command.  */
@@ -972,7 +977,7 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 +char *
 +build_id_to_filename (const struct bfd_build_id *build_id, char **link_return)
 +{
-+  bfd *abfd;
++  gdb_bfd_ref_ptr abfd;
 +  char *result;
 +  
 +  abfd = build_id_to_debug_bfd (build_id->size, build_id->data, link_return, 0);
@@ -980,7 +985,7 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 +    return NULL;
 +
 +  result = xstrdup (bfd_get_filename (abfd));
-+  gdb_bfd_unref (abfd);
++  abfd.release ();
 +  return result;
 +}
 +
@@ -1095,9 +1100,9 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 +  if (*slot != NULL)
 +    return;
 +
-+  missing_filepair = obstack_alloc (&missing_filepair_obstack,
-+				      sizeof (*missing_filepair) - 1
-+				      + binary_len0 + debug_len0);
++  missing_filepair = (struct missing_filepair *) obstack_alloc (&missing_filepair_obstack,
++								sizeof (*missing_filepair) - 1
++								+ binary_len0 + debug_len0);
 +  missing_filepair->binary = missing_filepair->data;
 +  memcpy (missing_filepair->binary, binary, binary_len0);
 +  if (debug != NULL)
@@ -1125,7 +1130,7 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
  char *
 -find_separate_debug_file_by_buildid (struct objfile *objfile)
 +find_separate_debug_file_by_buildid (struct objfile *objfile,
-+				     char **build_id_filename_return)
++			gdb::unique_xmalloc_ptr<char> *build_id_filename_return)
  {
    const struct bfd_build_id *build_id;
  
@@ -1136,15 +1141,25 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 +  build_id = build_id_bfd_shdr_get (objfile->obfd);
    if (build_id != NULL)
      {
-       bfd *abfd;
- 
--      abfd = build_id_to_debug_bfd (build_id->size, build_id->data);
-+      abfd = build_id_to_debug_bfd (build_id->size, build_id->data,
-+				    build_id_filename_return, 1);
++      char *build_id_filename_cstr = NULL;
+       gdb_bfd_ref_ptr abfd (build_id_to_debug_bfd (build_id->size,
+-						   build_id->data));
++						    build_id->data,
++	      (!build_id_filename_return ? NULL : &build_id_filename_cstr), 1));
++      if (build_id_filename_return)
++	{
++	  if (!build_id_filename_cstr)
++	    gdb_assert (!*build_id_filename_return);
++	  else
++	    {
++	      *build_id_filename_return = gdb::unique_xmalloc_ptr<char> (build_id_filename_cstr);
++	      build_id_filename_cstr = NULL;
++	    }
++	}
        /* Prevent looping on a stripped .debug file.  */
        if (abfd != NULL
- 	  && filename_cmp (bfd_get_filename (abfd),
-@@ -170,3 +838,21 @@
+ 	  && filename_cmp (bfd_get_filename (abfd.get ()),
+@@ -160,3 +837,21 @@
      }
    return NULL;
  }
@@ -1166,13 +1181,13 @@ Index: gdb-7.10.90.20160211/gdb/build-id.c
 +
 +  observer_attach_executable_changed (debug_print_executable_changed);
 +}
-Index: gdb-7.10.90.20160211/gdb/build-id.h
+Index: gdb-7.99.90.20170420/gdb/build-id.h
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/build-id.h	2016-02-15 23:25:00.859346221 +0100
-+++ gdb-7.10.90.20160211/gdb/build-id.h	2016-02-15 23:26:06.368811345 +0100
-@@ -20,9 +20,10 @@
- #ifndef BUILD_ID_H
- #define BUILD_ID_H
+--- gdb-7.99.90.20170420.orig/gdb/build-id.h	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/build-id.h	2017-04-20 23:00:43.371629257 +0200
+@@ -22,9 +22,10 @@
+ 
+ #include "gdb_bfd.h"
  
 -/* Locate NT_GNU_BUILD_ID from ABFD and return its content.  */
 +/* Separate debuginfo files have corrupted PHDR but SHDR is correct there.
@@ -1183,13 +1198,14 @@ Index: gdb-7.10.90.20160211/gdb/build-id.h
  
  /* Return true if ABFD has NT_GNU_BUILD_ID matching the CHECK value.
     Otherwise, issue a warning and return false.  */
-@@ -36,13 +37,18 @@
+@@ -38,13 +39,19 @@
     the caller.  */
  
- extern bfd *build_id_to_debug_bfd (size_t build_id_len,
--				   const bfd_byte *build_id);
-+				   const bfd_byte *build_id, char **link_return,
-+				   int add_debug_suffix);
+ extern gdb_bfd_ref_ptr build_id_to_debug_bfd (size_t build_id_len,
+-					      const bfd_byte *build_id);
++					      const bfd_byte *build_id,
++					      char **link_return,
++					      int add_debug_suffix);
 +
 +extern char *build_id_to_filename (const struct bfd_build_id *build_id,
 +				   char **link_return);
@@ -1201,14 +1217,14 @@ Index: gdb-7.10.90.20160211/gdb/build-id.h
  
 -extern char *find_separate_debug_file_by_buildid (struct objfile *objfile);
 +extern char *find_separate_debug_file_by_buildid (struct objfile *objfile,
-+					       char **build_id_filename_return);
++		       gdb::unique_xmalloc_ptr<char> *build_id_filename_return);
  
  #endif /* BUILD_ID_H */
-Index: gdb-7.10.90.20160211/gdb/dwarf2read.c
+Index: gdb-7.99.90.20170420/gdb/dwarf2read.c
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/dwarf2read.c	2016-02-15 23:25:36.461599001 +0100
-+++ gdb-7.10.90.20160211/gdb/dwarf2read.c	2016-02-15 23:26:06.373811380 +0100
-@@ -2516,7 +2516,7 @@
+--- gdb-7.99.90.20170420.orig/gdb/dwarf2read.c	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/dwarf2read.c	2017-04-20 23:00:43.375629279 +0200
+@@ -2671,7 +2671,7 @@
      }
  
    if (dwz_bfd == NULL)
@@ -1217,11 +1233,11 @@ Index: gdb-7.10.90.20160211/gdb/dwarf2read.c
  
    if (dwz_bfd == NULL)
      error (_("could not find '.gnu_debugaltlink' file for %s"),
-Index: gdb-7.10.90.20160211/gdb/python/py-objfile.c
+Index: gdb-7.99.90.20170420/gdb/python/py-objfile.c
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/python/py-objfile.c	2016-02-15 23:25:00.859346221 +0100
-+++ gdb-7.10.90.20160211/gdb/python/py-objfile.c	2016-02-15 23:26:06.373811380 +0100
-@@ -139,7 +139,7 @@
+--- gdb-7.99.90.20170420.orig/gdb/python/py-objfile.c	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/python/py-objfile.c	2017-04-20 23:00:43.375629279 +0200
+@@ -137,7 +137,7 @@
  
    TRY
      {
@@ -1230,7 +1246,7 @@ Index: gdb-7.10.90.20160211/gdb/python/py-objfile.c
      }
    CATCH (except, RETURN_MASK_ALL)
      {
-@@ -548,7 +548,7 @@
+@@ -544,7 +544,7 @@
        /* Don't return separate debug files.  */
        if (objfile->separate_debug_objfile_backlink != NULL)
  	continue;
@@ -1239,11 +1255,11 @@ Index: gdb-7.10.90.20160211/gdb/python/py-objfile.c
        if (obfd_build_id == NULL)
  	continue;
        if (objfpy_build_id_matches (obfd_build_id, build_id))
-Index: gdb-7.10.90.20160211/gdb/coffread.c
+Index: gdb-7.99.90.20170420/gdb/coffread.c
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/coffread.c	2016-02-15 23:25:00.859346221 +0100
-+++ gdb-7.10.90.20160211/gdb/coffread.c	2016-02-15 23:26:06.374811387 +0100
-@@ -739,7 +739,7 @@
+--- gdb-7.99.90.20170420.orig/gdb/coffread.c	2017-04-20 23:00:35.415584426 +0200
++++ gdb-7.99.90.20170420/gdb/coffread.c	2017-04-20 23:00:43.376629285 +0200
+@@ -734,7 +734,7 @@
      {
        char *debugfile;
  
diff --git a/gdb-archer-vla-tests.patch b/gdb-archer-vla-tests.patch
index fa60380..6c8a3a6 100644
--- a/gdb-archer-vla-tests.patch
+++ b/gdb-archer-vla-tests.patch
@@ -1,7 +1,7 @@
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.ada/packed_array.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.ada/packed_array.exp
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/testsuite/gdb.ada/packed_array.exp	2016-02-15 23:33:29.830959972 +0100
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.ada/packed_array.exp	2016-02-15 23:35:56.289999846 +0100
+--- gdb-7.12.50.20170207.orig/gdb/testsuite/gdb.ada/packed_array.exp	2017-02-26 19:15:28.552824751 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.ada/packed_array.exp	2017-02-26 19:15:36.597882316 +0100
 @@ -56,5 +56,11 @@
          # are.  Observed with (FSF GNU Ada 4.5.3 20110124).
          xfail $test
@@ -14,10 +14,493 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.ada/packed_array.exp
 +    }
  }
  
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.arch/x86_64-vla-pointer-foo.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S	2016-02-15 23:35:56.290999853 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.arch/x86_64-vla-pointer-foo.S	2017-02-26 19:15:36.598882323 +0100
+@@ -0,0 +1,358 @@
++	.file	"x86_64-vla-pointer.c"
++	.text
++.Ltext0:
++	.globl	foo
++	.type	foo, @function
++foo:
++.LFB0:
++	.file 1 "gdb.arch/x86_64-vla-pointer.c"
++	# gdb.arch/x86_64-vla-pointer.c:22
++	.loc 1 22 0
++	.cfi_startproc
++# BLOCK 2 seq:0
++# PRED: ENTRY (FALLTHRU)
++	pushq	%rbp
++	.cfi_def_cfa_offset 16
++	.cfi_offset 6, -16
++	movq	%rsp, %rbp
++	.cfi_def_cfa_register 6
++	pushq	%rbx
++	subq	$56, %rsp
++	.cfi_offset 3, -24
++	movl	%edi, -52(%rbp)
++	# gdb.arch/x86_64-vla-pointer.c:22
++	.loc 1 22 0
++	movq	%rsp, %rax
++	movq	%rax, %rsi
++	# gdb.arch/x86_64-vla-pointer.c:23
++	.loc 1 23 0
++	movl	-52(%rbp), %eax
++	movslq	%eax, %rdx
++	subq	$1, %rdx
++	movq	%rdx, -32(%rbp)
++	movslq	%eax, %rdx
++	movq	%rdx, %r8
++	movl	$0, %r9d
++	# gdb.arch/x86_64-vla-pointer.c:24
++	.loc 1 24 0
++	movslq	%eax, %rdx
++	movq	%rdx, %rcx
++	movl	$0, %ebx
++	cltq
++	movl	$16, %edx
++	subq	$1, %rdx
++	addq	%rdx, %rax
++	movl	$16, %ebx
++	movl	$0, %edx
++	divq	%rbx
++	imulq	$16, %rax, %rax
++	subq	%rax, %rsp
++	movq	%rsp, %rax
++	addq	$0, %rax
++	movq	%rax, -40(%rbp)
++	# gdb.arch/x86_64-vla-pointer.c:27
++	.loc 1 27 0
++	movl	$0, -20(%rbp)
++# SUCC: 4 [100.0%] 
++	jmp	.L2
++# BLOCK 3 seq:1
++# PRED: 4
++.L3:
++	# gdb.arch/x86_64-vla-pointer.c:28
++	.loc 1 28 0 discriminator 3
++	movl	-20(%rbp), %eax
++	movl	%eax, %ecx
++	movq	-40(%rbp), %rdx
++	movl	-20(%rbp), %eax
++	cltq
++	movb	%cl, (%rdx,%rax)
++# SUCC: 4 (FALLTHRU,DFS_BACK)
++	# gdb.arch/x86_64-vla-pointer.c:27
++	.loc 1 27 0 discriminator 3
++	addl	$1, -20(%rbp)
++# BLOCK 4 seq:2
++# PRED: 3 (FALLTHRU,DFS_BACK) 2 [100.0%] 
++.L2:
++	# gdb.arch/x86_64-vla-pointer.c:27
++	.loc 1 27 0 is_stmt 0 discriminator 1
++	movl	-20(%rbp), %eax
++	cmpl	-52(%rbp), %eax
++# SUCC: 3 5 (FALLTHRU)
++	jl	.L3
++# BLOCK 5 seq:3
++# PRED: 4 (FALLTHRU)
++	# gdb.arch/x86_64-vla-pointer.c:30
++	.loc 1 30 0 is_stmt 1
++	movq	-40(%rbp), %rax
++	movb	$0, (%rax)
++	movq	%rsi, %rsp
++	# gdb.arch/x86_64-vla-pointer.c:31
++	.loc 1 31 0
++	nop
++	movq	-8(%rbp), %rbx
++	leave
++	.cfi_def_cfa 7, 8
++# SUCC: EXIT [100.0%] 
++	ret
++	.cfi_endproc
++.LFE0:
++	.size	foo, .-foo
++.Letext0:
++	.section	.debug_info,"", at progbits
++.Ldebug_info0:
++	.long	0xa5	# Length of Compilation Unit Info
++	.value	0x4	# DWARF version number
++	.long	.Ldebug_abbrev0	# Offset Into Abbrev. Section
++	.byte	0x8	# Pointer Size (in bytes)
++	.uleb128 0x1	# (DIE (0xb) DW_TAG_compile_unit)
++	.long	.LASF3	# DW_AT_producer: "GNU C11 6.2.1 20160916 (Red Hat 6.2.1-2) -mtune=generic -march=x86-64 -g"
++	.byte	0xc	# DW_AT_language
++	.long	.LASF4	# DW_AT_name: "gdb.arch/x86_64-vla-pointer.c"
++	.long	.LASF5	# DW_AT_comp_dir: "/home/jkratoch/redhat/fedora/gdb/master/gdb-7.12/gdb/testsuite"
++	.quad	.Ltext0	# DW_AT_low_pc
++	.quad	.Letext0-.Ltext0	# DW_AT_high_pc
++	.long	.Ldebug_line0	# DW_AT_stmt_list
++	.uleb128 0x2	# (DIE (0x2d) DW_TAG_subprogram)
++			# DW_AT_external
++	.ascii "foo\0"	# DW_AT_name
++	.byte	0x1	# DW_AT_decl_file (gdb.arch/x86_64-vla-pointer.c)
++	.byte	0x15	# DW_AT_decl_line
++			# DW_AT_prototyped
++	.quad	.LFB0	# DW_AT_low_pc
++	.quad	.LFE0-.LFB0	# DW_AT_high_pc
++	.uleb128 0x1	# DW_AT_frame_base
++	.byte	0x9c	# DW_OP_call_frame_cfa
++			# DW_AT_GNU_all_call_sites
++	.long	0x80	# DW_AT_sibling
++	.uleb128 0x3	# (DIE (0x4a) DW_TAG_formal_parameter)
++	.long	.LASF6	# DW_AT_name: "size"
++	.byte	0x1	# DW_AT_decl_file (gdb.arch/x86_64-vla-pointer.c)
++	.byte	0x15	# DW_AT_decl_line
++	.long	0x80	# DW_AT_type
++	.uleb128 0x3	# DW_AT_location
++	.byte	0x91	# DW_OP_fbreg
++	.sleb128 -68
++	.uleb128 0x4	# (DIE (0x59) DW_TAG_typedef)
++	.long	.LASF7	# DW_AT_name: "array_t"
++	.byte	0x1	# DW_AT_decl_file (gdb.arch/x86_64-vla-pointer.c)
++	.byte	0x17	# DW_AT_decl_line
++	.long	0x87	# DW_AT_type
++	.uleb128 0x5	# (DIE (0x64) DW_TAG_variable)
++	.long	.LASF0	# DW_AT_name: "array"
++	.byte	0x1	# DW_AT_decl_file (gdb.arch/x86_64-vla-pointer.c)
++	.byte	0x18	# DW_AT_decl_line
++	.long	0x59	# DW_AT_type
++	.uleb128 0x3	# DW_AT_location
++	.byte	0x91	# DW_OP_fbreg
++	.sleb128 -56
++	.byte	0x6	# DW_OP_deref
++	.uleb128 0x6	# (DIE (0x73) DW_TAG_variable)
++	.ascii "i\0"	# DW_AT_name
++	.byte	0x1	# DW_AT_decl_file (gdb.arch/x86_64-vla-pointer.c)
++	.byte	0x19	# DW_AT_decl_line
++	.long	0x80	# DW_AT_type
++	.uleb128 0x2	# DW_AT_location
++	.byte	0x91	# DW_OP_fbreg
++	.sleb128 -36
++	.byte	0	# end of children of DIE 0x2d
++	.uleb128 0x7	# (DIE (0x80) DW_TAG_base_type)
++	.byte	0x4	# DW_AT_byte_size
++	.byte	0x5	# DW_AT_encoding
++	.ascii "int\0"	# DW_AT_name
++	.uleb128 0x8	# (DIE (0x87) DW_TAG_array_type)
++	.long	0xa1	# DW_AT_type
++	.long	0x9a	# DW_AT_sibling
++	.uleb128 0x9	# (DIE (0x90) DW_TAG_subrange_type)
++	.long	0x9a	# DW_AT_type
++	.uleb128 0x3	# DW_AT_upper_bound
++	.byte	0x91	# DW_OP_fbreg
++	.sleb128 -48
++	.byte	0x6	# DW_OP_deref
++	.byte	0	# end of children of DIE 0x87
++	.uleb128 0xa	# (DIE (0x9a) DW_TAG_base_type)
++	.byte	0x8	# DW_AT_byte_size
++	.byte	0x7	# DW_AT_encoding
++	.long	.LASF1	# DW_AT_name: "sizetype"
++	.uleb128 0xa	# (DIE (0xa1) DW_TAG_base_type)
++	.byte	0x1	# DW_AT_byte_size
++	.byte	0x6	# DW_AT_encoding
++	.long	.LASF2	# DW_AT_name: "char"
++	.byte	0	# end of children of DIE 0xb
++	.section	.debug_abbrev,"", at progbits
++.Ldebug_abbrev0:
++	.uleb128 0x1	# (abbrev code)
++	.uleb128 0x11	# (TAG: DW_TAG_compile_unit)
++	.byte	0x1	# DW_children_yes
++	.uleb128 0x25	# (DW_AT_producer)
++	.uleb128 0xe	# (DW_FORM_strp)
++	.uleb128 0x13	# (DW_AT_language)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x3	# (DW_AT_name)
++	.uleb128 0xe	# (DW_FORM_strp)
++	.uleb128 0x1b	# (DW_AT_comp_dir)
++	.uleb128 0xe	# (DW_FORM_strp)
++	.uleb128 0x11	# (DW_AT_low_pc)
++	.uleb128 0x1	# (DW_FORM_addr)
++	.uleb128 0x12	# (DW_AT_high_pc)
++	.uleb128 0x7	# (DW_FORM_data8)
++	.uleb128 0x10	# (DW_AT_stmt_list)
++	.uleb128 0x17	# (DW_FORM_sec_offset)
++	.byte	0
++	.byte	0
++	.uleb128 0x2	# (abbrev code)
++	.uleb128 0x2e	# (TAG: DW_TAG_subprogram)
++	.byte	0x1	# DW_children_yes
++	.uleb128 0x3f	# (DW_AT_external)
++	.uleb128 0x19	# (DW_FORM_flag_present)
++	.uleb128 0x3	# (DW_AT_name)
++	.uleb128 0x8	# (DW_FORM_string)
++	.uleb128 0x3a	# (DW_AT_decl_file)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x3b	# (DW_AT_decl_line)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x27	# (DW_AT_prototyped)
++	.uleb128 0x19	# (DW_FORM_flag_present)
++	.uleb128 0x11	# (DW_AT_low_pc)
++	.uleb128 0x1	# (DW_FORM_addr)
++	.uleb128 0x12	# (DW_AT_high_pc)
++	.uleb128 0x7	# (DW_FORM_data8)
++	.uleb128 0x40	# (DW_AT_frame_base)
++	.uleb128 0x18	# (DW_FORM_exprloc)
++	.uleb128 0x2117	# (DW_AT_GNU_all_call_sites)
++	.uleb128 0x19	# (DW_FORM_flag_present)
++	.uleb128 0x1	# (DW_AT_sibling)
++	.uleb128 0x13	# (DW_FORM_ref4)
++	.byte	0
++	.byte	0
++	.uleb128 0x3	# (abbrev code)
++	.uleb128 0x5	# (TAG: DW_TAG_formal_parameter)
++	.byte	0	# DW_children_no
++	.uleb128 0x3	# (DW_AT_name)
++	.uleb128 0xe	# (DW_FORM_strp)
++	.uleb128 0x3a	# (DW_AT_decl_file)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x3b	# (DW_AT_decl_line)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x49	# (DW_AT_type)
++	.uleb128 0x13	# (DW_FORM_ref4)
++	.uleb128 0x2	# (DW_AT_location)
++	.uleb128 0x18	# (DW_FORM_exprloc)
++	.byte	0
++	.byte	0
++	.uleb128 0x4	# (abbrev code)
++	.uleb128 0x16	# (TAG: DW_TAG_typedef)
++	.byte	0	# DW_children_no
++	.uleb128 0x3	# (DW_AT_name)
++	.uleb128 0xe	# (DW_FORM_strp)
++	.uleb128 0x3a	# (DW_AT_decl_file)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x3b	# (DW_AT_decl_line)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x49	# (DW_AT_type)
++	.uleb128 0x13	# (DW_FORM_ref4)
++	.byte	0
++	.byte	0
++	.uleb128 0x5	# (abbrev code)
++	.uleb128 0x34	# (TAG: DW_TAG_variable)
++	.byte	0	# DW_children_no
++	.uleb128 0x3	# (DW_AT_name)
++	.uleb128 0xe	# (DW_FORM_strp)
++	.uleb128 0x3a	# (DW_AT_decl_file)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x3b	# (DW_AT_decl_line)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x49	# (DW_AT_type)
++	.uleb128 0x13	# (DW_FORM_ref4)
++	.uleb128 0x2	# (DW_AT_location)
++	.uleb128 0x18	# (DW_FORM_exprloc)
++	.byte	0
++	.byte	0
++	.uleb128 0x6	# (abbrev code)
++	.uleb128 0x34	# (TAG: DW_TAG_variable)
++	.byte	0	# DW_children_no
++	.uleb128 0x3	# (DW_AT_name)
++	.uleb128 0x8	# (DW_FORM_string)
++	.uleb128 0x3a	# (DW_AT_decl_file)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x3b	# (DW_AT_decl_line)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x49	# (DW_AT_type)
++	.uleb128 0x13	# (DW_FORM_ref4)
++	.uleb128 0x2	# (DW_AT_location)
++	.uleb128 0x18	# (DW_FORM_exprloc)
++	.byte	0
++	.byte	0
++	.uleb128 0x7	# (abbrev code)
++	.uleb128 0x24	# (TAG: DW_TAG_base_type)
++	.byte	0	# DW_children_no
++	.uleb128 0xb	# (DW_AT_byte_size)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x3e	# (DW_AT_encoding)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x3	# (DW_AT_name)
++	.uleb128 0x8	# (DW_FORM_string)
++	.byte	0
++	.byte	0
++	.uleb128 0x8	# (abbrev code)
++	.uleb128 0x1	# (TAG: DW_TAG_array_type)
++	.byte	0x1	# DW_children_yes
++	.uleb128 0x49	# (DW_AT_type)
++	.uleb128 0x13	# (DW_FORM_ref4)
++	.uleb128 0x1	# (DW_AT_sibling)
++	.uleb128 0x13	# (DW_FORM_ref4)
++	.byte	0
++	.byte	0
++	.uleb128 0x9	# (abbrev code)
++	.uleb128 0x21	# (TAG: DW_TAG_subrange_type)
++	.byte	0	# DW_children_no
++	.uleb128 0x49	# (DW_AT_type)
++	.uleb128 0x13	# (DW_FORM_ref4)
++	.uleb128 0x2f	# (DW_AT_upper_bound)
++	.uleb128 0x18	# (DW_FORM_exprloc)
++	.byte	0
++	.byte	0
++	.uleb128 0xa	# (abbrev code)
++	.uleb128 0x24	# (TAG: DW_TAG_base_type)
++	.byte	0	# DW_children_no
++	.uleb128 0xb	# (DW_AT_byte_size)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x3e	# (DW_AT_encoding)
++	.uleb128 0xb	# (DW_FORM_data1)
++	.uleb128 0x3	# (DW_AT_name)
++	.uleb128 0xe	# (DW_FORM_strp)
++	.byte	0
++	.byte	0
++	.byte	0
++	.section	.debug_aranges,"", at progbits
++	.long	0x2c	# Length of Address Ranges Info
++	.value	0x2	# DWARF Version
++	.long	.Ldebug_info0	# Offset of Compilation Unit Info
++	.byte	0x8	# Size of Address
++	.byte	0	# Size of Segment Descriptor
++	.value	0	# Pad to 16 byte boundary
++	.value	0
++	.quad	.Ltext0	# Address
++	.quad	.Letext0-.Ltext0	# Length
++	.quad	0
++	.quad	0
++	.section	.debug_line,"", at progbits
++.Ldebug_line0:
++	.section	.debug_str,"MS", at progbits,1
++.LASF4:
++	.string	"gdb.arch/x86_64-vla-pointer.c"
++.LASF7:
++	.string	"array_t"
++.LASF3:
++	.string	"GNU C11 6.2.1 20160916 (Red Hat 6.2.1-2) -mtune=generic -march=x86-64 -g"
++.LASF2:
++	.string	"char"
++.LASF1:
++	.string	"sizetype"
++.LASF5:
++	.string	"/home/jkratoch/redhat/fedora/gdb/master/gdb-7.12/gdb/testsuite"
++.LASF6:
++	.string	"size"
++.LASF0:
++	.string	"array"
++	.ident	"GCC: (GNU) 6.2.1 20160916 (Red Hat 6.2.1-2)"
++	.section	.note.GNU-stack,"", at progbits
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.arch/x86_64-vla-pointer.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.arch/x86_64-vla-pointer.c	2017-02-26 19:15:36.598882323 +0100
+@@ -0,0 +1,45 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2009 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#if 0
++
++void
++foo (int size)
++{
++  typedef char array_t[size];
++  array_t array;
++  int i;
++
++  for (i = 0; i < size; i++)
++    array[i] = i;
++
++  array[0] = 0;	/* break-here */
++}
++
++#else
++
++void foo (int size);
++
++int
++main (void)
++{
++  foo (26);
++  foo (78);
++  return 0;
++}
++
++#endif
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.arch/x86_64-vla-pointer.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.arch/x86_64-vla-pointer.exp	2017-02-26 19:15:36.598882323 +0100
+@@ -0,0 +1,65 @@
++# Copyright 2009 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++if ![istarget "x86_64-*-*"] then {
++    verbose "Skipping over gdb.arch/x86_64-vla-pointer.exp test made only for x86_64."
++    return
++}
++
++set testfile x86_64-vla-pointer
++set srcasmfile ${testfile}-foo.S
++set srcfile ${testfile}.c
++set binfile [standard_output_file ${testfile}]
++set binobjfile [standard_output_file ${testfile}-foo.o]
++if  { [gdb_compile "${srcdir}/${subdir}/${srcasmfile}" "${binobjfile}" object {}] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${binobjfile}" "${binfile}" executable {}] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++if ![runto_main] {
++    untested x86_64-vla-pointer
++    return -1
++}
++
++gdb_breakpoint $srcfile:[gdb_get_line_number "break-here"]
++
++gdb_continue_to_breakpoint "break-here"
++
++gdb_test "whatis array" "type = array_t" "first: whatis array"
++gdb_test "whatis array_t" "type = char \\\[variable length\\\]" "first: whatis array_t"
++gdb_test "ptype array" "type = char \\\[26\\\]" "first: ptype array"
++
++gdb_test "whatis *array" "type = char" "first: whatis *array"
++gdb_test "ptype *array" "type = char" "first: ptype *array"
++
++gdb_test "p array\[1\]" "\\$\[0-9\] = 1 '\\\\001'"
++gdb_test "p array\[2\]" "\\$\[0-9\] = 2 '\\\\002'"
++gdb_test "p array\[3\]" "\\$\[0-9\] = 3 '\\\\003'"
++gdb_test "p array\[4\]" "\\$\[0-9\] = 4 '\\\\004'"
++
++gdb_continue_to_breakpoint "break_here"
++
++gdb_test "whatis array" "type = array_t" "second: whatis array"
++gdb_test "whatis array_t" "type = char \\\[variable length\\\]" "second: whatis array_t"
++gdb_test "ptype array" "type = char \\\[78\\\]" "second: ptype array"
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S	2017-02-26 19:15:36.598882323 +0100
 @@ -0,0 +1,455 @@
 +	.file	"x86_64-vla-typedef.c"
 +	.section	.debug_abbrev,"", at progbits
@@ -474,10 +957,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S
 +	.string	"GNU C 4.3.2 20081105 (Red Hat 4.3.2-7)"
 +	.ident	"GCC: (GNU) 4.3.2 20081105 (Red Hat 4.3.2-7)"
 +	.section	.note.GNU-stack,"", at progbits
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c	2016-02-15 23:35:56.290999853 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c	2017-02-26 19:15:36.599882330 +0100
 @@ -0,0 +1,45 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -524,10 +1007,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c
 +}
 +
 +#endif
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp	2016-02-15 23:35:56.290999853 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp	2017-02-26 19:15:36.599882330 +0100
 @@ -0,0 +1,64 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -593,10 +1076,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp
 +gdb_test "whatis array" "type = array_t" "second: whatis array"
 +
 +gdb_test "ptype array" "type = char \\\[78\\\]" "second: ptype array"
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/arrayidx.c
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.base/arrayidx.c
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/testsuite/gdb.base/arrayidx.c	2016-02-15 23:33:29.830959972 +0100
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/arrayidx.c	2016-02-15 23:35:56.290999853 +0100
+--- gdb-7.12.50.20170207.orig/gdb/testsuite/gdb.base/arrayidx.c	2017-02-26 19:15:28.555824772 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.base/arrayidx.c	2017-02-26 19:15:36.599882330 +0100
 @@ -17,6 +17,13 @@
  
  int array[] = {1, 2, 3, 4};
@@ -611,13 +1094,13 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/arrayidx.c
  int
  main (void)
  {
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/arrayidx.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.base/arrayidx.exp
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/testsuite/gdb.base/arrayidx.exp	2016-02-15 23:33:29.830959972 +0100
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/arrayidx.exp	2016-02-15 23:35:56.291999860 +0100
+--- gdb-7.12.50.20170207.orig/gdb/testsuite/gdb.base/arrayidx.exp	2017-02-26 19:15:28.555824772 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.base/arrayidx.exp	2017-02-26 19:15:36.599882330 +0100
 @@ -49,4 +49,12 @@
           "\\{\\\[0\\\] = 1, \\\[1\\\] = 2, \\\[2\\\] = 3, \\\[3\\\] = 4\\}" \
-          "Print array with array-indexes on"
+          "print array with array-indexes on"
  
 -
 +set test "p unbound.a == &unbound.a\[0\]"
@@ -629,10 +1112,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/arrayidx.exp
 +	unsupported "$test (no GCC)"
 +    }
 +}
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/internal-var-field-address.c
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.base/internal-var-field-address.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/internal-var-field-address.c	2016-02-15 23:35:56.291999860 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.base/internal-var-field-address.c	2017-02-26 19:15:36.599882330 +0100
 @@ -0,0 +1,20 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -654,10 +1137,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/internal-var-field-address.c
 +struct {
 +  int field;
 +} staticstruct = { 1 };
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/internal-var-field-address.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.base/internal-var-field-address.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/internal-var-field-address.exp	2016-02-15 23:35:56.291999860 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.base/internal-var-field-address.exp	2017-02-26 19:15:36.600882337 +0100
 @@ -0,0 +1,26 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -685,10 +1168,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/internal-var-field-address.ex
 +
 +gdb_test {set $varstruct = staticstruct}
 +gdb_test {p $varstruct.field} " = 1"
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-frame.c
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.base/vla-frame.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-frame.c	2016-02-15 23:35:56.291999860 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.base/vla-frame.c	2017-02-26 19:15:36.600882337 +0100
 @@ -0,0 +1,31 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -721,10 +1204,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-frame.c
 +  f (s);
 +  return 0;
 +}
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-frame.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.base/vla-frame.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-frame.exp	2016-02-15 23:35:56.291999860 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.base/vla-frame.exp	2017-02-26 19:15:36.600882337 +0100
 @@ -0,0 +1,38 @@
 +# Copyright 2011 Free Software Foundation, Inc.
 +#
@@ -764,10 +1247,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-frame.exp
 +}
 +
 +gdb_test "bt full" "\r\n +s = \"X\\\\000\"\r\n.*"
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-overflow.c
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.base/vla-overflow.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-overflow.c	2016-02-15 23:35:56.291999860 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.base/vla-overflow.c	2017-02-26 19:15:36.600882337 +0100
 @@ -0,0 +1,30 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -799,10 +1282,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-overflow.c
 +
 +  return 0;
 +}
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-overflow.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.base/vla-overflow.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-overflow.exp	2016-02-15 23:35:56.292999867 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.base/vla-overflow.exp	2017-02-26 19:15:36.600882337 +0100
 @@ -0,0 +1,109 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -913,10 +1396,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-overflow.exp
 +gdb_test "bt" "in \[^ \]*abort \\(.* in main \\(.*" "Backtrace after abort()"
 +
 +verbose -log "kb_found in bt after abort() = [expr [memory_v_pages_get] * $pagesize / 1024]"
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla.c
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.base/vla.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla.c	2016-02-15 23:35:56.292999867 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.base/vla.c	2017-02-26 19:15:36.600882337 +0100
 @@ -0,0 +1,55 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -973,10 +1456,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla.c
 +  foo (78);
 +  return 0;
 +}
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.base/vla.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla.exp	2016-02-15 23:35:56.292999867 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.base/vla.exp	2017-02-26 19:15:36.600882337 +0100
 @@ -0,0 +1,62 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -1040,10 +1523,382 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla.exp
 +gdb_test "p temp1" " = '1' <repeats 78 times>" "second: print temp1"
 +gdb_test "p temp2" " = '2' <repeats 78 times>" "second: print temp2"
 +gdb_test "p temp3" " = '3' <repeats 48 times>" "second: print temp3"
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.cp/gdb9593.cc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.cp/gdb9593.cc	2017-02-26 19:15:36.601882344 +0100
+@@ -0,0 +1,180 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2008, 2009 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.
++   */
++#include <iostream>
++
++using namespace std;
++
++class NextOverThrowDerivates
++{
++
++public:
++
++
++  // Single throw an exception in this function.
++  void function1() 
++  {
++    throw 20;
++  }
++
++  // Throw an exception in another function.
++  void function2() 
++  {
++    function1();
++  }
++
++  // Throw an exception in another function, but handle it
++  // locally.
++  void function3 () 
++  {
++    {
++      try
++	{
++	  function1 ();
++	}
++      catch (...) 
++	{
++	  cout << "Caught and handled function1 exception" << endl;
++	}
++    }
++  }
++
++  void rethrow ()
++  {
++    try
++      {
++	function1 ();
++      }
++    catch (...)
++      {
++	throw;
++      }
++  }
++
++  void finish ()
++  {
++    // We use this to test that a "finish" here does not end up in
++    // this frame, but in the one above.
++    try
++      {
++	function1 ();
++      }
++    catch (int x)
++      {
++      }
++    function1 ();		// marker for until
++  }
++
++  void until ()
++  {
++    function1 ();
++    function1 ();		// until here
++  }
++
++};
++NextOverThrowDerivates next_cases;
++
++
++int main () 
++{ 
++  try
++    {
++      next_cases.function1 ();
++    }
++  catch (...)
++    {
++      // Discard
++    }
++
++  try
++    {
++      next_cases.function2 ();
++    }
++  catch (...)
++    {
++      // Discard
++    }
++
++  try
++    {
++      // This is duplicated so we can next over one but step into
++      // another.
++      next_cases.function2 ();
++    }
++  catch (...)
++    {
++      // Discard
++    }
++
++  next_cases.function3 ();
++
++  try
++    {
++      next_cases.rethrow ();
++    }
++  catch (...)
++    {
++      // Discard
++    }
++
++  try
++    {
++      // Another duplicate so we can test "finish".
++      next_cases.function2 ();
++    }
++  catch (...)
++    {
++      // Discard
++    }
++
++  // Another test for "finish".
++  try
++    {
++      next_cases.finish ();
++    }
++  catch (...)
++    {
++    }
++
++  // Test of "until".
++  try
++    {
++      next_cases.finish ();
++    }
++  catch (...)
++    {
++    }
++
++  // Test of "until" with an argument.
++  try
++    {
++      next_cases.until ();
++    }
++  catch (...)
++    {
++    }
++
++  // Test of "advance".
++  try
++    {
++      next_cases.until ();
++    }
++  catch (...)
++    {
++    }
++}
++
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.cp/gdb9593.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S	2016-02-15 23:35:56.292999867 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.cp/gdb9593.exp	2017-02-26 19:15:36.601882344 +0100
+@@ -0,0 +1,182 @@
++# Copyright 2008, 2009 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++
++if $tracelevel then {
++    strace $tracelevel
++}
++
++if { [skip_cplus_tests] } { continue }
++
++set testfile "gdb9593"
++set srcfile ${testfile}.cc
++set binfile [standard_output_file $testfile]
++
++# Create and source the file that provides information about the compiler
++# used to compile the test case.
++if [get_compiler_info "c++"] {
++    untested gdb9593.exp
++    return -1
++}
++
++if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
++    untested gdb9593.exp
++    return -1
++}
++
++# Some targets can't do function calls, so don't even bother with this
++# test.
++if [target_info exists gdb,cannot_call_functions] {
++    setup_xfail "*-*-*" 9593
++    fail "This target can not call functions"
++    continue
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++if ![runto_main] then {
++    perror "couldn't run to main"
++    continue
++} 
++
++# See whether we have the needed unwinder hooks.
++set ok 1
++gdb_test_multiple "print _Unwind_DebugHook" "check for unwinder hook" {
++    -re "= .*_Unwind_DebugHook.*\r\n$gdb_prompt $" {
++	pass "check for unwinder hook"
++    }
++    -re "No symbol .* in current context.\r\n$gdb_prompt $" {
++	# Pass the test so we don't get bogus fails in the results.
++	pass "check for unwinder hook"
++	set ok 0
++    }
++}
++if {!$ok} {
++    untested gdb9593.exp
++    return -1
++}
++
++# See http://sourceware.org/bugzilla/show_bug.cgi?id=9593
++
++gdb_test "next" \
++    ".*catch (...).*" \
++    "next over a throw 1"
++
++gdb_test "next" \
++  ".*next_cases.function2.*" \
++  "next past catch 1"
++
++gdb_test "next" \
++    ".*catch (...).*" \
++    "next over a throw 2"
++
++gdb_test "next" \
++  ".*next_cases.function2.*" \
++  "next past catch 2"
++
++gdb_test "step" \
++  ".*function1().*" \
++  "step into function2 1"
++
++gdb_test "next" \
++    ".*catch (...).*" \
++    "next over a throw 3"
++
++gdb_test "next" \
++  ".*next_cases.function3.*" \
++  "next past catch 3"
++
++gdb_test "next" \
++  ".*next_cases.rethrow.*" \
++    "next over a throw 4"
++
++gdb_test "next" \
++  ".*catch (...).*" \
++  "next over a rethrow"
++
++gdb_test "next" \
++  ".*next_cases.function2.*" \
++  "next after a rethrow"
++
++gdb_test "step" \
++  ".*function1().*" \
++  "step into function2 2"
++
++gdb_test "finish" \
++  ".*catch (...).*" \
++  "finish 1"
++
++gdb_test "next" \
++  ".*next_cases.finish ().*" \
++  "next past catch 4"
++
++gdb_test "step" \
++  ".*function1 ().*" \
++  "step into finish method"
++
++gdb_test "finish" \
++  ".*catch (...).*" \
++  "finish 2"
++
++gdb_test "next" \
++  ".*next_cases.finish ().*" \
++  "next past catch 5"
++
++gdb_test "step" \
++  ".*function1 ().*" \
++  "step into finish, for until"
++
++gdb_test "until" \
++  ".*function1 ().*" \
++  "until with no argument 1"
++
++set line [gdb_get_line_number "marker for until" $testfile.cc]
++
++gdb_test "until $line" \
++  ".*function1 ().*" \
++  "next past catch 6"
++
++gdb_test "until" \
++  ".*catch (...).*" \
++  "until with no argument 2"
++
++set line [gdb_get_line_number "until here" $testfile.cc]
++
++gdb_test "next" \
++  ".*next_cases.until ().*" \
++  "next past catch 6"
++
++gdb_test "step" \
++  ".*function1 ().*" \
++  "step into until"
++
++gdb_test "until $line" \
++  ".*catch (...).*" \
++  "until-over-throw"
++
++gdb_test "next" \
++  ".*next_cases.until ().*" \
++  "next past catch 7"
++
++gdb_test "step" \
++  ".*function1 ().*" \
++  "step into until, for advance"
++
++gdb_test "advance $line" \
++  ".*catch (...).*" \
++  "advance-over-throw"
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S	2017-02-26 19:15:36.601882344 +0100
 @@ -0,0 +1,246 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -1291,10 +2146,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S
 +	.string		"char"
 +.Luint_str:
 +	.string		"unsigned int"
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp	2016-02-15 23:35:56.292999867 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp	2017-02-26 19:15:36.602882352 +0100
 @@ -0,0 +1,66 @@
 +# Copyright 2010 Free Software Foundation, Inc.
 +
@@ -1362,10 +2217,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp
 +
 +# The register contains unpredictable value - the array size.
 +gdb_test "ptype reg_string" {type = char \[-?[0-9]+\]}
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-stripped.c
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-stripped.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-stripped.c	2016-02-15 23:35:56.293999874 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-stripped.c	2017-02-26 19:15:36.602882352 +0100
 @@ -0,0 +1,42 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -1409,10 +2264,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-stripped.c
 +  func1 (1, 2);
 +  return 0;
 +}
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp	2016-02-15 23:35:56.293999874 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp	2017-02-26 19:15:36.602882352 +0100
 @@ -0,0 +1,79 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
@@ -1445,7 +2300,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp
 +
 +set testfile "dw2-stripped"
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}.x
++set binfile [standard_output_file ${testfile}.x]
 +
 +remote_exec build "rm -f ${binfile}"
 +
@@ -1493,10 +2348,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp
 +gdb_test "step" \
 +         "func.* \\(.*\\) at .*" \
 +         "step"
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S	2016-02-15 23:35:56.293999874 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S	2017-02-26 19:15:36.602882352 +0100
 @@ -0,0 +1,83 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -1581,10 +2436,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-loca
 +
 +	.byte		0x0			/* Terminator */
 +	.byte		0x0			/* Terminator */
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp	2016-02-15 23:35:56.293999874 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp	2017-02-26 19:15:36.602882352 +0100
 @@ -0,0 +1,37 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -1623,10 +2478,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-loca
 +clean_restart $binfile
 +
 +gdb_test "ptype struct some_struct" "type = struct some_struct {\[\r\n \t\]*void field;\[\r\n \t\]*}"
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.S
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.S	2016-02-15 23:35:56.293999874 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.S	2017-02-26 19:15:36.602882352 +0100
 @@ -0,0 +1,121 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -1749,10 +2604,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.S
 +	.byte		0x0			/* Terminator */
 +
 +	.byte		0x0			/* Terminator */
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.exp	2016-02-15 23:35:56.293999874 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.exp	2017-02-26 19:15:36.603882359 +0100
 @@ -0,0 +1,39 @@
 +# Copyright 2012 Free Software Foundation, Inc.
 +
@@ -1793,10 +2648,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.exp
 +
 +gdb_test "ptype notype_string" {type = char \[129\]}
 +gdb_test "p notype_string" " = 'x' <repeats 129 times>"
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dwarf-stride.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/dwarf-stride.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dwarf-stride.exp	2016-02-15 23:35:56.294999881 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/dwarf-stride.exp	2017-02-26 19:15:36.603882359 +0100
 @@ -0,0 +1,42 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -1840,10 +2695,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dwarf-stride.exp
 +gdb_continue_to_breakpoint "break-here" ".*break-here.*"
 +gdb_test "p c40pt(1)" " = '0-hello.*"
 +gdb_test "p c40pt(2)" " = '1-hello.*"
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dwarf-stride.f90
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/dwarf-stride.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dwarf-stride.f90	2016-02-15 23:35:56.294999881 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/dwarf-stride.f90	2017-02-26 19:15:36.603882359 +0100
 @@ -0,0 +1,40 @@
 +! Copyright 2009 Free Software Foundation, Inc.
 +!
@@ -1885,11 +2740,11 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dwarf-stride.f90
 +  print *, c40pt  ! break-here
 +
 +end program repro
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dynamic.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/dynamic.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dynamic.exp	2016-02-15 23:36:39.358305635 +0100
-@@ -0,0 +1,151 @@
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/dynamic.exp	2017-02-26 19:15:36.603882359 +0100
+@@ -0,0 +1,154 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -1934,11 +2789,13 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dynamic.exp
 +
 +gdb_breakpoint [gdb_get_line_number "varx-init"]
 +gdb_continue_to_breakpoint "varx-init"
-+gdb_test "p varx" "\\$\[0-9\]* = <not allocated>" "p varx unallocated"
-+gdb_test "ptype varx" "type = <not allocated>" "ptype varx unallocated"
-+gdb_test "p varx(1,5,17)" {no such vector element \(vector not allocated\)} "p varx(1,5,17) unallocated"
-+gdb_test "p varx(1,5,17)=1" {no such vector element \(vector not allocated\)} "p varx(1,5,17)=1 unallocated"
-+gdb_test "ptype varx(1,5,17)" {no such vector element \(vector not allocated\)} "ptype varx(1,5,17) unallocated"
++
++# http://www.cs.rpi.edu/~szymansk/OOF90/bugs.html#5
++# Do not: gdb_test "p varx" "\\$\[0-9\]* = <not allocated>" "p varx unallocated"
++# Do not: gdb_test "ptype varx" {type = real\(kind=4\) \(:,:,:\)} "ptype varx unallocated"
++# Do not: gdb_test "p varx(1,5,17)" {no such vector element \(vector not allocated\)} "p varx(1,5,17) unallocated"
++# Do not: gdb_test "p varx(1,5,17)=1" {no such vector element \(vector not allocated\)} "p varx(1,5,17)=1 unallocated"
++# Do not: gdb_test "ptype varx(1,5,17)" {no such vector element \(vector not allocated\)} "ptype varx(1,5,17) unallocated"
 +
 +gdb_breakpoint [gdb_get_line_number "varx-allocated"]
 +gdb_continue_to_breakpoint "varx-allocated"
@@ -1953,8 +2810,9 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dynamic.exp
 +gdb_test "p varx(1, 5, 17)" "\\$\[0-9\]* = 7"
 +gdb_test "p varx(2, 6, 18)" "\\$\[0-9\]* = 8"
 +gdb_test "p varx(6, 15, 28)" "\\$\[0-9\]* = 9"
-+gdb_test "p varv" "\\$\[0-9\]* = <not associated>" "p varv unassociated"
-+gdb_test "ptype varv" "type = <not associated>" "ptype varv unassociated"
++# http://www.cs.rpi.edu/~szymansk/OOF90/bugs.html#5
++# Do not: gdb_test "p varv" "\\$\[0-9\]* = <not associated>" "p varv unassociated"
++# Do not: gdb_test "ptype varv" {type = real\(kind=4\) \(:,:,:\)} "ptype varv unassociated"
 +
 +set test "output varx"
 +gdb_test_multiple $test $test {
@@ -1982,7 +2840,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dynamic.exp
 +gdb_continue_to_breakpoint "varv-deassociated"
 +# The latter one is for the Intel Fortran Compiler 10.1.008 pointer type.
 +gdb_test "p varv" "\\$\[0-9\]* = (<not associated>|.*(Cannot access it|Unable to access the object) because the object is not associated.)" "p varv deassociated"
-+gdb_test "ptype varv" "type = (<not associated>|.*(Cannot access it|Unable to access the object) because the object is not associated.)" "ptype varv deassociated"
++gdb_test "ptype varv" {type = real\(kind=4\) \(:,:,:\)} "ptype varv deassociated"
 +gdb_test "p l" "\\$\[0-9\]* = \\.FALSE\\." "p l if varv deassociated"
 +gdb_test "p varv(1,5,17)" {no such vector element \(vector not associated\)}
 +gdb_test "ptype varv(1,5,17)" {no such vector element \(vector not associated\)}
@@ -1990,7 +2848,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dynamic.exp
 +gdb_breakpoint [gdb_get_line_number "varx-deallocated"]
 +gdb_continue_to_breakpoint "varx-deallocated"
 +gdb_test "p varx" "\\$\[0-9\]* = <not allocated>" "p varx deallocated"
-+gdb_test "ptype varx" "type = <not allocated>" "ptype varx deallocated"
++gdb_test "ptype varx" {type = real\(kind=4\) \(:,:,:\)} "ptype varx deallocated"
 +gdb_test "p l" "\\$\[0-9\]* = \\.FALSE\\." "p l if varx deallocated"
 +gdb_test "p varx(1,5,17)" {no such vector element \(vector not allocated\)} "p varx(1,5,17) deallocated"
 +gdb_test "ptype varx(1,5,17)" {no such vector element \(vector not allocated\)} "ptype varx(1,5,17) deallocated"
@@ -2041,10 +2899,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dynamic.exp
 +gdb_test "p vart(3,8)" "\\$\[0-9\]* = 9"
 +# maps to foo::vary(1,3)
 +gdb_test "p vart(2,9)" "\\$\[0-9\]* = 10"
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dynamic.f90
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/dynamic.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dynamic.f90	2016-02-15 23:35:56.294999881 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/dynamic.f90	2017-02-26 19:15:36.603882359 +0100
 @@ -0,0 +1,98 @@
 +! Copyright 2007 Free Software Foundation, Inc.
 +!
@@ -2144,10 +3002,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dynamic.f90
 +  if (x (1, 1) .ne. 8 .or. x (2, 2) .ne. 9 .or. x (1, 2) .ne. 4) call abort
 +  if (x (3, 1) .ne. 10) call abort
 +end
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/string.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/string.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/string.exp	2016-02-15 23:36:39.359305642 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/string.exp	2017-02-26 19:15:36.604882366 +0100
 @@ -0,0 +1,59 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -2208,10 +3066,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/string.exp
 +gdb_continue_to_breakpoint "var-finish"
 +gdb_test "p e" "\\$\[0-9\]* = 'e   '" "p e re-set"
 +gdb_test "p f" "\\$\[0-9\]* = \\(\\( 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   '\\) \\( 'f2  ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   '\\) \\( 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   '\\) \\)" "p *f re-set"
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/string.f90
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/string.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/string.f90	2016-02-15 23:35:56.295999888 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/string.f90	2017-02-26 19:15:36.604882366 +0100
 @@ -0,0 +1,37 @@
 +! Copyright 2008 Free Software Foundation, Inc.
 +!
@@ -2250,10 +3108,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/string.f90
 +  h = 'h'
 +  call foo (g, h)
 +end
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/subrange.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/subrange.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/subrange.exp	2016-02-15 23:35:56.295999888 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/subrange.exp	2017-02-26 19:15:36.604882366 +0100
 @@ -0,0 +1,72 @@
 +# Copyright 2011 Free Software Foundation, Inc.
 +
@@ -2327,10 +3185,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/subrange.exp
 +gdb_unload
 +setup_kfail "*-*-*" "vlaregression/9999"
 +gdb_test {p $a (3, 2:2)} { = \(23\)}
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/subrange.f90
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/subrange.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/subrange.f90	2016-02-15 23:35:56.295999888 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.fortran/subrange.f90	2017-02-26 19:15:36.604882366 +0100
 @@ -0,0 +1,28 @@
 +! Copyright 2011 Free Software Foundation, Inc.
 +!
@@ -2360,10 +3218,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/subrange.f90
 +  ptr => a
 +  write (*,*) a                 ! break-static
 +end
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.mi/mi2-var-stale-type.c
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.mi/mi2-var-stale-type.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.mi/mi2-var-stale-type.c	2016-02-15 23:35:56.295999888 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.mi/mi2-var-stale-type.c	2017-02-26 19:15:36.604882366 +0100
 @@ -0,0 +1,26 @@
 +/* Copyright 2011 Free Software Foundation, Inc.
 +
@@ -2391,10 +3249,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.mi/mi2-var-stale-type.c
 +
 +  return 0;
 +}
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp	2016-02-15 23:35:56.295999888 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp	2017-02-26 19:15:36.604882366 +0100
 @@ -0,0 +1,57 @@
 +# Copyright 2011 Free Software Foundation, Inc.
 +#
@@ -2453,10 +3311,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp
 +mi_create_varobj "vla" "vla" "create local variable vla"
 +
 +mi_gdb_test "-var-update *" "\\^done,changelist=.*" "-var-update *"
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register-func.c
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.opt/array-from-register-func.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register-func.c	2016-02-15 23:35:56.295999888 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.opt/array-from-register-func.c	2017-02-26 19:15:36.604882366 +0100
 @@ -0,0 +1,22 @@
 +/* This file is part of GDB, the GNU debugger.
 +
@@ -2480,10 +3338,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register-func.c
 +{
 +  return arr[0];
 +}
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register.c
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.opt/array-from-register.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register.c	2016-02-15 23:35:56.296999895 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.opt/array-from-register.c	2017-02-26 19:15:36.605882373 +0100
 @@ -0,0 +1,28 @@
 +/* This file is part of GDB, the GNU debugger.
 +
@@ -2513,10 +3371,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register.c
 +
 +  return 0;
 +}
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.opt/array-from-register.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register.exp	2016-02-15 23:35:56.296999895 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.opt/array-from-register.exp	2017-02-26 19:15:36.605882373 +0100
 @@ -0,0 +1,33 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +#
@@ -2551,10 +3409,87 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register.exp
 +# Seen regression:
 +# Address requested for identifier "arr" which is in register $rdi
 +gdb_test "p arr\[0\]" "\\$\[0-9\]+ = 42"
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pascal/arrays.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.opt/fortran-string.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.opt/fortran-string.exp	2017-02-26 19:15:36.605882373 +0100
+@@ -0,0 +1,39 @@
++# Copyright 2009 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++# 
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++# 
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
++
++# This file was written by Jan Kratochvil <jan.kratochvil at redhat.com>.
++
++# Test GDB can cope with Fortran strings having their length present in a CPU
++# register.  With -O0 the string length is passed on the stack.  To make this
++# test meaningful the follow assertion should pass.  It is not being checked
++# here as the "_s" symbol is compiler dependent:
++#   (gdb) info address _s
++#   Symbol "_s" is a variable in register XX.
++
++set test fortran-string
++set srcfile ${test}.f90
++if { [prepare_for_testing ${test}.exp ${test} ${srcfile} {debug f90 additional_flags=-O2}] } {
++    return -1
++}
++
++if ![runto $srcfile:[gdb_get_line_number "s = s"]] then {
++    perror "couldn't run to breakpoint MAIN__"
++    continue
++}
++
++gdb_test "frame" ".*s='foo'.*"
++gdb_test "ptype s" "type = character\\*3"
++gdb_test "p s" "\\$\[0-9\]* = 'foo'"
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.opt/fortran-string.f90
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.opt/fortran-string.f90	2017-02-26 19:15:36.605882373 +0100
+@@ -0,0 +1,28 @@
++! Copyright 2009 Free Software Foundation, Inc.
++!
++! This program is free software; you can redistribute it and/or modify
++! it under the terms of the GNU General Public License as published by
++! the Free Software Foundation; either version 2 of the License, or
++! (at your option) any later version.
++!
++! This program is distributed in the hope that it will be useful,
++! but WITHOUT ANY WARRANTY; without even the implied warranty of
++! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++! GNU General Public License for more details.
++!
++! You should have received a copy of the GNU General Public License
++! along with this program; if not, write to the Free Software
++! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++!
++! Ihis file is the Fortran source file for dynamic.exp.
++! Original file written by Jakub Jelinek <jakub at redhat.com>.
++! Modified for the GDB testcase by Jan Kratochvil <jan.kratochvil at redhat.com>.
++
++  subroutine f(s)
++  character*(*) s
++  s = s
++  end
++
++  program main
++  call f ('foo')
++  end
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.pascal/arrays.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pascal/arrays.exp	2016-02-15 23:36:39.359305642 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.pascal/arrays.exp	2017-02-26 19:15:36.605882373 +0100
 @@ -0,0 +1,104 @@
 +# Copyright 2008, 2009 Free Software Foundation, Inc.
 +#
@@ -2660,10 +3595,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pascal/arrays.exp
 +}
 +gdb_test "print DynArrChar" ".* = 'abcdefghijklm'" "Print dynamic array of char"
 +
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pascal/arrays.pas
+Index: gdb-7.12.50.20170207/gdb/testsuite/gdb.pascal/arrays.pas
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pascal/arrays.pas	2016-02-15 23:35:56.296999895 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/gdb.pascal/arrays.pas	2017-02-26 19:15:36.605882373 +0100
 @@ -0,0 +1,82 @@
 +{
 + Copyright 2008, 2009 Free Software Foundation, Inc.
@@ -2747,11 +3682,11 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pascal/arrays.pas
 +  s := 'test'#0'string';
 +  writeln(s); { set breakpoint 2 here }
 +end.
-Index: gdb-7.10.90.20160211/gdb/testsuite/lib/gdb.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/testsuite/lib/gdb.exp	2016-02-15 23:35:55.326993008 +0100
-+++ gdb-7.10.90.20160211/gdb/testsuite/lib/gdb.exp	2016-02-15 23:35:56.297999903 +0100
-@@ -173,6 +173,11 @@
+--- gdb-7.12.50.20170207.orig/gdb/testsuite/lib/gdb.exp	2017-02-26 19:15:28.564824836 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/lib/gdb.exp	2017-02-26 19:15:36.607882387 +0100
+@@ -178,6 +178,11 @@
  	    send_gdb "y\n"
  	    exp_continue
  	}
@@ -2763,10 +3698,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/lib/gdb.exp
  	-re "Discard symbol table from .*y or n.*$" {
  	    send_gdb "y\n"
  	    exp_continue
-Index: gdb-7.10.90.20160211/gdb/testsuite/lib/pascal.exp
+Index: gdb-7.12.50.20170207/gdb/testsuite/lib/pascal.exp
 ===================================================================
---- gdb-7.10.90.20160211.orig/gdb/testsuite/lib/pascal.exp	2016-02-15 23:33:29.830959972 +0100
-+++ gdb-7.10.90.20160211/gdb/testsuite/lib/pascal.exp	2016-02-15 23:35:56.298999910 +0100
+--- gdb-7.12.50.20170207.orig/gdb/testsuite/lib/pascal.exp	2017-02-26 19:15:28.565824844 +0100
++++ gdb-7.12.50.20170207/gdb/testsuite/lib/pascal.exp	2017-02-26 19:15:36.607882387 +0100
 @@ -37,6 +37,9 @@
      global pascal_compiler_is_fpc
      global gpc_compiler
diff --git a/gdb-vla-intel-04of23-fix.patch b/gdb-vla-intel-04of23-fix.patch
deleted file mode 100644
index 3b8d77a..0000000
--- a/gdb-vla-intel-04of23-fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Re: [PATCH 04/23] vla: make dynamic fortran arrays functional.
-https://sourceware.org/ml/gdb-patches/2014-06/msg00570.html
-
-Index: gdb-7.10.50.20151027/gdb/valarith.c
-===================================================================
---- gdb-7.10.50.20151027.orig/gdb/valarith.c	2015-11-03 20:41:48.543504999 +0100
-+++ gdb-7.10.50.20151027/gdb/valarith.c	2015-11-03 20:46:36.995238888 +0100
-@@ -193,10 +193,17 @@ value_subscripted_rvalue (struct value *
-   struct type *array_type = check_typedef (value_type (array));
-   struct type *elt_type = check_typedef (TYPE_TARGET_TYPE (array_type));
-   unsigned int elt_size = type_length_units (elt_type);
--  unsigned int elt_offs = longest_to_int (index - lowerbound);
-+  unsigned int elt_offs;
-   LONGEST elt_stride = TYPE_BYTE_STRIDE (TYPE_INDEX_TYPE (array_type));
-   struct value *v;
- 
-+  if (TYPE_NOT_ASSOCIATED (array_type))
-+    error (_("no such vector element (vector not associated)"));
-+  if (TYPE_NOT_ALLOCATED (array_type))
-+    error (_("no such vector element (vector not allocated)"));
-+
-+  elt_offs = longest_to_int (index - lowerbound);
-+
-   if (elt_stride > 0)
-     elt_offs *= elt_stride;
-   else if (elt_stride < 0)
-@@ -210,14 +217,7 @@ value_subscripted_rvalue (struct value *
- 
-   if (index < lowerbound || (!TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (array_type)
- 			     && elt_offs >= type_length_units (array_type)))
--    {
--      if (type_not_associated (array_type))
--        error (_("no such vector element (vector not associated)"));
--      else if (type_not_allocated (array_type))
--        error (_("no such vector element (vector not allocated)"));
--      else
--        error (_("no such vector element"));
--    }
-+    error (_("no such vector element"));
- 
-   if (VALUE_LVAL (array) == lval_memory && value_lazy (array))
-     v = allocate_value_lazy (elt_type);
diff --git a/gdb-vla-intel-fortran-strides.patch b/gdb-vla-intel-fortran-strides.patch
new file mode 100644
index 0000000..82389e0
--- /dev/null
+++ b/gdb-vla-intel-fortran-strides.patch
@@ -0,0 +1,1975 @@
+git diff --stat -p gdb/master...gdb/users/bheckel/fortran-strides
+dbfd7140bf4c0500d1f5d192be781f83f78f7922
+
+ gdb/dwarf2loc.c                             |  46 ++-
+ gdb/dwarf2loc.h                             |   6 +
+ gdb/dwarf2read.c                            |  13 +-
+ gdb/eval.c                                  | 391 +++++++++++++++++++++-----
+ gdb/expprint.c                              |  20 +-
+ gdb/expression.h                            |  18 +-
+ gdb/f-exp.y                                 |  42 ++-
+ gdb/f-valprint.c                            |   8 +-
+ gdb/gdbtypes.c                              |  34 ++-
+ gdb/gdbtypes.h                              |  18 +-
+ gdb/parse.c                                 |  24 +-
+ gdb/rust-exp.y                              |  12 +-
+ gdb/rust-lang.c                             |  17 +-
+ gdb/testsuite/gdb.fortran/static-arrays.exp | 421 ++++++++++++++++++++++++++++
+ gdb/testsuite/gdb.fortran/static-arrays.f90 |  55 ++++
+ gdb/testsuite/gdb.fortran/vla-ptype.exp     |   4 +
+ gdb/testsuite/gdb.fortran/vla-sizeof.exp    |   4 +
+ gdb/testsuite/gdb.fortran/vla-stride.exp    |  44 +++
+ gdb/testsuite/gdb.fortran/vla-stride.f90    |  29 ++
+ gdb/testsuite/gdb.fortran/vla.f90           |  10 +
+ gdb/valarith.c                              |  10 +-
+ gdb/valops.c                                | 197 +++++++++++--
+ gdb/value.h                                 |   2 +
+ 23 files changed, 1242 insertions(+), 183 deletions(-)
+
+Index: gdb-7.99.90.20170420/gdb/dwarf2loc.c
+===================================================================
+--- gdb-7.99.90.20170420.orig/gdb/dwarf2loc.c	2017-04-20 22:25:43.973254685 +0200
++++ gdb-7.99.90.20170420/gdb/dwarf2loc.c	2017-04-20 22:26:14.356446562 +0200
+@@ -2622,11 +2622,14 @@
+ /* See dwarf2loc.h.  */
+ 
+ int
+-dwarf2_evaluate_property (const struct dynamic_prop *prop,
++dwarf2_evaluate_property_signed (const struct dynamic_prop *prop,
+ 			  struct frame_info *frame,
+ 			  struct property_addr_info *addr_stack,
+-			  CORE_ADDR *value)
++			  CORE_ADDR *value,
++			  int is_signed)
+ {
++  int rc = 0;
++
+   if (prop == NULL)
+     return 0;
+ 
+@@ -2650,7 +2653,7 @@
+ 
+ 		*value = value_as_address (val);
+ 	      }
+-	    return 1;
++	    rc = 1;
+ 	  }
+       }
+       break;
+@@ -2672,7 +2675,7 @@
+ 	    if (!value_optimized_out (val))
+ 	      {
+ 		*value = value_as_address (val);
+-		return 1;
++		rc = 1;
+ 	      }
+ 	  }
+       }
+@@ -2680,8 +2683,8 @@
+ 
+     case PROP_CONST:
+       *value = prop->data.const_val;
+-      return 1;
+-
++      rc = 1;
++      break;
+     case PROP_ADDR_OFFSET:
+       {
+ 	struct dwarf2_property_baton *baton
+@@ -2702,11 +2705,38 @@
+ 	  val = value_at (baton->offset_info.type,
+ 			  pinfo->addr + baton->offset_info.offset);
+ 	*value = value_as_address (val);
+-	return 1;
++	rc = 1;
+       }
++      break;
++    }
++
++  if (rc == 1 && is_signed == 1)
++    {
++      /* If we have a valid return candidate and it's value is signed,
++         we have to sign-extend the value because CORE_ADDR on 64bit machine has
++         8 bytes but address size of an 32bit application is 4 bytes.  */
++      struct gdbarch * gdbarch = target_gdbarch ();
++      const int addr_bit = gdbarch_addr_bit (gdbarch);
++      const CORE_ADDR neg_mask = ((~0) <<  (addr_bit - 1));
++
++      /* Check if signed bit is set and sign-extend values.  */
++      if (*value & (neg_mask))
++	*value |= (neg_mask );
+     }
++  return rc;
++}
+ 
+-  return 0;
++int
++dwarf2_evaluate_property (const struct dynamic_prop *prop,
++			  struct frame_info *frame,
++			  struct property_addr_info *addr_stack,
++			  CORE_ADDR *value)
++{
++  return dwarf2_evaluate_property_signed (prop,
++				   frame,
++				   addr_stack,
++				   value,
++				   0);
+ }
+ 
+ /* See dwarf2loc.h.  */
+Index: gdb-7.99.90.20170420/gdb/dwarf2loc.h
+===================================================================
+--- gdb-7.99.90.20170420.orig/gdb/dwarf2loc.h	2017-04-20 22:25:43.973254685 +0200
++++ gdb-7.99.90.20170420/gdb/dwarf2loc.h	2017-04-20 22:26:14.356446562 +0200
+@@ -143,6 +143,12 @@
+ 			      struct property_addr_info *addr_stack,
+ 			      CORE_ADDR *value);
+ 
++int dwarf2_evaluate_property_signed (const struct dynamic_prop *prop,
++			      struct frame_info *frame,
++			      struct property_addr_info *addr_stack,
++			      CORE_ADDR *value,
++			      int is_signed);
++
+ /* A helper for the compiler interface that compiles a single dynamic
+    property to C code.
+ 
+Index: gdb-7.99.90.20170420/gdb/dwarf2read.c
+===================================================================
+--- gdb-7.99.90.20170420.orig/gdb/dwarf2read.c	2017-04-20 22:25:43.973254685 +0200
++++ gdb-7.99.90.20170420/gdb/dwarf2read.c	2017-04-20 22:27:08.510788562 +0200
+@@ -15268,7 +15268,7 @@
+   struct type *base_type, *orig_base_type;
+   struct type *range_type;
+   struct attribute *attr;
+-  struct dynamic_prop low, high;
++  struct dynamic_prop low, high, stride;
+   int low_default_is_valid;
+   int high_bound_is_count = 0;
+   const char *name;
+@@ -15288,7 +15288,9 @@
+ 
+   low.kind = PROP_CONST;
+   high.kind = PROP_CONST;
++  stride.kind = PROP_CONST;
+   high.data.const_val = 0;
++  stride.data.const_val = 0;
+ 
+   /* Set LOW_DEFAULT_IS_VALID if current language and DWARF version allow
+      omitting DW_AT_lower_bound.  */
+@@ -15321,6 +15323,13 @@
+       break;
+     }
+ 
++  attr = dwarf2_attr (die, DW_AT_byte_stride, cu);
++  if (attr)
++    if (!attr_to_dynamic_prop (attr, die, cu, &stride))
++        complaint (&symfile_complaints, _("Missing DW_AT_byte_stride "
++                  "- DIE at 0x%x [in module %s]"),
++             to_underlying (die->sect_off), objfile_name (cu->objfile));
++
+   attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
+   if (attr)
+     attr_to_dynamic_prop (attr, die, cu, &low);
+@@ -15397,7 +15406,7 @@
+       && !TYPE_UNSIGNED (base_type) && (high.data.const_val & negative_mask))
+     high.data.const_val |= negative_mask;
+ 
+-  range_type = create_range_type (NULL, orig_base_type, &low, &high);
++  range_type = create_range_type (NULL, orig_base_type, &low, &high, &stride);
+ 
+   if (high_bound_is_count)
+     TYPE_RANGE_DATA (range_type)->flag_upper_bound_is_count = 1;
+Index: gdb-7.99.90.20170420/gdb/eval.c
+===================================================================
+--- gdb-7.99.90.20170420.orig/gdb/eval.c	2017-04-20 22:25:43.973254685 +0200
++++ gdb-7.99.90.20170420/gdb/eval.c	2017-04-20 22:26:14.362446600 +0200
+@@ -379,29 +379,325 @@
+   return index;
+ }
+ 
++/* Evaluates any operation on Fortran arrays or strings with at least
++   one user provided parameter.  Expects the input ARRAY to be either
++   an array, or a string.  Evaluates EXP by incrementing POS, and
++   writes the content from the elt stack into a local struct.  NARGS
++   specifies number of literal or range arguments the user provided.
++   NARGS must be the same number as ARRAY has dimensions.  */
++
+ static struct value *
+-value_f90_subarray (struct value *array,
+-		    struct expression *exp, int *pos, enum noside noside)
++value_f90_subarray (struct value *array, struct expression *exp,
++		    int *pos, int nargs, enum noside noside)
+ {
+-  int pc = (*pos) + 1;
++  int i, dim_count = 0;
+   LONGEST low_bound, high_bound;
+-  struct type *range = check_typedef (TYPE_INDEX_TYPE (value_type (array)));
+-  enum range_type range_type
+-    = (enum range_type) longest_to_int (exp->elts[pc].longconst);
+- 
+-  *pos += 3;
++  struct value *new_array = array;
++  struct type *array_type = check_typedef (value_type (new_array));
++  struct type *elt_type;
++
++  typedef struct subscript_range
++  {
++    enum range_type f90_range_type;
++    LONGEST low, high, stride;
++  } subscript_range;
++
++  typedef enum subscript_kind
++  {
++    SUBSCRIPT_RANGE,    /* e.g. "(lowbound:highbound)"  */
++    SUBSCRIPT_INDEX    /* e.g. "(literal)"  */
++  } kind;
++
++  /* Local struct to hold user data for Fortran subarray dimensions.  */
++  struct subscript_store
++  {
++    /* For every dimension, we are either working on a range or an index
++       expression, so we store this info separately for later.  */
++    enum subscript_kind kind;
++
++    /* We also store either the lower and upper bound info, or the index
++       number.  Before evaluation of the input values, we do not know if we are
++       actually working on a range of ranges, or an index in a range.  So as a
++       first step we store all input in a union.  The array calculation itself
++       deals with this later on.  */
++    union element_range
++    {
++      subscript_range range;
++      LONGEST number;
++    } U;
++  } *subscript_array;
++
++  /* Check if the number of arguments provided by the user matches
++     the number of dimension of the array.  A string has only one
++     dimension.  */
++  if (nargs != calc_f77_array_dims (value_type (new_array)))
++    error (_("Wrong number of subscripts"));
++
++  subscript_array = (struct subscript_store*) alloca (sizeof (*subscript_array) * nargs);
++
++  /* Parse the user input into the SUBSCRIPT_ARRAY to store it.  We need
++     to evaluate it first, as the input is from left-to-right.  The
++     array is stored from right-to-left.  So we have to use the user
++     input in reverse order.  Later on, we need the input information to
++     re-calculate the output array.  For multi-dimensional arrays, we
++     can be dealing with any possible combination of ranges and indices
++     for every dimension.  */
++  for (i = 0; i < nargs; i++)
++    {
++      struct subscript_store *index = &subscript_array[i];
+ 
+-  if (range_type == LOW_BOUND_DEFAULT || range_type == BOTH_BOUND_DEFAULT)
+-    low_bound = TYPE_LOW_BOUND (range);
+-  else
+-    low_bound = value_as_long (evaluate_subexp (NULL_TYPE, exp, pos, noside));
++      /* The user input is a range, with or without lower and upper bound.
++	 E.g.: "p arry(2:5)", "p arry( :5)", "p arry( : )", etc.  */
++      if (exp->elts[*pos].opcode == OP_RANGE)
++	{
++	  int pc = (*pos) + 1;
++	  subscript_range *range;
+ 
+-  if (range_type == HIGH_BOUND_DEFAULT || range_type == BOTH_BOUND_DEFAULT)
+-    high_bound = TYPE_HIGH_BOUND (range);
+-  else
+-    high_bound = value_as_long (evaluate_subexp (NULL_TYPE, exp, pos, noside));
++	  index->kind = SUBSCRIPT_RANGE;
++	  range = &index->U.range;
++
++	  *pos += 3;
++	  range->f90_range_type = (enum range_type) exp->elts[pc].longconst;
++
++	  /* If a lower bound was provided by the user, the bit has been
++	     set and we can assign the value from the elt stack.  Same for
++	     upper bound.  */
++	  if ((range->f90_range_type & SUBARRAY_LOW_BOUND)
++	      == SUBARRAY_LOW_BOUND)
++	    range->low = value_as_long (evaluate_subexp (NULL_TYPE, exp,
++							 pos, noside));
++	  if ((range->f90_range_type & SUBARRAY_HIGH_BOUND)
++	      == SUBARRAY_HIGH_BOUND)
++	    range->high = value_as_long (evaluate_subexp (NULL_TYPE, exp,
++							  pos, noside));
++
++	  /* Assign the user's stride value if provided.  */
++	  if ((range->f90_range_type & SUBARRAY_STRIDE) == SUBARRAY_STRIDE)
++	    range->stride = value_as_long (evaluate_subexp (NULL_TYPE, exp,
++							     pos, noside));
++
++	  /* Assign the default stride value '1'.  */
++	  else
++	    range->stride = 1;
++
++	  /* Check the provided stride value is illegal, aka '0'.  */
++	  if (range->stride == 0)
++	    error (_("Stride must not be 0"));
++	}
++      /* User input is an index.  E.g.: "p arry(5)".  */
++      else
++	{
++	  struct value *val;
++
++	  index->kind = SUBSCRIPT_INDEX;
++
++	  /* Evaluate each subscript; it must be a legal integer in F77.  This
++	     ensures the validity of the provided index.  */
++	  val = evaluate_subexp_with_coercion (exp, pos, noside);
++	  index->U.number = value_as_long (val);
++	}
++
++    }
++
++  /* Traverse the array from right to left and set the high and low bounds
++     for later use.  */
++  for (i = nargs - 1; i >= 0; i--)
++    {
++      struct subscript_store *index = &subscript_array[i];
++      struct type *index_type = TYPE_INDEX_TYPE (array_type);
++
++      switch (index->kind)
++	{
++	case SUBSCRIPT_RANGE:
++	  {
++
++	    /* When we hit the first range specified by the user, we must
++	       treat any subsequent user entry as a range.  We simply
++	       increment DIM_COUNT which tells us how many times we are
++	       calling VALUE_SLICE_1.  */
++	    subscript_range *range = &index->U.range;
++
++	    /* If no lower bound was provided by the user, we take the
++	       default boundary.  Same for the high bound.  */
++	    if ((range->f90_range_type & SUBARRAY_LOW_BOUND) == 0)
++	      range->low = TYPE_LOW_BOUND (index_type);
++
++	    if ((range->f90_range_type & SUBARRAY_HIGH_BOUND) == 0)
++	      range->high = TYPE_HIGH_BOUND (index_type);
++
++	    /* Both user provided low and high bound have to be inside the
++	       array bounds.  Throw an error if not.  */
++	    if (range->low < TYPE_LOW_BOUND (index_type)
++		|| range->low > TYPE_HIGH_BOUND (index_type)
++		|| range->high < TYPE_LOW_BOUND (index_type)
++		|| range->high > TYPE_HIGH_BOUND (index_type))
++	      error (_("provided bound(s) outside array bound(s)"));
++
++	    /* For a negative stride the lower boundary must be larger than the
++	       upper boundary.
++	       For a positive stride the lower boundary must be smaller than the
++	       upper boundary.  */
++	    if ((range->stride < 0 && range->low < range->high)
++		|| (range->stride > 0 && range->low > range->high))
++	      error (_("Wrong value provided for stride and boundaries"));
++
++	  }
++	  break;
++
++	case SUBSCRIPT_INDEX:
++	  break;
+ 
+-  return value_slice (array, low_bound, high_bound - low_bound + 1);
++	}
++
++       array_type = TYPE_TARGET_TYPE (array_type);
++    }
++
++  /* Reset ARRAY_TYPE before slicing.*/
++  array_type = check_typedef (value_type (new_array));
++
++  /* Traverse the array from right to left and evaluate each corresponding
++     user input.  VALUE_SUBSCRIPT is called for every index, until a range
++     expression is evaluated.  After a range expression has been evaluated,
++     every subsequent expression is also treated as a range.  */
++  for (i = nargs - 1; i >= 0; i--)
++    {
++      struct subscript_store *index = &subscript_array[i];
++      struct type *index_type = TYPE_INDEX_TYPE (array_type);
++
++      switch (index->kind)
++	{
++	case SUBSCRIPT_RANGE:
++	  {
++
++	    /* When we hit the first range specified by the user, we must
++	       treat any subsequent user entry as a range.  We simply
++	       increment DIM_COUNT which tells us how many times we are
++	       calling VALUE_SLICE_1.  */
++	    subscript_range *range = &index->U.range;
++
++	    /* DIM_COUNT counts every user argument that is treated as a range.
++	       This is necessary for expressions like 'print array(7, 8:9).
++	       Here the first argument is a literal, but must be treated as a
++	       range argument to allow the correct output representation.  */
++	    dim_count++;
++
++	    new_array
++	      = value_slice_1 (new_array, range->low,
++			       range->high - range->low + 1,
++			       range->stride, dim_count);
++	  }
++	  break;
++
++	case SUBSCRIPT_INDEX:
++	  {
++	    /* DIM_COUNT only stays '0' when no range argument was processed
++	       before, starting from the last dimension.  This way we can
++	       reduce the number of dimensions from the result array.
++	       However, if a range has been processed before an index, we
++	       treat the index like a range with equal low- and high bounds
++	       to get the value offset right.  */
++	    if (dim_count == 0)
++	      new_array
++	        = value_subscripted_rvalue (new_array, index->U.number,
++					    f77_get_lowerbound (value_type
++								  (new_array)));
++	    else
++	      {
++		dim_count++;
++
++		/* We might end up here, because we have to treat the provided
++		   index like a range. But now VALUE_SUBSCRIPTED_RVALUE
++		   cannot do the range checks for us. So we have to make sure
++		   ourselves that the user provided index is inside the
++		   array bounds.  Throw an error if not.  */
++		if (index->U.number < TYPE_LOW_BOUND (index_type)
++		    && index->U.number > TYPE_HIGH_BOUND (index_type))
++		  error (_("provided bound(s) outside array bound(s)"));
++
++		if (index->U.number > TYPE_LOW_BOUND (index_type)
++		    && index->U.number > TYPE_HIGH_BOUND (index_type))
++		  error (_("provided bound(s) outside array bound(s)"));
++
++		new_array = value_slice_1 (new_array,
++					   index->U.number,
++					   1, /* COUNT is '1' element  */
++					   1, /* STRIDE set to '1'  */
++					   dim_count);
++	      }
++
++	  }
++	  break;
++	}
++      array_type = TYPE_TARGET_TYPE (array_type);
++    }
++
++  /* With DIM_COUNT > 1 we currently have a one dimensional array, but expect
++     an array of arrays, depending on how many ranges have been provided by
++     the user.  So we need to rebuild the array dimensions for printing it
++     correctly.
++     Starting from right to left in the user input, after we hit the first
++     range argument every subsequent argument is also treated as a range.
++     E.g.:
++     "p ary(3, 7, 2:15)" in Fortran has only 1 dimension, but we calculated 3
++     ranges.
++     "p ary(3, 7:12, 4)" in Fortran has only 1 dimension, but we calculated 2
++     ranges.
++     "p ary(2:4, 5, 7)" in Fortran has only 1 dimension, and we calculated 1
++     range.  */
++  if (dim_count > 1)
++    {
++      struct value *v = NULL;
++
++      elt_type = TYPE_TARGET_TYPE (value_type (new_array));
++
++      /* Every SUBSCRIPT_RANGE in the user input signifies an actual range in
++	 the output array.  So we traverse the SUBSCRIPT_ARRAY again, looking
++	 for a range entry.  When we find one, we use the range info to create
++	 an additional range_type to set the correct bounds and dimensions for
++	 the output array.  In addition, we may have a stride value that is not
++	 '1', forcing us to adjust the number of elements in a range, according
++	 to the stride value.  */
++      for (i = 0; i < nargs; i++)
++	{
++	  struct subscript_store *index = &subscript_array[i];
++
++	  if (index->kind == SUBSCRIPT_RANGE)
++	    {
++	      struct type *range_type, *interim_array_type;
++
++	      int new_length;
++
++	      /* The length of a sub-dimension with all elements between the
++		 bounds plus the start element itself.  It may be modified by
++		 a user provided stride value.  */
++	      new_length = index->U.range.high - index->U.range.low;
++
++	      new_length /= index->U.range.stride;
++
++	      range_type
++		= create_static_range_type (NULL,
++					    elt_type,
++					    index->U.range.low,
++					    index->U.range.low + new_length);
++
++	      interim_array_type = create_array_type (NULL,
++						      elt_type,
++						      range_type);
++
++	      TYPE_CODE (interim_array_type)
++		= TYPE_CODE (value_type (new_array));
++
++	      v = allocate_value (interim_array_type);
++
++	      elt_type = value_type (v);
++	    }
++
++	}
++      value_contents_copy (v, 0, new_array, 0, TYPE_LENGTH (elt_type));
++      return v;
++    }
++
++  return new_array;
+ }
+ 
+ 
+@@ -1790,19 +2086,8 @@
+       switch (code)
+ 	{
+ 	case TYPE_CODE_ARRAY:
+-	  if (exp->elts[*pos].opcode == OP_RANGE)
+-	    return value_f90_subarray (arg1, exp, pos, noside);
+-	  else
+-	    goto multi_f77_subscript;
+-
+ 	case TYPE_CODE_STRING:
+-	  if (exp->elts[*pos].opcode == OP_RANGE)
+-	    return value_f90_subarray (arg1, exp, pos, noside);
+-	  else
+-	    {
+-	      arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
+-	      return value_subscript (arg1, value_as_long (arg2));
+-	    }
++	  return value_f90_subarray (arg1, exp, pos, nargs, noside);
+ 
+ 	case TYPE_CODE_PTR:
+ 	case TYPE_CODE_FUNC:
+@@ -2203,49 +2488,6 @@
+ 	}
+       return (arg1);
+ 
+-    multi_f77_subscript:
+-      {
+-	LONGEST subscript_array[MAX_FORTRAN_DIMS];
+-	int ndimensions = 1, i;
+-	struct value *array = arg1;
+-
+-	if (nargs > MAX_FORTRAN_DIMS)
+-	  error (_("Too many subscripts for F77 (%d Max)"), MAX_FORTRAN_DIMS);
+-
+-	ndimensions = calc_f77_array_dims (type);
+-
+-	if (nargs != ndimensions)
+-	  error (_("Wrong number of subscripts"));
+-
+-	gdb_assert (nargs > 0);
+-
+-	/* Now that we know we have a legal array subscript expression 
+-	   let us actually find out where this element exists in the array.  */
+-
+-	/* Take array indices left to right.  */
+-	for (i = 0; i < nargs; i++)
+-	  {
+-	    /* Evaluate each subscript; it must be a legal integer in F77.  */
+-	    arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
+-
+-	    /* Fill in the subscript array.  */
+-
+-	    subscript_array[i] = value_as_long (arg2);
+-	  }
+-
+-	/* Internal type of array is arranged right to left.  */
+-	for (i = nargs; i > 0; i--)
+-	  {
+-	    struct type *array_type = check_typedef (value_type (array));
+-	    LONGEST index = subscript_array[i - 1];
+-
+-	    array = value_subscripted_rvalue (array, index,
+-					      f77_get_lowerbound (array_type));
+-	  }
+-
+-	return array;
+-      }
+-
+     case BINOP_LOGICAL_AND:
+       arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+       if (noside == EVAL_SKIP)
+@@ -3102,6 +3344,9 @@
+   int ndimen = 1;
+   struct type *tmp_type;
+ 
++  if (TYPE_CODE (array_type) == TYPE_CODE_STRING)
++    return 1;
++
+   if ((TYPE_CODE (array_type) != TYPE_CODE_ARRAY))
+     error (_("Can't get dimensions for a non-array type"));
+ 
+Index: gdb-7.99.90.20170420/gdb/expprint.c
+===================================================================
+--- gdb-7.99.90.20170420.orig/gdb/expprint.c	2017-04-20 22:25:43.973254685 +0200
++++ gdb-7.99.90.20170420/gdb/expprint.c	2017-04-20 22:26:14.363446607 +0200
+@@ -568,12 +568,10 @@
+ 	*pos += 2;
+ 
+ 	fputs_filtered ("RANGE(", stream);
+-	if (range_type == HIGH_BOUND_DEFAULT
+-	    || range_type == NONE_BOUND_DEFAULT)
++	if ((range_type & SUBARRAY_LOW_BOUND) == SUBARRAY_LOW_BOUND)
+ 	  print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
+ 	fputs_filtered ("..", stream);
+-	if (range_type == LOW_BOUND_DEFAULT
+-	    || range_type == NONE_BOUND_DEFAULT)
++	if ((range_type & SUBARRAY_HIGH_BOUND) == SUBARRAY_HIGH_BOUND)
+ 	  print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
+ 	fputs_filtered (")", stream);
+ 	return;
+@@ -1055,16 +1053,16 @@
+ 
+ 	switch (range_type)
+ 	  {
+-	  case BOTH_BOUND_DEFAULT:
++	  case SUBARRAY_NONE_BOUND:
+ 	    fputs_filtered ("Range '..'", stream);
+ 	    break;
+-	  case LOW_BOUND_DEFAULT:
++	  case SUBARRAY_HIGH_BOUND:
+ 	    fputs_filtered ("Range '..EXP'", stream);
+ 	    break;
+-	  case HIGH_BOUND_DEFAULT:
++	  case SUBARRAY_LOW_BOUND:
+ 	    fputs_filtered ("Range 'EXP..'", stream);
+ 	    break;
+-	  case NONE_BOUND_DEFAULT:
++	  case (SUBARRAY_LOW_BOUND | SUBARRAY_HIGH_BOUND):
+ 	    fputs_filtered ("Range 'EXP..EXP'", stream);
+ 	    break;
+ 	  default:
+@@ -1072,11 +1070,9 @@
+ 	    break;
+ 	  }
+ 
+-	if (range_type == HIGH_BOUND_DEFAULT
+-	    || range_type == NONE_BOUND_DEFAULT)
++	if ((range_type & SUBARRAY_LOW_BOUND) == SUBARRAY_LOW_BOUND)
+ 	  elt = dump_subexp (exp, stream, elt);
+-	if (range_type == LOW_BOUND_DEFAULT
+-	    || range_type == NONE_BOUND_DEFAULT)
++	if ((range_type & SUBARRAY_HIGH_BOUND) == SUBARRAY_HIGH_BOUND)
+ 	  elt = dump_subexp (exp, stream, elt);
+       }
+       break;
+Index: gdb-7.99.90.20170420/gdb/expression.h
+===================================================================
+--- gdb-7.99.90.20170420.orig/gdb/expression.h	2017-04-20 22:25:43.973254685 +0200
++++ gdb-7.99.90.20170420/gdb/expression.h	2017-04-20 22:26:14.363446607 +0200
+@@ -154,17 +154,17 @@
+ 				 struct ui_file *, const char *);
+ extern void dump_prefix_expression (struct expression *, struct ui_file *);
+ 
+-/* In an OP_RANGE expression, either bound could be empty, indicating
+-   that its value is by default that of the corresponding bound of the
+-   array or string.  So we have four sorts of subrange.  This
+-   enumeration type is to identify this.  */
+-   
++/* In an OP_RANGE expression, either bound can be provided by the user, or not.
++   In addition to this, the user can also specify a stride value to indicated
++   only certain elements of the array.  This enumeration type is to identify
++   this.  */
++
+ enum range_type
+   {
+-    BOTH_BOUND_DEFAULT,		/* "(:)"  */
+-    LOW_BOUND_DEFAULT,		/* "(:high)"  */
+-    HIGH_BOUND_DEFAULT,		/* "(low:)"  */
+-    NONE_BOUND_DEFAULT		/* "(low:high)"  */
++    SUBARRAY_NONE_BOUND = 0x0,		/* "( : )"  */
++    SUBARRAY_LOW_BOUND = 0x1,		/* "(low:)"  */
++    SUBARRAY_HIGH_BOUND = 0x2,		/* "(:high)"  */
++    SUBARRAY_STRIDE = 0x4		/* "(::stride)"  */
+   };
+ 
+ #endif /* !defined (EXPRESSION_H) */
+Index: gdb-7.99.90.20170420/gdb/f-exp.y
+===================================================================
+--- gdb-7.99.90.20170420.orig/gdb/f-exp.y	2017-04-20 22:25:43.973254685 +0200
++++ gdb-7.99.90.20170420/gdb/f-exp.y	2017-04-20 22:26:14.363446607 +0200
+@@ -254,31 +254,63 @@
+    
+ arglist	:	arglist ',' exp   %prec ABOVE_COMMA
+ 			{ arglist_len++; }
++	|	arglist ',' subrange	%prec ABOVE_COMMA
++			{ arglist_len++; }
+ 	;
+ 
+ /* There are four sorts of subrange types in F90.  */
+ 
+ subrange:	exp ':' exp	%prec ABOVE_COMMA
+-			{ write_exp_elt_opcode (pstate, OP_RANGE); 
+-			  write_exp_elt_longcst (pstate, NONE_BOUND_DEFAULT);
++			{ write_exp_elt_opcode (pstate, OP_RANGE);
++			  write_exp_elt_longcst (pstate,
++						 SUBARRAY_LOW_BOUND | SUBARRAY_HIGH_BOUND);
+ 			  write_exp_elt_opcode (pstate, OP_RANGE); }
+ 	;
+ 
+ subrange:	exp ':'	%prec ABOVE_COMMA
+ 			{ write_exp_elt_opcode (pstate, OP_RANGE);
+-			  write_exp_elt_longcst (pstate, HIGH_BOUND_DEFAULT);
++			  write_exp_elt_longcst (pstate, SUBARRAY_LOW_BOUND);
+ 			  write_exp_elt_opcode (pstate, OP_RANGE); }
+ 	;
+ 
+ subrange:	':' exp	%prec ABOVE_COMMA
+ 			{ write_exp_elt_opcode (pstate, OP_RANGE);
+-			  write_exp_elt_longcst (pstate, LOW_BOUND_DEFAULT);
++			  write_exp_elt_longcst (pstate, SUBARRAY_HIGH_BOUND);
+ 			  write_exp_elt_opcode (pstate, OP_RANGE); }
+ 	;
+ 
+ subrange:	':'	%prec ABOVE_COMMA
+ 			{ write_exp_elt_opcode (pstate, OP_RANGE);
+-			  write_exp_elt_longcst (pstate, BOTH_BOUND_DEFAULT);
++			  write_exp_elt_longcst (pstate, SUBARRAY_NONE_BOUND);
++			  write_exp_elt_opcode (pstate, OP_RANGE); }
++	;
++
++/* Each subrange type can have a stride argument.  */
++subrange:	exp ':' exp ':' exp %prec ABOVE_COMMA
++			{ write_exp_elt_opcode (pstate, OP_RANGE);
++			  write_exp_elt_longcst (pstate, SUBARRAY_LOW_BOUND
++						 | SUBARRAY_HIGH_BOUND
++						 | SUBARRAY_STRIDE);
++			  write_exp_elt_opcode (pstate, OP_RANGE); }
++	;
++
++subrange:	exp ':' ':' exp %prec ABOVE_COMMA
++			{ write_exp_elt_opcode (pstate, OP_RANGE);
++			  write_exp_elt_longcst (pstate, SUBARRAY_LOW_BOUND
++						 | SUBARRAY_STRIDE);
++			  write_exp_elt_opcode (pstate, OP_RANGE); }
++	;
++
++subrange:	':' exp ':' exp %prec ABOVE_COMMA
++			{ write_exp_elt_opcode (pstate, OP_RANGE);
++			  write_exp_elt_longcst (pstate, SUBARRAY_HIGH_BOUND
++						 | SUBARRAY_STRIDE);
++			  write_exp_elt_opcode (pstate, OP_RANGE); }
++	;
++
++subrange:	':' ':' exp %prec ABOVE_COMMA
++			{ write_exp_elt_opcode (pstate, OP_RANGE);
++			  write_exp_elt_longcst (pstate, SUBARRAY_STRIDE);
+ 			  write_exp_elt_opcode (pstate, OP_RANGE); }
+ 	;
+ 
+Index: gdb-7.99.90.20170420/gdb/f-valprint.c
+===================================================================
+--- gdb-7.99.90.20170420.orig/gdb/f-valprint.c	2017-04-20 22:25:43.973254685 +0200
++++ gdb-7.99.90.20170420/gdb/f-valprint.c	2017-04-20 22:26:14.364446613 +0200
+@@ -121,8 +121,14 @@
+ 
+   if (nss != ndimensions)
+     {
+-      size_t dim_size = TYPE_LENGTH (TYPE_TARGET_TYPE (type));
++      size_t dim_size;
+       size_t offs = 0;
++      LONGEST byte_stride = abs (TYPE_BYTE_STRIDE (range_type));
++
++      if (byte_stride)
++        dim_size = byte_stride;
++      else
++        dim_size = TYPE_LENGTH (TYPE_TARGET_TYPE (type));
+ 
+       for (i = lowerbound;
+ 	   (i < upperbound + 1 && (*elts) < options->print_max);
+Index: gdb-7.99.90.20170420/gdb/gdbtypes.c
+===================================================================
+--- gdb-7.99.90.20170420.orig/gdb/gdbtypes.c	2017-04-20 22:25:43.973254685 +0200
++++ gdb-7.99.90.20170420/gdb/gdbtypes.c	2017-04-20 22:26:14.365446619 +0200
+@@ -862,7 +862,8 @@
+ struct type *
+ create_range_type (struct type *result_type, struct type *index_type,
+ 		   const struct dynamic_prop *low_bound,
+-		   const struct dynamic_prop *high_bound)
++		   const struct dynamic_prop *high_bound,
++		   const struct dynamic_prop *stride)
+ {
+   if (result_type == NULL)
+     result_type = alloc_type_copy (index_type);
+@@ -877,6 +878,7 @@
+     TYPE_ZALLOC (result_type, sizeof (struct range_bounds));
+   TYPE_RANGE_DATA (result_type)->low = *low_bound;
+   TYPE_RANGE_DATA (result_type)->high = *high_bound;
++  TYPE_RANGE_DATA (result_type)->stride = *stride;
+ 
+   if (low_bound->kind == PROP_CONST && low_bound->data.const_val >= 0)
+     TYPE_UNSIGNED (result_type) = 1;
+@@ -905,7 +907,7 @@
+ create_static_range_type (struct type *result_type, struct type *index_type,
+ 			  LONGEST low_bound, LONGEST high_bound)
+ {
+-  struct dynamic_prop low, high;
++  struct dynamic_prop low, high, stride;
+ 
+   low.kind = PROP_CONST;
+   low.data.const_val = low_bound;
+@@ -913,7 +915,11 @@
+   high.kind = PROP_CONST;
+   high.data.const_val = high_bound;
+ 
+-  result_type = create_range_type (result_type, index_type, &low, &high);
++  stride.kind = PROP_CONST;
++  stride.data.const_val = 0;
++
++  result_type = create_range_type (result_type, index_type,
++                                   &low, &high, &stride);
+ 
+   return result_type;
+ }
+@@ -1110,16 +1116,20 @@
+       && (!type_not_associated (result_type)
+ 	  && !type_not_allocated (result_type)))
+     {
+-      LONGEST low_bound, high_bound;
++      LONGEST low_bound, high_bound, byte_stride;
+ 
+       if (get_discrete_bounds (range_type, &low_bound, &high_bound) < 0)
+ 	low_bound = high_bound = 0;
+       element_type = check_typedef (element_type);
++      byte_stride = abs (TYPE_BYTE_STRIDE (range_type));
++
+       /* Be careful when setting the array length.  Ada arrays can be
+ 	 empty arrays with the high_bound being smaller than the low_bound.
+ 	 In such cases, the array length should be zero.  */
+       if (high_bound < low_bound)
+ 	TYPE_LENGTH (result_type) = 0;
++      else if (byte_stride > 0)
++	TYPE_LENGTH (result_type) = byte_stride * (high_bound - low_bound + 1);
+       else if (bit_stride > 0)
+ 	TYPE_LENGTH (result_type) =
+ 	  (bit_stride * (high_bound - low_bound + 1) + 7) / 8;
+@@ -1912,12 +1922,12 @@
+   CORE_ADDR value;
+   struct type *static_range_type, *static_target_type;
+   const struct dynamic_prop *prop;
+-  struct dynamic_prop low_bound, high_bound;
++  struct dynamic_prop low_bound, high_bound, stride;
+ 
+   gdb_assert (TYPE_CODE (dyn_range_type) == TYPE_CODE_RANGE);
+ 
+   prop = &TYPE_RANGE_DATA (dyn_range_type)->low;
+-  if (dwarf2_evaluate_property (prop, NULL, addr_stack, &value))
++  if (dwarf2_evaluate_property_signed (prop, NULL, addr_stack, &value, 1))
+     {
+       low_bound.kind = PROP_CONST;
+       low_bound.data.const_val = value;
+@@ -1929,7 +1939,7 @@
+     }
+ 
+   prop = &TYPE_RANGE_DATA (dyn_range_type)->high;
+-  if (dwarf2_evaluate_property (prop, NULL, addr_stack, &value))
++  if (dwarf2_evaluate_property_signed (prop, NULL, addr_stack, &value, 1))
+     {
+       high_bound.kind = PROP_CONST;
+       high_bound.data.const_val = value;
+@@ -1944,12 +1954,20 @@
+       high_bound.data.const_val = 0;
+     }
+ 
++  prop = &TYPE_RANGE_DATA (dyn_range_type)->stride;
++  if (dwarf2_evaluate_property_signed (prop, NULL, addr_stack, &value, 1))
++    {
++      stride.kind = PROP_CONST;
++      stride.data.const_val = value;
++    }
++
+   static_target_type
+     = resolve_dynamic_type_internal (TYPE_TARGET_TYPE (dyn_range_type),
+ 				     addr_stack, 0);
+   static_range_type = create_range_type (copy_type (dyn_range_type),
+ 					 static_target_type,
+-					 &low_bound, &high_bound);
++					 &low_bound, &high_bound, &stride);
++
+   TYPE_RANGE_DATA (static_range_type)->flag_bound_evaluated = 1;
+   return static_range_type;
+ }
+Index: gdb-7.99.90.20170420/gdb/gdbtypes.h
+===================================================================
+--- gdb-7.99.90.20170420.orig/gdb/gdbtypes.h	2017-04-20 22:25:43.973254685 +0200
++++ gdb-7.99.90.20170420/gdb/gdbtypes.h	2017-04-20 22:26:14.365446619 +0200
+@@ -551,6 +551,10 @@
+ 
+   struct dynamic_prop high;
+ 
++  /* * Stride of range.  */
++
++  struct dynamic_prop stride;
++
+   /* True if HIGH range bound contains the number of elements in the
+      subrange. This affects how the final hight bound is computed.  */
+ 
+@@ -713,7 +717,6 @@
+     /* * Union member used for range types.  */
+ 
+     struct range_bounds *bounds;
+-
+   } flds_bnds;
+ 
+   /* * Slot to point to additional language-specific fields of this
+@@ -1228,6 +1231,15 @@
+   TYPE_RANGE_DATA(range_type)->high.kind
+ #define TYPE_LOW_BOUND_KIND(range_type) \
+   TYPE_RANGE_DATA(range_type)->low.kind
++#define TYPE_BYTE_STRIDE(range_type) \
++  TYPE_RANGE_DATA(range_type)->stride.data.const_val
++#define TYPE_BYTE_STRIDE_BLOCK(range_type) \
++  TYPE_RANGE_DATA(range_type)->stride.data.locexpr
++#define TYPE_BYTE_STRIDE_LOCLIST(range_type) \
++  TYPE_RANGE_DATA(range_type)->stride.data.loclist
++#define TYPE_BYTE_STRIDE_KIND(range_type) \
++  TYPE_RANGE_DATA(range_type)->stride.kind
++
+ 
+ /* Property accessors for the type data location.  */
+ #define TYPE_DATA_LOCATION(thistype) \
+@@ -1262,6 +1274,9 @@
+    TYPE_HIGH_BOUND_UNDEFINED(TYPE_INDEX_TYPE(arraytype))
+ #define TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED(arraytype) \
+    TYPE_LOW_BOUND_UNDEFINED(TYPE_INDEX_TYPE(arraytype))
++#define TYPE_ARRAY_STRIDE_IS_UNDEFINED(arraytype) \
++   (TYPE_BYTE_STRIDE(TYPE_INDEX_TYPE(arraytype)) == 0)
++
+ 
+ #define TYPE_ARRAY_UPPER_BOUND_VALUE(arraytype) \
+    (TYPE_HIGH_BOUND(TYPE_INDEX_TYPE((arraytype))))
+@@ -1776,6 +1791,7 @@
+ 
+ extern struct type *create_range_type (struct type *, struct type *,
+ 				       const struct dynamic_prop *,
++				       const struct dynamic_prop *,
+ 				       const struct dynamic_prop *);
+ 
+ extern struct type *create_array_type (struct type *, struct type *,
+Index: gdb-7.99.90.20170420/gdb/parse.c
+===================================================================
+--- gdb-7.99.90.20170420.orig/gdb/parse.c	2017-04-20 22:25:43.973254685 +0200
++++ gdb-7.99.90.20170420/gdb/parse.c	2017-04-20 22:26:14.366446625 +0200
+@@ -1007,22 +1007,20 @@
+ 
+     case OP_RANGE:
+       oplen = 3;
++      args = 0;
+       range_type = (enum range_type)
+ 	longest_to_int (expr->elts[endpos - 2].longconst);
+ 
<Skipped 4397 lines>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gdb.git/commitdiff/140f805741d2bd11d6ac79fc01f702a0fcd419be



More information about the pld-cvs-commit mailing list