diff --git a/Dockerfile b/Dockerfile index e865114..ded6e53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG BUSYBOX_VERSION=FRP-5181-g5c1a3b00e ARG CTAGS_VERSION=6.0.0 ARG EXPAT_VERSION=2.5.0 ARG GCC_VERSION=13.2.0 -ARG GDB_VERSION=13.1 +ARG GDB_VERSION=14.1 ARG GMP_VERSION=6.3.0 ARG LIBICONV_VERSION=1.17 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 \ && /gdb-$GDB_VERSION/configure \ --host=$ARCH \ - --with-libexpat-prefix=/deps \ - --with-libgmp-prefix=/deps \ - --with-libiconv-prefix=/deps \ --enable-tui \ - CFLAGS="-Os -DPDC_WIDE" \ - CXXFLAGS="-Os -DPDC_WIDE" \ + CFLAGS="-Os -DPDC_WIDE -I/deps/include" \ + CXXFLAGS="-Os -DPDC_WIDE -I/deps/include" \ LDFLAGS="-s -L/deps/lib" \ && make MAKEINFO=true -j$(nproc) \ && cp gdb/.libs/gdb.exe gdbserver/gdbserver.exe $PREFIX/bin/ diff --git a/src/SHA256SUMS b/src/SHA256SUMS index 10b23e4..6ede1f6 100644 --- a/src/SHA256SUMS +++ b/src/SHA256SUMS @@ -4,7 +4,7 @@ f69bc68497f8669ed624f12a99a7574c53fb26bd4c65d44c5a5f5f292af06491 busybox-w32-FR 71229a73f25529c9e3dabb2cb7310c55405d31caee8e8a9ab5c71b2406d4005a ctags-6.0.0.tar.gz ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe expat-2.5.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 8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313 libiconv-1.17.tar.gz 581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18 make-4.4.tar.gz diff --git a/src/gdb-000-alternate-main.patch b/src/gdb-000-alternate-main.patch index c7b1c5d..fbcbfd9 100644 --- a/src/gdb-000-alternate-main.patch +++ b/src/gdb-000-alternate-main.patch @@ -1,6 +1,6 @@ --- a/gdb/symtab.c +++ b/gdb/symtab.c -@@ -6300,6 +6300,23 @@ +@@ -6314,6 +6314,23 @@ if (symbol_found_p) return; @@ -15,12 +15,12 @@ + msym = lookup_minimal_symbol (main, NULL, NULL); + if (msym.minsym != NULL) + { -+ set_main_name (main, language_unknown); ++ set_main_name (pspace, main, language_unknown); + return; + } + } + } + - set_main_name ("main", language_unknown); + set_main_name (pspace, "main", language_unknown); } diff --git a/src/gdb-001-confirm-off.patch b/src/gdb-001-confirm-off.patch index 4832848..9bb9f21 100644 --- a/src/gdb-001-confirm-off.patch +++ b/src/gdb-001-confirm-off.patch @@ -3,7 +3,7 @@ creates substantial friction and should be off by default. --- a/gdb/top.c +++ b/gdb/top.c -@@ -132,3 +132,3 @@ +@@ -133,3 +133,3 @@ -bool confirm = true; +bool confirm = false;