Upgrade submodule. Adjust code and patch accordingly.

* gdbtk/generic/gdbtk-bp.c (tracepoint_exists): New parameter to decode_line_1()
* gdbtk/generic/gdbtk-cmds.c (gdb_get_line_command): Likewise
  (gdb_get_file_command): Likewise
  (gdb_get_function_command): Likewise
* gdbtk/generic/gdbtk-stack.c (gdb_get_vars_command): Likewise

diff --git a/binutils-gdb b/binutils-gdb
index 9c03a84f6cc54af01d4fe655f6e0a0aa13d8ef74..be56871ee8f65c51b9eee611532ed036a71a72e0 160000 (submodule)
--- a/binutils-gdb
+++ b/binutils-gdb
@@ -1 +1 @@
-Subproject commit 9c03a84f6cc54af01d4fe655f6e0a0aa13d8ef74
+Subproject commit be56871ee8f65c51b9eee611532ed036a71a72e0

diff --git a/gdbtk/generic/gdbtk-bp.c b/gdbtk/generic/gdbtk-bp.c
index 12f7fa23e4051040e064e321177c98e1614a2faa..f0554d54c031e3c859054ebaf8144522e1f26aa3 100644 (file)
--- a/gdbtk/generic/gdbtk-bp.c
+++ b/gdbtk/generic/gdbtk-bp.c
@@ -849,7 +849,7 @@ tracepoint_exists (char *args)
 
   location = string_to_event_location (&args, current_language);
   cleanup = make_cleanup_delete_event_location (location);
-  sals = decode_line_1 (location, DECODE_LINE_FUNFIRSTLINE, NULL, 0);
+  sals = decode_line_1 (location, DECODE_LINE_FUNFIRSTLINE, NULL, NULL, 0);
   if (sals.nelts == 1)
     {
       resolve_sal_pc (&sals.sals[0]);

diff --git a/gdbtk/generic/gdbtk-cmds.c b/gdbtk/generic/gdbtk-cmds.c
index d0635987d30d0a940d434d157d9a42c285ee53e5..5dd9563e337f16d18b81f52341a94b47ef94dd46 100644 (file)
--- a/gdbtk/generic/gdbtk-cmds.c
+++ b/gdbtk/generic/gdbtk-cmds.c
@@ -1024,7 +1024,7 @@ gdb_get_line_command (ClientData clientData, Tcl_Interp *interp,
   args = Tcl_GetStringFromObj (objv[1], NULL);
   location = string_to_event_location (&args, current_language);
   cleanup = make_cleanup_delete_event_location (location);
-  sals = decode_line_1 (location, DECODE_LINE_FUNFIRSTLINE, NULL, 0);
+  sals = decode_line_1 (location, DECODE_LINE_FUNFIRSTLINE, NULL, NULL, 0);
   if (sals.nelts == 1)
     Tcl_SetIntObj (result_ptr->obj_ptr, sals.sals[0].line);
   else
@@ -1063,7 +1063,7 @@ gdb_get_file_command (ClientData clientData, Tcl_Interp *interp,
   args = Tcl_GetStringFromObj (objv[1], NULL);
   location = string_to_event_location (&args, current_language);
   cleanup = make_cleanup_delete_event_location (location);
-  sals = decode_line_1 (location, DECODE_LINE_FUNFIRSTLINE, NULL, 0);
+  sals = decode_line_1 (location, DECODE_LINE_FUNFIRSTLINE, NULL, NULL, 0);
   if (sals.nelts == 1)
     Tcl_SetStringObj (result_ptr->obj_ptr, sals.sals[0].symtab->filename, -1);
   else
@@ -1101,7 +1101,7 @@ gdb_get_function_command (ClientData clientData, Tcl_Interp *interp,
   args = Tcl_GetStringFromObj (objv[1], NULL);
   location = string_to_event_location (&args, current_language);
   cleanup = make_cleanup_delete_event_location (location);
-  sals = decode_line_1 (location, DECODE_LINE_FUNFIRSTLINE, NULL, 0);
+  sals = decode_line_1 (location, DECODE_LINE_FUNFIRSTLINE, NULL, NULL, 0);
   if (sals.nelts == 1)
     {
       resolve_sal_pc (&sals.sals[0]);

diff --git a/gdbtk/generic/gdbtk-stack.c b/gdbtk/generic/gdbtk-stack.c
index 35645702985e3c78153fb030c55180a68ed7b665..ebfdffe95a78cd864ee5d2cb9e716b07213bd066 100644 (file)
--- a/gdbtk/generic/gdbtk-stack.c
+++ b/gdbtk/generic/gdbtk-stack.c
@@ -311,7 +311,7 @@ gdb_get_vars_command (ClientData clientData, Tcl_Interp *interp,
       args = Tcl_GetStringFromObj (objv[1], NULL);
       location = string_to_event_location (&args, current_language);
       make_cleanup_delete_event_location (location);
-      sals = decode_line_1 (location, DECODE_LINE_FUNFIRSTLINE, NULL, 0);
+      sals = decode_line_1 (location, DECODE_LINE_FUNFIRSTLINE, NULL, NULL, 0);
       if (sals.nelts == 0)
        {
          gdbtk_set_result (interp, "error decoding line");

diff --git a/patches/binutils-gdb/004-tcltkplatform.patch b/patches/binutils-gdb/004-tcltkplatform.patch
index c926045f6308cbbf13ec8d7a43867308ef29a74e..00fcb0daf1dfa55ac62d32370ff59ab52bff1cf3 100644 (file)
--- a/patches/binutils-gdb/004-tcltkplatform.patch
+++ b/patches/binutils-gdb/004-tcltkplatform.patch
@@ -96,7 +96,7 @@ diff -Naurp a/gdb/acinclude.m4 b/gdb/acinclude.m4
 diff -Naurp a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac 2015-03-09 14:32:57.356695263 +0100
 +++ b/gdb/configure.ac 2015-03-13 16:09:14.733115076 +0100
-@@ -2028,60 +2028,32 @@ if test "${enable_gdbtk}" = "yes"; then
+@@ -2036,60 +2036,32 @@ if test "${enable_gdbtk}" = "yes"; then
      if test -z "${no_tcl}" -a -z "${no_tk}"; then
        SC_LOAD_TCLCONFIG