From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- sys-devel/gdb/Manifest | 3 +- .../gdb/files/gdb-9.2-sim-ppc-fno-common.patch | 97 ++++++++++++++++++++++ sys-devel/gdb/gdb-9.2.ebuild | 3 +- 3 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 sys-devel/gdb/files/gdb-9.2-sim-ppc-fno-common.patch (limited to 'sys-devel/gdb') diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest index 39657096a536..a042e0c5315d 100644 --- a/sys-devel/gdb/Manifest +++ b/sys-devel/gdb/Manifest @@ -1,8 +1,9 @@ AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3 AUX gdb-9.1-ia64.patch 305 BLAKE2B 06201f81db7b3b8059e818bf263fd1090927b3d23bda3d00891c751c62abe0faedc8a21acd4d97a6bcb0e397f31287b343e01627552c4e3df7fd8635e6b8d39b SHA512 e8219d0dccd192b47daab7de6ec8010ec39192225f29df0443bf54969dd6c39b59889a539a5a9ec0519c512377242a4311f3f3ba4dbbd9d8685ca5e617056ef8 +AUX gdb-9.2-sim-ppc-fno-common.patch 2581 BLAKE2B 56115a341ffefada00997bdba890dcf065b315c50e4ccf8f5cd8ccca5fd496b64ce0049819f6fd2bace42bb6391b4a9e1e9578ff233286a09704b67d5bb960d8 SHA512 ae2610ed3ce7c55526979fa9157aff7a46b008bf66b1a304e37c4ce20be74bc762de44a464238c37e0652e7c4bb5915f62c355d1a522d71b22a5819c13ce6e3d DIST gdb-9.1.tar.xz 20980824 BLAKE2B b84b1dc627d7ba697dfd76ba7c0f4f88f1725e1e1b83134d08cf53bf867ebfa07e1d01eff2acd9a57d22a779077bf6ed95d6098e8a58c4d86eaed034ca62ac30 SHA512 84cdd408d80a3fc5779de459c5b26154d31b329ebde7e3aa78799fb1eb245d8b64b8c8ee7242382a1dbd95b4e6f9d84fef41d12a0646aa75d3dee4709ea1f6e7 DIST gdb-9.2.tar.xz 20979436 BLAKE2B e83468f2d2fdcf4a7eb2943564750c7e9e9fa19b00bd832a9c149ad06b199cc7d6e7b8808d552e5f0e9e4f701a9262faf6b0b46ed4e0b4ecd3a0303d873d6d9a SHA512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 EBUILD gdb-9.1.ebuild 7426 BLAKE2B 3e945db45755c81c0827b5ba88cd50a973a1b31b2fe1002c6952456305b23e74cf15b5883c66bad0b0dbe5a391cf339d5360a499783fece47a9a40d0b9b3149b SHA512 363f56c0cbcf235005ecfbe46c269bee068d99b75679c92d40e7608c631f0a51eedfd4163f865aae85749b9f994ca166535e711a5d5c7433b491091c6a3263ba -EBUILD gdb-9.2.ebuild 7435 BLAKE2B 8aeb71d77f1d3695bf2ef50b54a085257a8aebad10261f6102cc122b6702c9a1585622cc9a980277323c0eac8057351007bfd78127cf16b581132d328e45c034 SHA512 9cb9c16326bc5f770145431bc20c4bc658df00fc3cc17734b081b1fbbde30a48fee950a33b0418cf9374b6e612b9706c640d509a999ab850d1d6540b535a8e3a +EBUILD gdb-9.2.ebuild 7477 BLAKE2B 4d3d9eed05c70aec054fec73716d36c6b819cc6e90f45a9c537ec20f49adf37cf38bbe8f510c5b8b279c8350cb8d078c1a296ae41475f917d518ffbf1468f4ac SHA512 ec5405abba89586ddccbab8e7f8215fbb7a2e15968be03d0340fe66368c35fa900c5eb326728ef2ebe9d3469a77f5c70ef32b24f1dec54bda29f80e210e86111 EBUILD gdb-9999.ebuild 7056 BLAKE2B 578a651d684da6f98fd6c0515863c1b90a4c32be826ed469490af1fb4d6b09f43d0a85bbc0bfe9b772e322bcf3598749c6b454d1868a3a6c02c30496995f9f39 SHA512 20277a9dfbf22c6fddf71924098fdb81eeb631bd574b33e674279dc1b13c66476b7cb63d552545a87ab7888473938684adf7ad200346244ba6aee5270bc1cf64 MISC metadata.xml 1110 BLAKE2B 9958c755c2276b00b47550593e37bda9cdd5050834650654e796b9aca622fd4e7b094e80e2648b622fdb46943d3dca00208f11e1ea0c9bfdb32ad891b9acaad1 SHA512 f58a0166980a8ef71d36872736afc8f86ded7f731864cc3d302e84818c3afc01eca49748e4533bc305c2d3d73521a008260097b9533dd3392a451528f3794a0d diff --git a/sys-devel/gdb/files/gdb-9.2-sim-ppc-fno-common.patch b/sys-devel/gdb/files/gdb-9.2-sim-ppc-fno-common.patch new file mode 100644 index 000000000000..76b29649ad2e --- /dev/null +++ b/sys-devel/gdb/files/gdb-9.2-sim-ppc-fno-common.patch @@ -0,0 +1,97 @@ +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/sys-devel/gdb/gdb-9.2.ebuild b/sys-devel/gdb/gdb-9.2.ebuild index 704ce614906a..cc5393a18132 100644 --- a/sys-devel/gdb/gdb-9.2.ebuild +++ b/sys-devel/gdb/gdb-9.2.ebuild @@ -44,7 +44,7 @@ SRC_URI="${SRC_URI} LICENSE="GPL-2 LGPL-2" SLOT="0" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" REQUIRED_USE=" @@ -91,6 +91,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-8.3.1-verbose-build.patch "${FILESDIR}"/${PN}-9.1-ia64.patch + "${FILESDIR}"/${P}-sim-ppc-fno-common.patch ) GDB_BUILD_DIR="${WORKDIR}"/${P}-build -- cgit v1.2.3