From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8336013877A for ; Sun, 31 Aug 2014 16:56:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14FB0E0951; Sun, 31 Aug 2014 16:56:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B7DA7E0951 for ; Sun, 31 Aug 2014 16:56:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B67FB33F9FC for ; Sun, 31 Aug 2014 16:56:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3915A45BA for ; Sun, 31 Aug 2014 16:56:00 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1409504316.63ece5f00873afa800133b7adbc1616a619cf01b.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:musl commit in: sys-devel/gcc/, sys-devel/gcc/files/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: sys-devel/gcc/files/gcc-4.8.3-musl-res_state.patch sys-devel/gcc/gcc-4.8.3-r99.ebuild X-VCS-Directories: sys-devel/gcc/ sys-devel/gcc/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 63ece5f00873afa800133b7adbc1616a619cf01b X-VCS-Branch: musl Date: Sun, 31 Aug 2014 16:56:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6b832744-0815-4bc2-8d92-9e5273f94a39 X-Archives-Hash: 4f41fa2a9d2ca73f910e61b4ee013c76 commit: 63ece5f00873afa800133b7adbc1616a619cf01b Author: Hinnerk van Bruinehsen fu-berlin de> AuthorDate: Sun Aug 31 16:32:36 2014 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sun Aug 31 16:58:36 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=63ece5f0 Fix gcc-4.8.3-r99 build >From e060301e4cba9d3d5d5cb8777e4c76b4a909ed0c Mon Aug 31 18:31:21 2014 From: Hinnerk van Bruinehsen fu-berlin.de> Date: Sun, 31 Aug 2014 16:13:39 +0000 Subject: [PATCH] Fix gcc-4.8.3-r99 build libsanitizer/tsan/tsan_platform_linux.cc uses __res_state * which would have to be either struct __res_state * or the typedef: res_state. The patch uses the latter. Signed-of-by: Hinnerk van Bruinehsen fu-berlin.de> --- sys-devel/gcc/files/gcc-4.8.3-musl-res_state.patch | 12 ++++++++++++ sys-devel/gcc/gcc-4.8.3-r99.ebuild | 1 + 2 files changed, 13 insertions(+) diff --git a/sys-devel/gcc/files/gcc-4.8.3-musl-res_state.patch b/sys-devel/gcc/files/gcc-4.8.3-musl-res_state.patch new file mode 100644 index 0000000..7757c38 --- /dev/null +++ b/sys-devel/gcc/files/gcc-4.8.3-musl-res_state.patch @@ -0,0 +1,12 @@ +diff -ENwbur gcc-4.8.3.orig/libsanitizer/tsan/tsan_platform_linux.cc gcc-4.8.3/libsanitizer/tsan/tsan_platform_linux.cc +--- gcc-4.8.3.orig/libsanitizer/tsan/tsan_platform_linux.cc 2014-08-31 12:50:18.381689906 +0000 ++++ gcc-4.8.3/libsanitizer/tsan/tsan_platform_linux.cc 2014-08-31 13:12:19.838446253 +0000 +@@ -292,7 +292,7 @@ + #ifndef TSAN_GO + int ExtractResolvFDs(void *state, int *fds, int nfd) { + int cnt = 0; +- __res_state *statp = (__res_state*)state; ++ res_state statp = (res_state)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { + if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) + fds[cnt++] = statp->_u._ext.nssocks[i]; diff --git a/sys-devel/gcc/gcc-4.8.3-r99.ebuild b/sys-devel/gcc/gcc-4.8.3-r99.ebuild index 4a64149..b96acf6 100644 --- a/sys-devel/gcc/gcc-4.8.3-r99.ebuild +++ b/sys-devel/gcc/gcc-4.8.3-r99.ebuild @@ -57,6 +57,7 @@ src_prepare() { mv libitm/config/linux/x86 libitm/config/linux/x86_glibc cp -r libitm/config/generic libitm/config/linux/x86 epatch "${FILESDIR}"/${PN}-4.7.3-musl-linker-path.patch + epatch "${FILESDIR}"/${PN}-4.8.3-musl-res_state.patch fi use vanilla && return 0