From ae739bf8b5274c3f40a7b0239be384c02320be85 Mon Sep 17 00:00:00 2001
From: Patrick Monnerat <pm@datasphere.ch>
Date: Wed, 8 Apr 2015 12:12:20 +0200
Subject: [PATCH] Upgrade submodule. Update patches accordingly.

---
 binutils-gdb                                 |  2 +-
 patches/binutils-gdb/001-itcltk4.patch       | 16 ++++++++--------
 patches/binutils-gdb/004-tcltkplatform.patch |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/binutils-gdb b/binutils-gdb
index 41f98f0..4496bed 160000
--- a/binutils-gdb
+++ b/binutils-gdb
@@ -1 +1 @@
-Subproject commit 41f98f0276aede918c3aca37aa6371c8a3c9fbe7
+Subproject commit 4496bed7f346afbb2f2b4f939373920a4d69da11
diff --git a/patches/binutils-gdb/001-itcltk4.patch b/patches/binutils-gdb/001-itcltk4.patch
index 614d521..b5a53e9 100644
--- a/patches/binutils-gdb/001-itcltk4.patch
+++ b/patches/binutils-gdb/001-itcltk4.patch
@@ -13,7 +13,7 @@ diff -Naurp a/configure.ac b/configure.ac
  
  # these tools are built for the host environment
  # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
-@@ -257,7 +257,7 @@ fi
+@@ -259,7 +259,7 @@ fi
  case ${with_x} in
    yes | "") ;; # the default value for this tree is that X11 is available
    no)
@@ -22,7 +22,7 @@ diff -Naurp a/configure.ac b/configure.ac
      # We won't be able to build gdbtk without X.
      enable_gdbtk=no 
      ;;
-@@ -398,21 +398,6 @@ case "${host}" in
+@@ -400,21 +400,6 @@ case "${host}" in
      configdirs="$configdirs libtermcap" ;;
  esac
  
@@ -44,7 +44,7 @@ diff -Naurp a/configure.ac b/configure.ac
  AC_ARG_ENABLE(libquadmath,
  AS_HELP_STRING([--disable-libquadmath],
    [do not build libquadmath directory]),
-@@ -1047,7 +1032,7 @@ case "${target}" in
+@@ -1049,7 +1034,7 @@ case "${target}" in
      ;;
      # The tpf target doesn't support gdb yet.
    *-*-tpf*)
@@ -53,7 +53,7 @@ diff -Naurp a/configure.ac b/configure.ac
      ;;
    *-*-uclinux*)
      noconfigdirs="$noconfigdirs target-rda"
-@@ -1067,7 +1052,7 @@ case "${target}" in
+@@ -1069,7 +1054,7 @@ case "${target}" in
      noconfigdirs="$noconfigdirs target-newlib target-libgloss"
      ;;
    sh*-*-pe|mips*-*-pe|*arm-wince-pe)
@@ -62,7 +62,7 @@ diff -Naurp a/configure.ac b/configure.ac
      ;;
    arc-*-*|arceb-*-*)
      noconfigdirs="$noconfigdirs target-libgloss"
-@@ -1136,15 +1121,15 @@ case "${target}" in
+@@ -1138,15 +1123,15 @@ case "${target}" in
      ;;
    ia64*-*-elf*)
      # No gdb support yet.
@@ -81,7 +81,7 @@ diff -Naurp a/configure.ac b/configure.ac
      ;;
    i[[3456789]]86-w64-mingw*)
      ;;
-@@ -1196,13 +1181,13 @@ case "${target}" in
+@@ -1198,13 +1183,13 @@ case "${target}" in
      ;;
    powerpc*-*-winnt* | powerpc*-*-pe*)
      target_configdirs="$target_configdirs target-winsup"
@@ -97,7 +97,7 @@ diff -Naurp a/configure.ac b/configure.ac
      ;;
    powerpc-*-beos*)
      noconfigdirs="$noconfigdirs gdb"
-@@ -2722,7 +2707,7 @@ if echo " ${target_configdirs} " | grep
+@@ -2724,7 +2709,7 @@ if echo " ${target_configdirs} " | grep
    bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
  fi
  
@@ -106,7 +106,7 @@ diff -Naurp a/configure.ac b/configure.ac
  # Use 'maybe' since enable_gdbtk might be true even if tk isn't available
  # and in that case we want gdb to be built without tk.  Ugh!
  # In fact I believe gdb is the *only* package directly dependent on tk,
-@@ -2730,7 +2715,7 @@ fi
+@@ -2732,7 +2717,7 @@ fi
  # leave out the maybe dependencies when enable_gdbtk is false.  I'm not
  # 100% sure that that's safe though.
  
diff --git a/patches/binutils-gdb/004-tcltkplatform.patch b/patches/binutils-gdb/004-tcltkplatform.patch
index e89cf82..6049325 100644
--- a/patches/binutils-gdb/004-tcltkplatform.patch
+++ b/patches/binutils-gdb/004-tcltkplatform.patch
@@ -93,7 +93,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
-@@ -2192,60 +2192,32 @@ if test "${enable_gdbtk}" = "yes"; then
+@@ -2187,60 +2187,32 @@ if test "${enable_gdbtk}" = "yes"; then
      if test -z "${no_tcl}" -a -z "${no_tk}"; then
  	SC_LOAD_TCLCONFIG
  
@@ -173,7 +173,7 @@ diff -Naurp a/gdb/configure.ac b/gdb/configure.ac
 diff -Naurp a/gdb/Makefile.in b/gdb/Makefile.in
 --- a/gdb/Makefile.in	2015-03-09 14:32:57.315694895 +0100
 +++ b/gdb/Makefile.in	2015-03-13 16:09:14.734115086 +0100
-@@ -513,7 +513,7 @@ SUBDIR_GDBTK_SRCS = \
+@@ -516,7 +516,7 @@ SUBDIR_GDBTK_SRCS = \
  	gdbtk/generic/gdbtk-main.c
  SUBDIR_GDBTK_DEPS = $(LIBGUI) $(TCL_DEPS) $(TK_DEPS)
  SUBDIR_GDBTK_LDFLAGS=
-- 
2.43.5