From c7ce793e61cd26aaf51bba57653b717519288bf8 Mon Sep 17 00:00:00 2001 From: Geod24 Date: Fri, 13 Nov 2020 19:30:08 +0100 Subject: main/gdb: update to 10.1 --- main/gdb/APKBUILD | 10 ++-- main/gdb/gdb-9.2-sim-ppc-fno-common.patch | 97 ------------------------------- main/gdb/musl-signals.patch | 4 +- main/gdb/ppc-ptregs.patch | 4 +- 4 files changed, 8 insertions(+), 107 deletions(-) delete mode 100644 main/gdb/gdb-9.2-sim-ppc-fno-common.patch diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD index 7de4163b459..aaef2c03bf1 100644 --- a/main/gdb/APKBUILD +++ b/main/gdb/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=gdb -pkgver=9.2 +pkgver=10.1 pkgrel=0 pkgdesc="The GNU Debugger" url="https://www.gnu.org/software/gdb/" @@ -15,7 +15,6 @@ source="https://ftp.gnu.org/gnu/gdb/gdb-$pkgver.tar.xz ppc-musl.patch ppc-ptregs.patch musl-signals.patch - gdb-9.2-sim-ppc-fno-common.patch " prepare() { @@ -75,9 +74,8 @@ multiarch() { "$subpkgdir"/usr/bin/gdb-multiarch } -sha512sums="73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz +sha512sums="0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537 gdb-10.1.tar.xz 70e7d04e4d72461436da503b5bfa370c5779e03245c521f30e9779d5ff37dbb2d708b05f2afb27f43ad9defc44df4bd979d72f777e744851fdbf156295e1cc9f s390x-use-elf-gdb_fpregset_t.patch 04911f87904b62dd7662435f9182b20485afb29ddb3d6398a9d31fef13495f7b70639c77fdae3a40e2775e270d7cd40d0cfd7ddf832372b506808d33c8301e01 ppc-musl.patch -b75e1c1ee503a1948a7d5b8d90427b5c7d38ded69978056cee0adca222771a5c95ed1ac73127fcae7b795ea94296344eee5fca47e4cd04b418c164a756fb0933 ppc-ptregs.patch -013141b89afafba02a6ddd1407dfd9b2566606e7b1d4bd03b4e23d9b523231103dbeca17a435669a7a7508f827cbe7f601e3bb1daa96d892ea33b897265966ad musl-signals.patch -ae2610ed3ce7c55526979fa9157aff7a46b008bf66b1a304e37c4ce20be74bc762de44a464238c37e0652e7c4bb5915f62c355d1a522d71b22a5819c13ce6e3d gdb-9.2-sim-ppc-fno-common.patch" +ab554899bbb2aa98261fd1b6beb4a71ed7c713a714bddd3fa7ec875258e39bd5474dc96a11accb4dadd316f3834f215e8395d3b373bf3affd122dc5b4a8fe710 ppc-ptregs.patch +58aacc7cdc119eab729a3c5a5521f6a0db41c6a5bc2d09d6e32cbdd071d85dd1a31b5e6559616f8da1237c5b79ad9e04aab485211e957b4d1ca752c0c5ad660b musl-signals.patch" diff --git a/main/gdb/gdb-9.2-sim-ppc-fno-common.patch b/main/gdb/gdb-9.2-sim-ppc-fno-common.patch deleted file mode 100644 index 76b29649ad2..00000000000 --- a/main/gdb/gdb-9.2-sim-ppc-fno-common.patch +++ /dev/null @@ -1,97 +0,0 @@ -https://bugs.gentoo.org/738272 -https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=ad8464f799a4c96c7ab8bdfec3f95846cf54f9b0 - -From ad8464f799a4c96c7ab8bdfec3f95846cf54f9b0 Mon Sep 17 00:00:00 2001 -From: Sebastian Huber -Date: Wed, 1 Jul 2020 19:29:55 +0200 -Subject: [PATCH] sim/ppc: Fix linker error with -fno-common - -GCC 10 enables -fno-common by default. This resulted in a multiple -definition linker error since global variables were declared and defined -in a header file: - - ld: ld-insn.o:sim/ppc/ld-insn.h:221: multiple definition of - `max_model_fields_len'; igen.o:sim/ppc/ld-insn.h:221: first defined here - -sim/ppc - - * ld-insn.h (last_model, last_model_data, last_model_function, - last_model_internal, last_model_macro, last_model_static): - Delete. - (max_model_fields_len, model_data, model_functions, - model_internal, model_macros, model_static, models): Declare, but do not - define. - * ld-insn.c (last_model, last_model_data, last_model_function, - last_model_internal, last_model_macro, last_model_static, - max_model_fields_len, model_data, model_functions, - model_internal, model_macros, model_static, models): Define. ---- - sim/ppc/ld-insn.c | 18 ++++++++++++++++++ - sim/ppc/ld-insn.h | 24 +++++++----------------- - 3 files changed, 38 insertions(+), 17 deletions(-) - ---- a/sim/ppc/ld-insn.c -+++ b/sim/ppc/ld-insn.c -@@ -28,6 +28,24 @@ - - #include "igen.h" - -+static model *last_model; -+ -+static insn *last_model_macro; -+static insn *last_model_function; -+static insn *last_model_internal; -+static insn *last_model_static; -+static insn *last_model_data; -+ -+model *models; -+ -+insn *model_macros; -+insn *model_functions; -+insn *model_internal; -+insn *model_static; -+insn *model_data; -+ -+int max_model_fields_len; -+ - static void - update_depth(insn_table *entry, - lf *file, ---- a/sim/ppc/ld-insn.h -+++ b/sim/ppc/ld-insn.h -@@ -200,25 +200,15 @@ extern insn_table *load_insn_table - table_include *includes, - cache_table **cache_rules); - --model *models; --model *last_model; -+extern model *models; - --insn *model_macros; --insn *last_model_macro; -+extern insn *model_macros; -+extern insn *model_functions; -+extern insn *model_internal; -+extern insn *model_static; -+extern insn *model_data; - --insn *model_functions; --insn *last_model_function; -- --insn *model_internal; --insn *last_model_internal; -- --insn *model_static; --insn *last_model_static; -- --insn *model_data; --insn *last_model_data; -- --int max_model_fields_len; -+extern int max_model_fields_len; - - extern void insn_table_insert_insn - (insn_table *table, --- -2.28.0 - diff --git a/main/gdb/musl-signals.patch b/main/gdb/musl-signals.patch index bfc410e303f..e04ed0a1766 100644 --- a/main/gdb/musl-signals.patch +++ b/main/gdb/musl-signals.patch @@ -1,5 +1,5 @@ ---- a/gdb/gdbsupport/signals.c 2020-02-08 12:50:14.000000000 +0000 -+++ b/gdb/gdbsupport/signals.c 2020-02-11 13:08:56.482694697 +0000 +--- a/gdbsupport/signals.cc 2020-02-08 12:50:14.000000000 +0000 ++++ b/gdbsupport/signals.cc 2020-02-11 13:08:56.482694697 +0000 @@ -31,6 +31,13 @@ _available_ realtime signal, not the lowest supported; glibc takes several for its own use. */ diff --git a/main/gdb/ppc-ptregs.patch b/main/gdb/ppc-ptregs.patch index 743bd2e6d26..da131ab4c1e 100644 --- a/main/gdb/ppc-ptregs.patch +++ b/main/gdb/ppc-ptregs.patch @@ -1,5 +1,5 @@ ---- a/gdb/gdbserver/linux-ppc-low.c -+++ b/gdb/gdbserver/linux-ppc-low.c +--- a/gdbserver/linux-ppc-low.cc ++++ b/gdbserver/linux-ppc-low.cc @@ -21,7 +21,6 @@ #include "linux-low.h" -- cgit v1.2.3