From owner-svn-src-all@freebsd.org Fri May 8 14:54:41 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 41D912D953A; Fri, 8 May 2020 14:54:41 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49JYJd10dlz3PKQ; Fri, 8 May 2020 14:54:41 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1D7C3424E; Fri, 8 May 2020 14:54:41 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 048Eseqp068503; Fri, 8 May 2020 14:54:40 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 048EseLx068502; Fri, 8 May 2020 14:54:40 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202005081454.048EseLx068502@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 8 May 2020 14:54:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r360815 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 360815 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.32 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2020 14:54:41 -0000 Author: emaste Date: Fri May 8 14:54:40 2020 New Revision: 360815 URL: https://svnweb.freebsd.org/changeset/base/360815 Log: src.opts.mk: update BINUTILS options and add comments BINUTILS is needed only for ports, and will be disabled once the failing ports are addressed (likely by growing a binutils dependency). BINUTILS_BOOTSTRAP is needed only on amd64, for skein_block_asm.s. There is no need to enable it on i386. This will all be removed before FreeBSD 13.0. Modified: head/share/mk/src.opts.mk Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Fri May 8 14:48:45 2020 (r360814) +++ head/share/mk/src.opts.mk Fri May 8 14:54:40 2020 (r360815) @@ -290,8 +290,13 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF .if ${__T} == "aarch64" || ${__T:Mriscv*} != "" BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GDB .endif -.if ${__T} == "amd64" || ${__T} == "i386" +# BINUTILS is enabled on x86 to provide as for ports - PR 205250 +# BINUTILS_BOOTSTRAP is needed on amd64 only, for skein_block_asm.s +.if ${__T} == "amd64" __DEFAULT_YES_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP +.elif ${__T} == "i386" +__DEFAULT_YES_OPTIONS+=BINUTILS +__DEFAULT_NO_OPTIONS+=BINUTILS_BOOTSTRAP .else __DEFAULT_NO_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP .endif