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 164E8138334 for ; Thu, 11 Apr 2019 12:55:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E01AEE088C; Thu, 11 Apr 2019 12:55:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B976EE088C for ; Thu, 11 Apr 2019 12:55:27 +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 EBE81340D20 for ; Thu, 11 Apr 2019 12:55:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 637A8520 for ; Thu, 11 Apr 2019 12:55:24 +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: <1554987306.2734048bc5149bc247fb0482fae9f1f713601e90.blueness@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: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 2734048bc5149bc247fb0482fae9f1f713601e90 X-VCS-Branch: master Date: Thu, 11 Apr 2019 12:55:24 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9dedfe13-7081-4482-84e3-77797f705c09 X-Archives-Hash: 31a243be9e098b8dbfac02529fcbe2fe commit: 2734048bc5149bc247fb0482fae9f1f713601e90 Author: Anthony G. Basile gentoo org> AuthorDate: Thu Apr 11 12:54:43 2019 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Thu Apr 11 12:55:06 2019 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2734048b eclass/toolchain.eclass: fix after commit 1fa41385 Signed-off-by: Anthony G. Basile gentoo.org> eclass/toolchain.eclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index be94db8..a3c901d 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1104,6 +1104,9 @@ toolchain_src_configure() { *-elf|*-eabi) confgcc+=( --with-newlib ) ;; + *-musl*) + confgcc+=( --enable-__cxa_atexit ) + ;; *-gnu*) confgcc+=( --enable-__cxa_atexit @@ -2455,12 +2458,16 @@ hardened_gcc_is_stable() { if [[ $1 == "pie" ]] ; then if [[ ${CTARGET} == *-uclibc* ]] ; then tocheck=${PIE_UCLIBC_STABLE} - else + elif [[ ${CTARGET} == *-musl* ]] ; then + tocheck=${PIE_MUSL_STABLE} + elif [[ ${CTARGET} == *-gnu* ]] ; then tocheck=${PIE_GLIBC_STABLE} fi elif [[ $1 == "ssp" ]] ; then if [[ ${CTARGET} == *-uclibc* ]] ; then tocheck=${SSP_UCLIBC_STABLE} + elif [[ ${CTARGET} == *-musl* ]] ; then + tocheck=${SSP_MUSL_STABLE} elif [[ ${CTARGET} == *-gnu* ]] ; then tocheck=${SSP_STABLE} fi