From 7ba4095cef7db3be618cf571d4071bdb96330ce0 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 11 Feb 2020 12:26:15 +0200 Subject: [PATCH] GDB: Upgrade to 9.1 --- mingw-w64-gdb/PKGBUILD | 26 ++--- mingw-w64-gdb/gdb-7.12-dynamic-libs.patch | 10 +- ...ib-order.patch => gdb-9.1-lib-order.patch} | 14 +-- mingw-w64-gdb/gdb-fix-tui-with-pdcurses.patch | 20 +++- mingw-w64-gdb/gdb-fix-using-gnu-print.patch | 59 ++++++++---- mingw-w64-gdb/gdb-home-is-userprofile.patch | 94 +++++++++---------- mingw-w64-gdb/gdb-perfomance.patch | 16 +++- mingw-w64-gdb/gdb-py3-fixes.patch | 28 ++++-- .../python-configure-path-fixes.patch | 22 ++++- 9 files changed, 179 insertions(+), 110 deletions(-) rename mingw-w64-gdb/{gdb-8.3-lib-order.patch => gdb-9.1-lib-order.patch} (65%) diff --git a/mingw-w64-gdb/PKGBUILD b/mingw-w64-gdb/PKGBUILD index 98330021bd..32dbcd5fc2 100644 --- a/mingw-w64-gdb/PKGBUILD +++ b/mingw-w64-gdb/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" # Until https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62279 is # fixed, we will stick with 7.6.2 which hasn't got this bug.. -pkgver=8.3.1 -pkgrel=4 +pkgver=9.1 +pkgrel=1 pkgdesc="GNU Debugger (mingw-w64)" arch=('any') url="https://www.gnu.org/software/gdb/" @@ -30,19 +30,19 @@ source=(https://ftp.gnu.org/gnu/gdb/${_realname}-${pkgver}.tar.xz{,.sig} 'gdb-py3-fixes.patch' 'python-configure-path-fixes.patch' 'gdb-fix-tui-with-pdcurses.patch' - 'gdb-8.3-lib-order.patch' + 'gdb-9.1-lib-order.patch' 'gdb-home-is-userprofile.patch') validpgpkeys=('F40ADB902B24264AA42E50BF92EDB04BFF325CF3') -sha256sums=('1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4' +sha256sums=('699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737' 'SKIP' - '6be0f95483e02d5447c93ab5e2c9554d254c6888b1fa3f3a4c011cd6a0a403ad' - '264eba33ef71c4762514a634dcf94fdb778914dbba6ce99e63804fe063225d97' - '4db9aed9f2ee2e4f6c86b2f124609df52fbb91820501035cb9783cf4691fedf9' - 'bfe8985e806200e5a1007c4565bd60de0a297369d17d4a0178512f2df29b34fc' - 'bdf6c2b51d6c8c84b7b20abb9d1702f110c0c0e06e3d68eb6aba817664354450' - '4d6b2b8ab03cea1c47e882ed17ddc3c528e22c92e3538ab261d9bb629626d50b' - 'd92e2135e6f1bed51128f702a0630a961c0eaf241bb35fdafd0fe0d67cd0fb48' - '2c58f0d5e4bd18341f6bbc13316ebc0251fe63633964c3a83840f43e11cd0854') + 'a0a2d974e80b656646c87cc669fda798182a35b001aab933567c41b880530aa0' + '29fce74348a2862dd3856da58cd3c6c40a910cbdb95e5003d571c33a04532b78' + '9de9c30bbb8cd2c6f60414b5a34cdf1fae27238293fb6007c628a8b821f88e0b' + 'd568aade9d91ae50390c7b7fc8894ad197e793f7db5077f7f6aacedb5944265b' + '6378e1a96e3bedc2a160f0f6780cb973ce6139017f2786e7ab97f8bcd9824d27' + 'f70cc0a0633d01adf777eb57a82f8c9880f6511d55e44c1dc415ddebc7467e0b' + 'dcfbfb2e3fc90a51e11202529e34c1b3dcc17e352067ffdfc58b63c1deab9523' + 'a63ba094dcd9bf0c0f98c6dce5825590b2cf7014834fd3bec5f88fe25d90228a') prepare() { cd ${srcdir}/${_realname}-${pkgver} @@ -59,7 +59,7 @@ prepare() { patch -p1 -i ${srcdir}/python-configure-path-fixes.patch patch -p1 -i ${srcdir}/gdb-fix-tui-with-pdcurses.patch - patch -p1 -i ${srcdir}/gdb-8.3-lib-order.patch + patch -p1 -i ${srcdir}/gdb-9.1-lib-order.patch patch -p1 -i ${srcdir}/gdb-home-is-userprofile.patch # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" diff --git a/mingw-w64-gdb/gdb-7.12-dynamic-libs.patch b/mingw-w64-gdb/gdb-7.12-dynamic-libs.patch index 276dc30ef0..1d4fda9182 100644 --- a/mingw-w64-gdb/gdb-7.12-dynamic-libs.patch +++ b/mingw-w64-gdb/gdb-7.12-dynamic-libs.patch @@ -1,4 +1,4 @@ -From 04a27a15b268e07c76578c074c3822477ceabc50 Mon Sep 17 00:00:00 2001 +From 55058413c83f650adfcd3d92a0005fae46f51505 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 7 Mar 2017 19:13:41 +0200 Subject: [PATCH] configure: Disable static linking with standard libs @@ -10,10 +10,10 @@ with mingw32. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index a5f4fc5aa7..f5a9766c39 100755 +index 276f33fee3..e5e83482c3 100755 --- a/configure +++ b/configure -@@ -5902,7 +5902,7 @@ else +@@ -5878,7 +5878,7 @@ else # trust that they are doing what they want. if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \ -a "$have_static_libs" = yes; then @@ -22,7 +22,7 @@ index a5f4fc5aa7..f5a9766c39 100755 fi fi -@@ -5938,7 +5938,7 @@ else +@@ -5914,7 +5914,7 @@ else # statically. But if the user explicitly specified the libraries to # use, trust that they are doing what they want. if test "$poststage1_libs" = ""; then @@ -32,5 +32,5 @@ index a5f4fc5aa7..f5a9766c39 100755 fi -- -2.12.0.windows.1 +2.25.0.windows.1 diff --git a/mingw-w64-gdb/gdb-8.3-lib-order.patch b/mingw-w64-gdb/gdb-9.1-lib-order.patch similarity index 65% rename from mingw-w64-gdb/gdb-8.3-lib-order.patch rename to mingw-w64-gdb/gdb-9.1-lib-order.patch index 06744ae80d..6eec8fc8ba 100644 --- a/mingw-w64-gdb/gdb-8.3-lib-order.patch +++ b/mingw-w64-gdb/gdb-9.1-lib-order.patch @@ -1,4 +1,4 @@ -From 699d1bec385c16261eb9fe3de0f71a8cafc73082 Mon Sep 17 00:00:00 2001 +From 4a5db02d1ae86a498c9f38e2ff26f1a799e21c64 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 2 Jun 2019 11:43:52 +0300 Subject: [PATCH] Fix link order on Windows @@ -10,20 +10,20 @@ to be linked after libgnu. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index 5614cc3386..037f9ae356 100644 +index c3e074b21f..dee3c89c8e 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -595,8 +595,8 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(ZLIB) $(INTL) $(LIBIBERTY) $(LIBD +@@ -611,8 +611,8 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(LIBCTF) $(ZLIB) \ $(XM_CLIBS) $(GDBTKLIBS) \ @LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ \ $(LIBEXPAT) $(LIBLZMA) $(LIBBABELTRACE) $(LIBIPT) \ - $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) $(LIBICONV) $(LIBMPFR) \ -- $(SRCHIGH_LIBS) +- $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS) + $(LIBIBERTY) $(LIBGNU) $(LIBICONV) $(LIBMPFR) \ -+ $(SRCHIGH_LIBS) $(WIN32LIBS) - CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \ ++ $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS) $(WIN32LIBS) + CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(LIBCTF) \ $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) -- -2.22.0.rc0.windows.1 +2.25.0.windows.1 diff --git a/mingw-w64-gdb/gdb-fix-tui-with-pdcurses.patch b/mingw-w64-gdb/gdb-fix-tui-with-pdcurses.patch index 03541d7bf3..5146a010bb 100644 --- a/mingw-w64-gdb/gdb-fix-tui-with-pdcurses.patch +++ b/mingw-w64-gdb/gdb-fix-tui-with-pdcurses.patch @@ -1,6 +1,17 @@ ---- gdb-8.3/gdb/tui/tui-win.c.orig 2019-05-31 11:01:21.886191600 +0300 -+++ gdb-8.3/gdb/tui/tui-win.c 2019-05-31 11:01:25.916197200 +0300 -@@ -134,15 +134,15 @@ +From 2d2c2efa3f47f00f3c392cf7dd3431d25194c543 Mon Sep 17 00:00:00 2001 +From: Orgad Shaneh +Date: Thu, 13 Feb 2020 09:25:02 +0200 +Subject: [PATCH] Fix TUI with pdcurses + +--- + gdb/tui/tui-win.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c +index d6ceacc041..2c793a6d02 100644 +--- a/gdb/tui/tui-win.c ++++ b/gdb/tui/tui-win.c +@@ -123,15 +123,15 @@ struct tui_translate The list of values must be terminated by a NULL. After the NULL value, an entry defines the default. */ struct tui_translate tui_border_mode_translate[] = { @@ -24,3 +35,6 @@ }; /* Translation tables for border-kind, one for each border +-- +2.25.0.windows.1 + diff --git a/mingw-w64-gdb/gdb-fix-using-gnu-print.patch b/mingw-w64-gdb/gdb-fix-using-gnu-print.patch index 29c0e0299f..fa0ffcc104 100644 --- a/mingw-w64-gdb/gdb-fix-using-gnu-print.patch +++ b/mingw-w64-gdb/gdb-fix-using-gnu-print.patch @@ -1,7 +1,20 @@ -diff -Naur gdb-7.7-orig/bfd/bfd-in.h gdb-7.7/bfd/bfd-in.h ---- gdb-7.7-orig/bfd/bfd-in.h 2014-02-06 06:21:29.000000000 +0400 -+++ gdb-7.7/bfd/bfd-in.h 2014-03-14 10:39:32.085200000 +0400 -@@ -137,7 +137,7 @@ +From 23c68472557842b9c2706ba25d28711db3241081 Mon Sep 17 00:00:00 2001 +From: Orgad Shaneh +Date: Thu, 13 Feb 2020 09:25:02 +0200 +Subject: [PATCH] Fix using gnu print + +--- + bfd/bfd-in.h | 2 +- + bfd/bfd-in2.h | 2 +- + gdb/gdbsupport/format.h | 6 +++++- + gnulib/import/inttypes.in.h | 8 ++++---- + 4 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h +index d81cbb791f..6c14fc5da5 100644 +--- a/bfd/bfd-in.h ++++ b/bfd/bfd-in.h +@@ -158,7 +158,7 @@ typedef BFD_HOST_U_64_BIT symvalue; #if BFD_HOST_64BIT_LONG #define BFD_VMA_FMT "l" @@ -10,10 +23,11 @@ diff -Naur gdb-7.7-orig/bfd/bfd-in.h gdb-7.7/bfd/bfd-in.h #define BFD_VMA_FMT "I64" #else #define BFD_VMA_FMT "ll" -diff -Naur gdb-7.7-orig/bfd/bfd-in2.h gdb-7.7/bfd/bfd-in2.h ---- gdb-7.7-orig/bfd/bfd-in2.h 2014-02-06 06:21:29.000000000 +0400 -+++ gdb-7.7/bfd/bfd-in2.h 2014-03-14 10:39:32.085200000 +0400 -@@ -144,7 +144,7 @@ +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 6f3e41da37..54e9c7a56d 100644 +--- a/bfd/bfd-in2.h ++++ b/bfd/bfd-in2.h +@@ -165,7 +165,7 @@ typedef BFD_HOST_U_64_BIT symvalue; #if BFD_HOST_64BIT_LONG #define BFD_VMA_FMT "l" @@ -22,11 +36,12 @@ diff -Naur gdb-7.7-orig/bfd/bfd-in2.h gdb-7.7/bfd/bfd-in2.h #define BFD_VMA_FMT "I64" #else #define BFD_VMA_FMT "ll" -diff -Naur gdb-7.7-orig/gdb/common/format.h gdb-7.7/gdb/common/format.h ---- gdb-7.7-orig/gdb/common/format.h 2014-01-08 13:23:36.000000000 +0400 -+++ gdb-7.7/gdb/common/format.h 2014-03-14 10:39:32.412800000 +0400 -@@ -18,7 +18,11 @@ - along with this program. If not, see . */ +diff --git a/gdb/gdbsupport/format.h b/gdb/gdbsupport/format.h +index 80f012a41a..17a5560283 100644 +--- a/gdb/gdbsupport/format.h ++++ b/gdb/gdbsupport/format.h +@@ -23,7 +23,11 @@ + #include "gdbsupport/gdb_string_view.h" #if defined(__MINGW32__) && !defined(PRINTF_HAS_LONG_LONG) -# define USE_PRINTF_I64 1 @@ -38,10 +53,11 @@ diff -Naur gdb-7.7-orig/gdb/common/format.h gdb-7.7/gdb/common/format.h # define PRINTF_HAS_LONG_LONG #else # define USE_PRINTF_I64 0 -diff -Naur gdb-7.7-orig/gdb/gnulib/import/inttypes.in.h gdb-7.7/gdb/gnulib/import/inttypes.in.h ---- gdb-7.7-orig/gdb/gnulib/import/inttypes.in.h 2013-12-08 08:11:51.000000000 +0400 -+++ gdb-7.7/gdb/gnulib/import/inttypes.in.h 2014-03-14 10:43:47.309400000 +0400 -@@ -183,7 +183,7 @@ +diff --git a/gnulib/import/inttypes.in.h b/gnulib/import/inttypes.in.h +index ed09db6e86..ae06fdedc8 100644 +--- a/gnulib/import/inttypes.in.h ++++ b/gnulib/import/inttypes.in.h +@@ -187,7 +187,7 @@ #ifdef INT64_MAX # if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@) # define _PRI64_PREFIX "l" @@ -50,7 +66,7 @@ diff -Naur gdb-7.7-orig/gdb/gnulib/import/inttypes.in.h gdb-7.7/gdb/gnulib/impor # define _PRI64_PREFIX "I64" # elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 # define _PRI64_PREFIX _LONG_LONG_FORMAT_PREFIX -@@ -200,7 +200,7 @@ +@@ -204,7 +204,7 @@ #ifdef UINT64_MAX # if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@) # define _PRIu64_PREFIX "l" @@ -59,7 +75,7 @@ diff -Naur gdb-7.7-orig/gdb/gnulib/import/inttypes.in.h gdb-7.7/gdb/gnulib/impor # define _PRIu64_PREFIX "I64" # elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 # define _PRIu64_PREFIX _LONG_LONG_FORMAT_PREFIX -@@ -676,7 +676,7 @@ +@@ -680,7 +680,7 @@ #ifdef INT64_MAX # if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@) # define _SCN64_PREFIX "l" @@ -68,7 +84,7 @@ diff -Naur gdb-7.7-orig/gdb/gnulib/import/inttypes.in.h gdb-7.7/gdb/gnulib/impor # define _SCN64_PREFIX "I64" # elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 # define _SCN64_PREFIX _LONG_LONG_FORMAT_PREFIX -@@ -693,7 +693,7 @@ +@@ -697,7 +697,7 @@ #ifdef UINT64_MAX # if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@) # define _SCNu64_PREFIX "l" @@ -77,3 +93,6 @@ diff -Naur gdb-7.7-orig/gdb/gnulib/import/inttypes.in.h gdb-7.7/gdb/gnulib/impor # define _SCNu64_PREFIX "I64" # elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 # define _SCNu64_PREFIX _LONG_LONG_FORMAT_PREFIX +-- +2.25.0.windows.1 + diff --git a/mingw-w64-gdb/gdb-home-is-userprofile.patch b/mingw-w64-gdb/gdb-home-is-userprofile.patch index 60478300bf..ff1af19c74 100644 --- a/mingw-w64-gdb/gdb-home-is-userprofile.patch +++ b/mingw-w64-gdb/gdb-home-is-userprofile.patch @@ -1,21 +1,21 @@ -From f31e51ef9654001c761dee4a33973613d6ab27e7 Mon Sep 17 00:00:00 2001 +From e7cfeb6cd5d53a8708455680c13fd4c5f61bc78e Mon Sep 17 00:00:00 2001 From: Buster Date: Sat, 26 Oct 2019 12:15:37 +0100 Subject: [PATCH] W32: Always check $USERPROFILE if $HOME is not set --- - gdb/auto-load.c | 4 ++++ - gdb/common/pathstuff.c | 4 ++++ - gdb/gnulib/import/glob.c | 24 +++--------------------- - gdb/main.c | 4 ++++ - gdb/windows-nat.c | 4 ++++ + gdb/auto-load.c | 4 ++++ + gdb/gdbsupport/pathstuff.c | 4 ++++ + gdb/main.c | 4 ++++ + gdb/windows-nat.c | 4 ++++ + gnulib/import/glob.c | 24 +++--------------------- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/gdb/auto-load.c b/gdb/auto-load.c -index 00869fe0b1..25505b908d 100644 +index 5a9f47f078..8575ea1ecf 100644 --- a/gdb/auto-load.c +++ b/gdb/auto-load.c -@@ -497,6 +497,10 @@ file_is_auto_load_safe (const char *filename, const char *debug_fmt, ...) +@@ -499,6 +499,10 @@ file_is_auto_load_safe (const char *filename, const char *debug_fmt, ...) if (!advice_printed) { const char *homedir = getenv ("HOME"); @@ -26,10 +26,10 @@ index 00869fe0b1..25505b908d 100644 if (homedir == NULL) homedir = "$HOME"; -diff --git a/gdb/common/pathstuff.c b/gdb/common/pathstuff.c -index 2b1669a5b9..45641d1fde 100644 ---- a/gdb/common/pathstuff.c -+++ b/gdb/common/pathstuff.c +diff --git a/gdb/gdbsupport/pathstuff.c b/gdb/gdbsupport/pathstuff.c +index f9882a2635..a90587103c 100644 +--- a/gdb/gdbsupport/pathstuff.c ++++ b/gdb/gdbsupport/pathstuff.c @@ -231,6 +231,10 @@ get_standard_cache_dir () #endif @@ -41,10 +41,40 @@ index 2b1669a5b9..45641d1fde 100644 if (home != NULL) { /* Make sure the path is absolute and tilde-expanded. */ -diff --git a/gdb/gnulib/import/glob.c b/gdb/gnulib/import/glob.c -index 4b04b902e5..f1d00c45a0 100644 ---- a/gdb/gnulib/import/glob.c -+++ b/gdb/gnulib/import/glob.c +diff --git a/gdb/main.c b/gdb/main.c +index 66a9e6a6d2..2a7228f20c 100644 +--- a/gdb/main.c ++++ b/gdb/main.c +@@ -300,6 +300,10 @@ get_init_files (std::vector *system_gdbinit, + } + + const char *homedir = getenv ("HOME"); ++#ifdef _WIN32 ++ if (homedir == NULL) ++ homedir = getenv ("USERPROFILE"); ++#endif + + /* If the .gdbinit file in the current directory is the same as + the $HOME/.gdbinit file, it should not be sourced. homebuf +diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c +index 31a5cabfb3..e60298ff60 100644 +--- a/gdb/windows-nat.c ++++ b/gdb/windows-nat.c +@@ -3201,6 +3201,10 @@ _initialize_check_for_gdb_ini (void) + return; + + homedir = getenv ("HOME"); ++#ifdef _WIN32 ++ if (homedir == NULL) ++ homedir = getenv ("USERPROFILE"); ++#endif + if (homedir) + { + char *p; +diff --git a/gnulib/import/glob.c b/gnulib/import/glob.c +index 416d210b63..77888277db 100644 +--- a/gnulib/import/glob.c ++++ b/gnulib/import/glob.c @@ -663,27 +663,9 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), if (home_dir == NULL || home_dir[0] == '\0') home_dir = "SYS:"; @@ -76,36 +106,6 @@ index 4b04b902e5..f1d00c45a0 100644 # else if (home_dir == NULL || home_dir[0] == '\0') { -diff --git a/gdb/main.c b/gdb/main.c -index e14dd06fa8..07c2930b58 100644 ---- a/gdb/main.c -+++ b/gdb/main.c -@@ -248,6 +248,10 @@ get_init_files (const char **system_gdbinit, - } - - homedir = getenv ("HOME"); -+#ifdef _WIN32 -+ if (homedir == NULL) -+ homedir = getenv ("USERPROFILE"); -+#endif - - /* If the .gdbinit file in the current directory is the same as - the $HOME/.gdbinit file, it should not be sourced. homebuf -diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c -index 3add8e63f9..43b6465a0e 100644 ---- a/gdb/windows-nat.c -+++ b/gdb/windows-nat.c -@@ -3236,6 +3236,10 @@ _initialize_check_for_gdb_ini (void) - return; - - homedir = getenv ("HOME"); -+#ifdef _WIN32 -+ if (homedir == NULL) -+ homedir = getenv ("USERPROFILE"); -+#endif - if (homedir) - { - char *p; -- -2.23.0.windows.1 +2.25.0.windows.1 diff --git a/mingw-w64-gdb/gdb-perfomance.patch b/mingw-w64-gdb/gdb-perfomance.patch index bcc78efee9..bf88b21fd5 100644 --- a/mingw-w64-gdb/gdb-perfomance.patch +++ b/mingw-w64-gdb/gdb-perfomance.patch @@ -1,12 +1,17 @@ - As DJE said, the workaround looks like below: +From 6bae5cab05d22b5eb933e198b0034112fed2f65d Mon Sep 17 00:00:00 2001 +From: Orgad Shaneh +Date: Thu, 13 Feb 2020 09:33:39 +0200 +Subject: [PATCH] As DJE said, the workaround looks like below + +--- gdb/typeprint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/typeprint.c b/gdb/typeprint.c -index 4e70593..6e62922 100644 +index effc511e5b..32918ff0cd 100644 --- a/gdb/typeprint.c +++ b/gdb/typeprint.c -@@ -62,7 +62,7 @@ const struct type_print_options type_print_raw_options = +@@ -54,7 +54,7 @@ const struct type_print_options type_print_raw_options = static struct type_print_options default_ptype_flags = { @@ -14,4 +19,7 @@ index 4e70593..6e62922 100644 + 1, /* raw */ 1, /* print_methods */ 1, /* print_typedefs */ - NULL, /* local_typedefs */ + 0, /* print_offsets */ +-- +2.25.0.windows.1 + diff --git a/mingw-w64-gdb/gdb-py3-fixes.patch b/mingw-w64-gdb/gdb-py3-fixes.patch index df058afa02..585e95460b 100644 --- a/mingw-w64-gdb/gdb-py3-fixes.patch +++ b/mingw-w64-gdb/gdb-py3-fixes.patch @@ -1,6 +1,17 @@ ---- gdb-8.0.1/gdb/python/python.c.orig 2018-01-29 17:17:16.030537500 +0100 -+++ gdb-8.0.1/gdb/python/python.c 2018-01-29 17:17:25.135058300 +0100 -@@ -351,6 +351,9 @@ +From 7e76112783f9850f11e211f010574c5e8b02a51d Mon Sep 17 00:00:00 2001 +From: Orgad Shaneh +Date: Thu, 13 Feb 2020 09:25:04 +0200 +Subject: [PATCH] Python3 fixes + +--- + gdb/python/python.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/gdb/python/python.c b/gdb/python/python.c +index bf214fae6e..edc14ebd0f 100644 +--- a/gdb/python/python.c ++++ b/gdb/python/python.c +@@ -336,6 +336,9 @@ python_run_simple_file (FILE *file, const char *filename) /* Because we have a string for a filename, and are using Python to open the file, we need to expand any tilde in the path first. */ @@ -8,11 +19,11 @@ +#ifndef IS_PY3K + gdb::unique_xmalloc_ptr full_path (tilde_expand (filename)); - gdbpy_ref<> python_file (PyFile_FromString (full_path.get (), (char *) "r")); - if (python_file == NULL) -@@ -361,6 +364,14 @@ - PyRun_SimpleFile (PyFile_AsFile (python_file.get ()), filename); + if (gdb_python_module == nullptr +@@ -352,6 +355,14 @@ python_run_simple_file (FILE *file, const char *filename) + PyErr_PrintEx(0); + } +#else + @@ -25,3 +36,6 @@ #endif /* _WIN32 */ } +-- +2.25.0.windows.1 + diff --git a/mingw-w64-gdb/python-configure-path-fixes.patch b/mingw-w64-gdb/python-configure-path-fixes.patch index f66e015457..eeb410bc5e 100644 --- a/mingw-w64-gdb/python-configure-path-fixes.patch +++ b/mingw-w64-gdb/python-configure-path-fixes.patch @@ -1,7 +1,18 @@ ---- gdb-8.0.1/gdb/configure.orig 2018-02-04 15:54:00.599198000 +0100 -+++ gdb-8.0.1/gdb/configure 2018-02-04 15:53:04.392983200 +0100 -@@ -9872,7 +9872,7 @@ - as_fn_error "failure running python-config --ldflags" "$LINENO" 5 +From 42c791d0d2e21b80aff0dbdb4402c6d633a5002a Mon Sep 17 00:00:00 2001 +From: Orgad Shaneh +Date: Thu, 13 Feb 2020 09:25:04 +0200 +Subject: [PATCH] Python: Configure path fixes + +--- + gdb/configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/configure b/gdb/configure +index b572d414ca..2c8df2616e 100755 +--- a/gdb/configure ++++ b/gdb/configure +@@ -10488,7 +10488,7 @@ fi + as_fn_error $? "failure running python-config --ldflags" "$LINENO" 5 fi fi - python_prefix=`${python_prog} ${srcdir}/python/python-config.py --exec-prefix` @@ -9,3 +20,6 @@ if test $? != 0; then have_python_config=failed if test "${with_python}" != auto; then +-- +2.25.0.windows.1 +