From 9e551ba1ab75c8e0d7fab0f922a17c879fa48abc Mon Sep 17 00:00:00 2001 From: Patrick Monnerat Date: Fri, 12 Feb 2021 12:16:59 +0100 Subject: [PATCH] Upgrade submodule, sync patches. --- binutils-gdb | 2 +- patches/binutils-gdb/001-itcltk4.patch | 12 ++++++------ .../007-notify-enable-count-autodisable.patch | 4 ++-- patches/binutils-gdb/008-gdbtk-obj-in-subdir.patch | 6 +++--- patches/binutils-gdb/009-link-gdb-objects.patch | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/binutils-gdb b/binutils-gdb index e37d88e..96df3e2 160000 --- a/binutils-gdb +++ b/binutils-gdb @@ -1 +1 @@ -Subproject commit e37d88e5e5666304d94b705af4301867df9bdab0 +Subproject commit 96df3e28b835ccb5804bcca96f417761e5e8be67 diff --git a/patches/binutils-gdb/001-itcltk4.patch b/patches/binutils-gdb/001-itcltk4.patch index 3030cdb..3c9a2de 100644 --- a/patches/binutils-gdb/001-itcltk4.patch +++ b/patches/binutils-gdb/001-itcltk4.patch @@ -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]), -@@ -969,7 +954,7 @@ case "${target}" in +@@ -966,7 +951,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" -@@ -989,7 +974,7 @@ case "${target}" in +@@ -986,7 +971,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*-*-*) noconfigdirs="$noconfigdirs sim" -@@ -1059,15 +1044,15 @@ case "${target}" in +@@ -1056,15 +1041,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*) ;; -@@ -1126,13 +1111,13 @@ case "${target}" in +@@ -1123,13 +1108,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" -@@ -2777,7 +2762,7 @@ if echo " ${target_configdirs} " | grep +@@ -2774,7 +2759,7 @@ if echo " ${target_configdirs} " | grep bootstrap_target_libs=${bootstrap_target_libs}target-libvtv, 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, -@@ -2785,7 +2770,7 @@ fi +@@ -2782,7 +2767,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/007-notify-enable-count-autodisable.patch b/patches/binutils-gdb/007-notify-enable-count-autodisable.patch index b0075a2..6953a0f 100644 --- a/patches/binutils-gdb/007-notify-enable-count-autodisable.patch +++ b/patches/binutils-gdb/007-notify-enable-count-autodisable.patch @@ -1,7 +1,7 @@ diff -Naurp gdb.orig/breakpoint.c gdb.new/breakpoint.c --- binutils-gdb.orig/gdb/breakpoint.c 2018-06-22 10:56:09.376862633 +0200 +++ binutils-gdb.new/gdb/breakpoint.c 2018-06-25 13:41:57.780248624 +0200 -@@ -5560,7 +5560,6 @@ bpstat_stop_status (const address_space +@@ -5559,7 +5559,6 @@ bpstat_stop_status (const address_space if (bs->stop) { ++(b->hit_count); @@ -9,7 +9,7 @@ diff -Naurp gdb.orig/breakpoint.c gdb.new/breakpoint.c /* We will stop here. */ if (b->disposition == disp_disable) -@@ -5570,6 +5569,7 @@ bpstat_stop_status (const address_space +@@ -5569,6 +5568,7 @@ bpstat_stop_status (const address_space b->enable_state = bp_disabled; removed_any = 1; } diff --git a/patches/binutils-gdb/008-gdbtk-obj-in-subdir.patch b/patches/binutils-gdb/008-gdbtk-obj-in-subdir.patch index 6ef242e..d6f01d3 100644 --- a/patches/binutils-gdb/008-gdbtk-obj-in-subdir.patch +++ b/patches/binutils-gdb/008-gdbtk-obj-in-subdir.patch @@ -38,7 +38,7 @@ diff -Naurp a/gdb/Makefile.in b/gdb/Makefile.in CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) # -I. for config files. -@@ -1639,10 +1639,8 @@ $(CONFIG_DEP_SUBDIR): +@@ -1638,10 +1638,8 @@ $(CONFIG_DEP_SUBDIR): # Python files need special flags. python/%.o: INTERNAL_CFLAGS += $(PYTHON_CFLAGS) @@ -51,7 +51,7 @@ diff -Naurp a/gdb/Makefile.in b/gdb/Makefile.in installcheck: -@@ -2526,10 +2524,10 @@ clean-gdbtk: +@@ -2524,10 +2522,10 @@ clean-gdbtk: rm -f insight$(EXEEXT) # Removing the old gdb first works better if it is running, at least on SunOS. @@ -64,7 +64,7 @@ diff -Naurp a/gdb/Makefile.in b/gdb/Makefile.in $(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES) gdbres.o: $(srcdir)/gdbtk/gdb.rc $(srcdir)/gdbtk/gdbtool.ico -@@ -2564,7 +2562,7 @@ endif +@@ -2562,7 +2560,7 @@ endif # A list of all the objects we might care about in this build, for # dependency tracking. diff --git a/patches/binutils-gdb/009-link-gdb-objects.patch b/patches/binutils-gdb/009-link-gdb-objects.patch index 1b44132..aa4aa77 100644 --- a/patches/binutils-gdb/009-link-gdb-objects.patch +++ b/patches/binutils-gdb/009-link-gdb-objects.patch @@ -4,7 +4,7 @@ diff -Naurp a/gdb/Makefile.in b/gdb/Makefile.in --- a/gdb/Makefile.in 2020-01-17 14:59:10.828447626 +0100 +++ b/gdb/Makefile.in 2020-01-17 15:04:17.577523482 +0100 -@@ -2524,10 +2524,10 @@ clean-gdbtk: +@@ -2522,10 +2522,10 @@ clean-gdbtk: rm -f insight$(EXEEXT) # Removing the old gdb first works better if it is running, at least on SunOS. -- 2.43.5