lib/w64devkit
1
0
Fork 0
mirror of https://github.com/skeeto/w64devkit.git synced 2025-07-05 00:02:27 +03:00
Code Activity

Upgrade to GDB 14.1 (#96)

Browse Source 
In this release the --with-package options have broken further, and the
library detection scripts do not work at all. To workaround, toss these
options and manually place the include directory in CFLAGS, just as was
already necessary for LDFLAGS.
This commit is contained in:
Christopher Wellons
2023-12-05 11:06:21 -05:00
parent 8ec9a9abe6
commit f46b079561
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -7,7 +7,7 @@ ARG BUSYBOX_VERSION=FRP-5181-g5c1a3b00e
ARG CTAGS_VERSION=6.0.0 ARG CTAGS_VERSION=6.0.0
ARG EXPAT_VERSION=2.5.0 ARG EXPAT_VERSION=2.5.0
ARG GCC_VERSION=13.2.0 ARG GCC_VERSION=13.2.0
ARG GDB_VERSION=13.1 ARG GDB_VERSION=14.1
ARG GMP_VERSION=6.3.0 ARG GMP_VERSION=6.3.0
ARG LIBICONV_VERSION=1.17 ARG LIBICONV_VERSION=1.17
ARG MAKE_VERSION=4.4 ARG MAKE_VERSION=4.4
@ -352,12 +352,9 @@ RUN cat $PREFIX/src/gdb-*.patch | patch -d/gdb-$GDB_VERSION -p1 \
&& sed -i 's/quiet = 0/quiet = 1/' /gdb-$GDB_VERSION/gdb/main.c \ && sed -i 's/quiet = 0/quiet = 1/' /gdb-$GDB_VERSION/gdb/main.c \
&& /gdb-$GDB_VERSION/configure \ && /gdb-$GDB_VERSION/configure \
--host=$ARCH \ --host=$ARCH \
--with-libexpat-prefix=/deps \
--with-libgmp-prefix=/deps \
--with-libiconv-prefix=/deps \
--enable-tui \ --enable-tui \
CFLAGS="-Os -DPDC_WIDE" \ CFLAGS="-Os -DPDC_WIDE -I/deps/include" \
CXXFLAGS="-Os -DPDC_WIDE" \ CXXFLAGS="-Os -DPDC_WIDE -I/deps/include" \
LDFLAGS="-s -L/deps/lib" \ LDFLAGS="-s -L/deps/lib" \
&& make MAKEINFO=true -j$(nproc) \ && make MAKEINFO=true -j$(nproc) \
&& cp gdb/.libs/gdb.exe gdbserver/gdbserver.exe $PREFIX/bin/ && cp gdb/.libs/gdb.exe gdbserver/gdbserver.exe $PREFIX/bin/

2
src/SHA256SUMS
View File

@ -4,7 +4,7 @@ f69bc68497f8669ed624f12a99a7574c53fb26bd4c65d44c5a5f5f292af06491 busybox-w32-FR
71229a73f25529c9e3dabb2cb7310c55405d31caee8e8a9ab5c71b2406d4005a ctags-6.0.0.tar.gz 71229a73f25529c9e3dabb2cb7310c55405d31caee8e8a9ab5c71b2406d4005a ctags-6.0.0.tar.gz
ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe expat-2.5.0.tar.xz ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe expat-2.5.0.tar.xz
e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da gcc-13.2.0.tar.xz e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da gcc-13.2.0.tar.xz
115ad5c18d69a6be2ab15882d365dda2a2211c14f480b3502c6eba576e2e95a0 gdb-13.1.tar.xz d66df51276143451fcbff464cc8723d68f1e9df45a6a2d5635a54e71643edb80 gdb-14.1.tar.xz
a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898 gmp-6.3.0.tar.xz a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898 gmp-6.3.0.tar.xz
8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313 libiconv-1.17.tar.gz 8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313 libiconv-1.17.tar.gz
581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18 make-4.4.tar.gz 581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18 make-4.4.tar.gz

6
src/gdb-000-alternate-main.patch
View File

@ -1,6 +1,6 @@
--- a/gdb/symtab.c --- a/gdb/symtab.c
+++ b/gdb/symtab.c +++ b/gdb/symtab.c
@@ -6300,6 +6300,23 @@ @@ -6314,6 +6314,23 @@
if (symbol_found_p) if (symbol_found_p)
return; return;
@ -15,12 +15,12 @@
+ msym = lookup_minimal_symbol (main, NULL, NULL); + msym = lookup_minimal_symbol (main, NULL, NULL);
+ if (msym.minsym != NULL) + if (msym.minsym != NULL)
+ { + {
+ set_main_name (main, language_unknown); + set_main_name (pspace, main, language_unknown);
+ return; + return;
+ } + }
+ } + }
+ } + }
+ +
set_main_name ("main", language_unknown); set_main_name (pspace, "main", language_unknown);
} }

2
src/gdb-001-confirm-off.patch
View File

@ -3,7 +3,7 @@ creates substantial friction and should be off by default.
--- a/gdb/top.c --- a/gdb/top.c
+++ b/gdb/top.c +++ b/gdb/top.c
@@ -132,3 +132,3 @@ @@ -133,3 +133,3 @@
-bool confirm = true; -bool confirm = true;
+bool confirm = false; +bool confirm = false;