gentoo resync 31.01.2019

3 files changed, 53 insertions, 2 deletions

diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 47593bf96a9d..7a7a82e98bce 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,6 +1,7 @@
 AUX gdb-7.12.1-ia64-include.patch 891 BLAKE2B ab8fd5cf7c394a302d3c6de36f1157623dce854c0b10c9d3925db0b09aeea7d3a6c788dbed3f3e4d338535b35c3913ce8ff57edaa3d5cb587612a9de96718ec7 SHA512 0891e407b9a97dc26d99cf91f01f1316076dc5c303ddfd49e535ccf442d70cfb1b3d0b078c28da7208009fc4674606be96467fbd9b3d6773d1fe12305d89bdb0
 AUX gdb-8.2-sparc-fix-syntax.patch 399 BLAKE2B db7c9fad33cb9b43e986c7a5fb0adfb7fea9aac3f59990f9e8b41ca550c7e0da2363a24f06bddd321d1629857c5cc9bafba1c62920527ccfc4f375e8fd6667e2 SHA512 631dc6d92852e7852dfaa1d99fe32b98bf646f886f9906f1e170aac2d17f2809374336b93d1fd56f09419e8317b6f7634d809fe59022b803f32e18ba7d89ab39
 AUX gdb-8.2-tinfow.patch 1629 BLAKE2B eb771e3ce9add5eeb6c9d87cec229fda6557eb907877ecb4461060b8869c8598891368bb83c9ae71f5840edc0d95c9fa6d7c386e78afb724fdeadf5d1619269f SHA512 a406922c3fa9c0264cb4250895783d433f59f88eda8df63e509bc8c43d6b55b540262f34dd6f57894958574d9f3412d9d6f46397c229515204d62b0e642570d2
+AUX gdb-8.2.1-aarch64-musl.patch 1785 BLAKE2B a119c650c709827a35badc36a4ac0b7df30709ecb129cc3f55091c508059eb325691a2ca81d8ca8ed50f8bfbd194af2199bd03ff0c6820fc63ac170499443020 SHA512 93745b0539492a3790baf728b703d8ae09ed7e378a522471cef8db934dbd5fcf474bfdcd9ec83c7ba42bb3610e74a7f5d901fbb4b8ce6c5bbc2ac9a9ad133151
 DIST gdb-7.10.1.tar.xz 18531436 BLAKE2B b50a1b6b5b867e4a52943fdc4992c654ceec180099771381df78de5ba79086e822264356a762c61b89e986407d6f0cce336be216276545591e637131dc02f4a8 SHA512 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010
 DIST gdb-7.12.1.tar.xz 19225392 BLAKE2B 2e4b7fe69c3cb11c04b505d1e110bf0a9ca65b6178f3e6a6ccc11fde1e8750b595016baf64adb2c22903d346cec1dab15574681de812ac8d260aebf4152a3027 SHA512 0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8
 DIST gdb-7.9.1.tar.xz 17867692 BLAKE2B f5de07a4ebf1a5112a1b40341b217d08f1eb6820eb2237a4be2cd289f832600b81b3c14f4632a762fdc13945a2fb65ffb58f13eb330f3d48892799e27bb62c87 SHA512 eebdf88b24e52e792b8a4b89ea85790de72b462a7810b44975fdf4232c068f353b15506071f450102a9d4bcecdde8e93dc3748a10699b7f73f3e04fb2d9d8414
@@ -16,7 +17,7 @@ EBUILD gdb-8.1-r1.ebuild 7114 BLAKE2B ffb1e998275339b3cdcf5c6babb344171b7d533e15
 EBUILD gdb-8.1-r2.ebuild 7110 BLAKE2B 399cf3ef970f92d911a9a1b5eb2e4c0058e5c1f6c70a9c1e41919b45d046d2f704d865670d4dfd39f13d36dc9f4a19f22ba6082321ffb36b373de709c79e28d6 SHA512 95e0952c373b5f2e8d6013a281f2982c096c035ec01503ac36308f5bac29ec58d7775ad04375cb5702ecaa6d2509e178c1ed1cea8719fe662ce3868ca98500e7
 EBUILD gdb-8.1.1.ebuild 7115 BLAKE2B 07455f6ec0eb8d32bd57f404b2e831accb70995e61bd82232c8150b6f6acec2690d8b9419245e006074d4e89aaf60ffcf6571c3b09099b5d4d0ca2b11ea11318 SHA512 41864e8336b484cd7fbddac2151d567821923545442e8ed4c6717e928c76b72c5a843eab5d35b053eaf9a94ff3435e617ef68a8ff705f99752fb90ea5ef20699
 EBUILD gdb-8.2-r1.ebuild 7322 BLAKE2B dcfda93fad78dbabf0153edbf1d0be0eea4cfdae1e3304bb1a5f2576d5a053d2e259063bb58e1b6cb1bddab7119120bcdcb7bf833c10f0a0596ff59a59d474c3 SHA512 2d07f8cc3e663c72676f726fe60943166bff599372d8f09e4e20c923647f0ad43148efae563f84ae5a783c44c7616560a7419890d6a0a9b84e05158aea604a82
-EBUILD gdb-8.2.1.ebuild 7117 BLAKE2B a244e1a783ae8c1cf695595b0f463dd56f2d667482147eaf521656e9a3663b6653149d88526e3b614f3273d70785112d3ebe272a64a365aaffd7fe034ef0da41 SHA512 c75dd0741fbddd2b6488f2e8f8c07de5cae9cb031fba566d3d5101eaf64242ef1e0e82faac3d6c29f4ebe0ce0fd19cb4411f4cb9fc0d97214e62f3619c6f86bd
+EBUILD gdb-8.2.1.ebuild 7163 BLAKE2B 3b2320ef7d326b832a7541c3b3458475592729cab8053b8af859a7a55c49d702daf29eca478456341ee9a6fd9877bcc7897055c019a3ada4b54f38505bc78b3d SHA512 6fb5f809aeb1035dbedb44a6fa5091cf542fd4d7a78eaca77145060f234f052361ca9057e4e228d696b326284ec7a398fe0563809f986e398802436d2b89eeae
 EBUILD gdb-8.2.ebuild 7232 BLAKE2B 50ae71f70afbbbd0198394b6a638a68b29c3be243add4178b5fb2c4d5d2d6e940875c0e677d24cb1af16ee79d3c15cf99ed1160c36830e9c71fd6f92ea86f71d SHA512 ce0d2accd9d22baf1842737129925554291b1c4c9fa7f45cb853712a9ce5984d3305ab77721095d2483db1eddb025aa36b766195c98d404bcd9aec1bfff52a90
 EBUILD gdb-9999.ebuild 7001 BLAKE2B f80c1da52728749e4913b3a7b29c723fb301ca742a62477765bb23d1187ced22f2e75b1eec7185495a32681971bbb8a1de223b96a099dd5c3222e778598912a4 SHA512 8017998eba988d085b23ba849123a84b223154957c3a684728bce43c469fe40115f6873df5ecdd5b104711705818c0d3cd18c9e2303793c9e9a8f5b7908da87e
 MISC metadata.xml 914 BLAKE2B 1260cb2638b32429345bd92c06c58074b3486ba3c516e25dab674b4589bf774f2f7192f7ed3ab9da4ed31e313038a389904bee6f9b77707d794530e3a244dfb4 SHA512 515a5bcd6c70fc87309cd4e3822d83e1b8fdf52e58cbf331df0c38b9096ad2410dfdad14aed100ea0a53457f57ecdf2b61b910b6a52765219815e1872872ee0c
diff --git a/sys-devel/gdb/files/gdb-8.2.1-aarch64-musl.patch b/sys-devel/gdb/files/gdb-8.2.1-aarch64-musl.patch
new file mode 100644
index 000000000000..70f42df90a91
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-8.2.1-aarch64-musl.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/676620
+
+From 51b4f73a37c2e7eec31e932fc3c8dae879735f63 Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <szabolcs.nagy@arm.com>
+Date: Thu, 13 Dec 2018 17:47:17 +0000
+Subject: [PATCH] AArch64: Fix the gdb build with musl libc
+
+Including asm/sigcontext.h together with libc headers is not valid. In
+general linux headers may not work with libc headers, so mixing them
+should be avoided, especially when the linux header defines types that
+are also exposed in libc headers.
+
+In case of asm/sigcontext.h glibc happens to work because glibc signal.h
+directly includes it, but e.g. in musl libc signal.h replicates the
+sigcontext.h definitions in an abi compatible way which are in conflict
+with the linux definitions when both headers are included.
+
+Since old linux headers or old libc headers may not have the necessary
+definitions, gdb has to replicate the definitions it relies on anyway.
+Which is fine since all definitions must be ABI stable. For linux apis
+that are not available via libc headers, replicating the definitions in
+gdb is the most reliable way to use them.
+
+Note: asm/ptrace.h includes asm/sigcontext.h in some versions of linux
+headers, which is just as problematic and should be fixed in linux.
+
+gdb/ChangeLog:
+
+	* nat/aarch64-sve-linux-ptrace.h: Include signal.h instead of
+	asm/sigcontext.h.
+---
+ gdb/ChangeLog                      | 5 +++++
+ gdb/nat/aarch64-sve-linux-ptrace.h | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+--- a/gdb/nat/aarch64-sve-linux-ptrace.h
++++ b/gdb/nat/aarch64-sve-linux-ptrace.h
+@@ -20,7 +20,7 @@
+ #ifndef AARCH64_SVE_LINUX_PTRACE_H
+ #define AARCH64_SVE_LINUX_PTRACE_H
+ 
+-#include <asm/sigcontext.h>
++#include <signal.h>
+ #include <sys/utsname.h>
+ #include <sys/ptrace.h>
+ #include <asm/ptrace.h>
+-- 
+2.20.1
+
diff --git a/sys-devel/gdb/gdb-8.2.1.ebuild b/sys-devel/gdb/gdb-8.2.1.ebuild
index c7a030aa640b..57cee06eec95 100644
--- a/sys-devel/gdb/gdb-8.2.1.ebuild
+++ b/sys-devel/gdb/gdb-8.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -93,6 +93,7 @@ S=${WORKDIR}/${PN}-${MY_PV}
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.2-tinfow.patch
 	"${FILESDIR}"/${PN}-8.2-sparc-fix-syntax.patch
+	"${FILESDIR}"/${PN}-8.2.1-aarch64-musl.patch
 )
 
 pkg_setup() {