From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0BA381382C5 for ; Thu, 17 May 2018 18:15:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9EA4E0ABB; Thu, 17 May 2018 18:15:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A48ACE0ABA for ; Thu, 17 May 2018 18:15:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F12E335C09 for ; Thu, 17 May 2018 18:15:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C66C52A1 for ; Thu, 17 May 2018 18:15:37 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1526580906.3b125569cb62d55c839898351dc7238d185923d9.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: eclass/ X-VCS-Repository: proj/musl X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: 3b125569cb62d55c839898351dc7238d185923d9 X-VCS-Branch: master Date: Thu, 17 May 2018 18:15:37 +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: dddba2e1-d9a8-4af0-b2a9-fc727c539691 X-Archives-Hash: f45b86b02e9ec730c1a6457ab40baf14 commit: 3b125569cb62d55c839898351dc7238d185923d9 Author: Aric Belsito gmail com> AuthorDate: Thu May 17 18:15:06 2018 +0000 Commit: Aric Belsito gmail com> CommitDate: Thu May 17 18:15:06 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3b125569 toolchain.eclass: sync with upstream eclass/toolchain.eclass | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 47e99ac..0163767 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -137,7 +137,8 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking" [[ -n ${D_VER} ]] && IUSE+=" d" [[ -n ${SPECS_VER} ]] && IUSE+=" nossp" - tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc" + tc_version_is_at_least 3 && IUSE+=" doc hardened multilib objc" + tc_version_is_between 3 7 && IUSE+=" awt gcj" tc_version_is_at_least 3.3 && IUSE+=" pgo" tc_version_is_at_least 4.0 && IUSE+=" objc-gc" tc_version_is_between 4.0 4.9 && IUSE+=" mudflap" @@ -149,9 +150,12 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then # versions which we dropped. Since graphite was also experimental in # the older versions, we don't want to bother supporting it. #448024 tc_version_is_at_least 4.8 && IUSE+=" graphite" IUSE_DEF+=( sanitize ) - tc_version_is_at_least 4.9 && IUSE+=" cilk +vtv" + tc_version_is_between 4.9 8 && IUSE+=" cilk" + tc_version_is_at_least 4.9 && IUSE+=" +vtv" tc_version_is_at_least 5.0 && IUSE+=" jit mpx" tc_version_is_at_least 6.0 && IUSE+=" +pie +ssp +pch" + # systemtap is a gentoo-specific switch: bug #654748 + tc_version_is_at_least 8.0 && IUSE+=" systemtap" fi IUSE+=" ${IUSE_DEF[*]/#/+}" @@ -218,6 +222,11 @@ if in_iuse gcj ; then DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )" fi +if in_iuse systemtap ; then + # gcc needs sys/sdt.h headers on target + DEPEND+=" systemtap? ( dev-util/systemtap )" +fi + PDEPEND=">=sys-devel/gcc-config-1.7" #---->> S + SRC_URI essentials <<---- @@ -1208,7 +1217,17 @@ toolchain_src_configure() { if hardened_gcc_is_stable ssp; then export gcc_cv_libc_provides_ssp=yes fi - confgcc+=( --disable-libssp ) + if use_if_iuse ssp; then + # On some targets USE="ssp -libssp" is an invalid + # configuration as target libc does not provide + # stack_chk_* functions. Do not disable libssp there. + case ${CTARGET} in + mingw*|*-mingw*) ewarn "Not disabling libssp" ;; + *) confgcc+=( --disable-libssp ) ;; + esac + else + confgcc+=( --disable-libssp ) + fi fi fi @@ -1220,6 +1239,10 @@ toolchain_src_configure() { confgcc+=( $(use_enable mpx libmpx) ) fi + if in_iuse systemtap ; then + confgcc+=( $(use_enable systemtap) ) + fi + if in_iuse vtv ; then confgcc+=( $(use_enable vtv vtable-verify)