From 5718ea276f857437905730c747b1c53dfb553f65 Mon Sep 17 00:00:00 2001 From: Patrick Monnerat Date: Fri, 7 Aug 2015 12:18:07 +0200 Subject: [PATCH] Upgrade submodule. Update patches accordingly. --- binutils-gdb | 2 +- patches/binutils-gdb/001-itcltk4.patch | 6 +++--- patches/binutils-gdb/004-tcltkplatform.patch | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/binutils-gdb b/binutils-gdb index 22d31b1..0b45135 160000 --- a/binutils-gdb +++ b/binutils-gdb @@ -1 +1 @@ -Subproject commit 22d31b1192bb38c766e349e5eed1a82298cc2c1f +Subproject commit 0b45135ec1364f9d0c850a52ce05cf4ffb038021 diff --git a/patches/binutils-gdb/001-itcltk4.patch b/patches/binutils-gdb/001-itcltk4.patch index a0c5866..0122314 100644 --- a/patches/binutils-gdb/001-itcltk4.patch +++ b/patches/binutils-gdb/001-itcltk4.patch @@ -142,7 +142,7 @@ diff -Naurp a/Makefile.def b/Makefile.def host_modules= { module= ld; bootstrap=true; }; host_modules= { module= libbacktrace; bootstrap=true; }; host_modules= { module= libcpp; bootstrap=true; }; -@@ -110,7 +107,6 @@ host_modules= { module= zlib; no_install +@@ -113,7 +110,6 @@ host_modules= { module= zlib; no_install host_modules= { module= gdb; }; host_modules= { module= expect; }; host_modules= { module= guile; }; @@ -150,7 +150,7 @@ diff -Naurp a/Makefile.def b/Makefile.def host_modules= { module= libtermcap; no_check=true; missing=mostlyclean; missing=clean; -@@ -393,12 +389,6 @@ dependencies = { module=all-gdb; on=all- +@@ -402,12 +398,6 @@ dependencies = { module=all-gdb; on=all- dependencies = { module=all-gdb; on=all-libdecnumber; }; dependencies = { module=all-gdb; on=all-libtermcap; }; @@ -163,7 +163,7 @@ diff -Naurp a/Makefile.def b/Makefile.def // Host modules specific to binutils. dependencies = { module=configure-bfd; on=configure-libiberty; hard=true; }; dependencies = { module=configure-bfd; on=configure-intl; }; -@@ -467,35 +457,11 @@ dependencies = { module=all-opcodes; on= +@@ -476,35 +466,11 @@ dependencies = { module=all-opcodes; on= dependencies = { module=all-opcodes; on=all-intl; }; // Other host modules in the 'src' repository. diff --git a/patches/binutils-gdb/004-tcltkplatform.patch b/patches/binutils-gdb/004-tcltkplatform.patch index 2534b55..b90506a 100644 --- a/patches/binutils-gdb/004-tcltkplatform.patch +++ b/patches/binutils-gdb/004-tcltkplatform.patch @@ -1,7 +1,7 @@ diff -Naurp a/gdb/acinclude.m4 b/gdb/acinclude.m4 --- a/gdb/acinclude.m4 2015-03-03 13:23:50.771005619 +0100 +++ b/gdb/acinclude.m4 2015-03-13 16:10:43.167922450 +0100 -@@ -367,44 +367,76 @@ fi +@@ -244,44 +244,76 @@ fi ]) dnl Find the location of the private Tcl headers @@ -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 -@@ -2140,60 +2140,32 @@ if test "${enable_gdbtk}" = "yes"; then +@@ -2154,60 +2154,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 -@@ -519,7 +519,7 @@ SUBDIR_GDBTK_SRCS = \ +@@ -522,7 +522,7 @@ SUBDIR_GDBTK_SRCS = \ gdbtk/generic/gdbtk-main.c SUBDIR_GDBTK_DEPS = $(LIBGUI) $(TCL_DEPS) $(TK_DEPS) SUBDIR_GDBTK_LDFLAGS= -- 2.43.5