Skip to content

Commit 7941580

Browse files
committed
Upgrade to GDB 14.2
__MINGW_USE_VC2005_COMPAT mitigates a bug where bfd and gnulib disagree about i686 time_t: https://sourceware.org/bugzilla/show_bug.cgi?id=31636 Closes #96.
1 parent f02075d commit 7941580

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG BUSYBOX_VERSION=FRP-5301-gda71f7c57
77
ARG CTAGS_VERSION=6.0.0
88
ARG EXPAT_VERSION=2.6.2
99
ARG GCC_VERSION=13.2.0
10-
ARG GDB_VERSION=13.1
10+
ARG GDB_VERSION=14.2
1111
ARG GMP_VERSION=6.3.0
1212
ARG LIBICONV_VERSION=1.17
1313
ARG MAKE_VERSION=4.4.1
@@ -361,8 +361,8 @@ RUN cat $PREFIX/src/gdb-*.patch | patch -d/gdb-$GDB_VERSION -p1 \
361361
&& /gdb-$GDB_VERSION/configure \
362362
--host=$ARCH \
363363
--enable-tui \
364-
CFLAGS="-Os -DPDC_WIDE -I/deps/include" \
365-
CXXFLAGS="-Os -DPDC_WIDE -I/deps/include" \
364+
CFLAGS="-Os -D__MINGW_USE_VC2005_COMPAT -DPDC_WIDE -I/deps/include" \
365+
CXXFLAGS="-Os -D__MINGW_USE_VC2005_COMPAT -DPDC_WIDE -I/deps/include" \
366366
LDFLAGS="-s -L/deps/lib" \
367367
&& make MAKEINFO=true -j$(nproc) \
368368
&& cp gdb/.libs/gdb.exe gdbserver/gdbserver.exe $PREFIX/bin/

src/SHA256SUMS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ebdea8aa03d9d457075f3ff5ce4dc04239cd4b9ba6439bb701f285233c960923 busybox-w32-FR
44
71229a73f25529c9e3dabb2cb7310c55405d31caee8e8a9ab5c71b2406d4005a ctags-6.0.0.tar.gz
55
ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 expat-2.6.2.tar.xz
66
e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da gcc-13.2.0.tar.xz
7-
115ad5c18d69a6be2ab15882d365dda2a2211c14f480b3502c6eba576e2e95a0 gdb-13.1.tar.xz
7+
2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772 gdb-14.2.tar.xz
88
a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898 gmp-6.3.0.tar.xz
99
8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313 libiconv-1.17.tar.gz
1010
dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3 make-4.4.1.tar.gz

src/gdb-000-alternate-main.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/gdb/symtab.c
22
+++ b/gdb/symtab.c
3-
@@ -6300,6 +6300,23 @@
3+
@@ -6314,6 +6314,23 @@
44
if (symbol_found_p)
55
return;
66

@@ -15,12 +15,12 @@
1515
+ msym = lookup_minimal_symbol (main, NULL, NULL);
1616
+ if (msym.minsym != NULL)
1717
+ {
18-
+ set_main_name (main, language_unknown);
18+
+ set_main_name (pspace, main, language_unknown);
1919
+ return;
2020
+ }
2121
+ }
2222
+ }
2323
+
24-
set_main_name ("main", language_unknown);
24+
set_main_name (pspace, "main", language_unknown);
2525
}
2626

src/gdb-001-confirm-off.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ creates substantial friction and should be off by default.
33

44
--- a/gdb/top.c
55
+++ b/gdb/top.c
6-
@@ -132,3 +132,3 @@
6+
@@ -133,3 +133,3 @@
77

88
-bool confirm = true;
99
+bool confirm = false;

0 commit comments

Comments
 (0)