From owner-svn-src-projects@freebsd.org Thu Jan 26 02:22:25 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E200CC1BA0 for ; Thu, 26 Jan 2017 02:22:25 +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 mx1.freebsd.org (Postfix) with ESMTPS id E868EF49; Thu, 26 Jan 2017 02:22:24 +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 v0Q2MOqD039018; Thu, 26 Jan 2017 02:22:24 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0Q2MONF039017; Thu, 26 Jan 2017 02:22:24 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201701260222.v0Q2MONF039017@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 26 Jan 2017 02:22:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r312788 - projects/clang400-import/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2017 02:22:25 -0000 Author: emaste Date: Thu Jan 26 02:22:23 2017 New Revision: 312788 URL: https://svnweb.freebsd.org/changeset/base/312788 Log: Enable LLD (as ld.lld) on i386 and arm With this change LLD will be built on the same set of architectures that use Clang as /usr/bin/cc. It is not yet fully functional as a system linker for i386 and arm, but is ready for further testing and investigation. Modified: projects/clang400-import/share/mk/src.opts.mk Modified: projects/clang400-import/share/mk/src.opts.mk ============================================================================== --- projects/clang400-import/share/mk/src.opts.mk Thu Jan 26 01:24:05 2017 (r312787) +++ projects/clang400-import/share/mk/src.opts.mk Thu Jan 26 02:22:23 2017 (r312788) @@ -223,18 +223,18 @@ __TT=${MACHINE} .if ${COMPILER_FEATURES:Mc++11} && (${__T} == "aarch64" || \ ${__T} == "amd64" || ${__TT} == "arm" || ${__T} == "i386") # Clang is enabled, and will be installed as the default /usr/bin/cc. -__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC +__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC LLD __DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX .elif ${COMPILER_FEATURES:Mc++11} && ${__T} != "riscv64" && ${__T} != "sparc64" # If an external compiler that supports C++11 is used as ${CC} and Clang # supports the target, then Clang is enabled but GCC is installed as the # default /usr/bin/cc. __DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX -__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC +__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC LLD .else # Everything else disables Clang, and uses GCC instead. __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX -__DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC +__DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC LLD .endif # In-tree binutils/gcc are older versions without modern architecture support. .if ${__T} == "aarch64" || ${__T:Mriscv*} != "" @@ -257,9 +257,9 @@ __DEFAULT_YES_OPTIONS+=LLD_AS_LD __DEFAULT_NO_OPTIONS+=LLD_AS_LD .endif .if ${__T} == "aarch64" || ${__T} == "amd64" -__DEFAULT_YES_OPTIONS+=LLD LLDB +__DEFAULT_YES_OPTIONS+=LLDB .else -__DEFAULT_NO_OPTIONS+=LLD LLDB +__DEFAULT_NO_OPTIONS+=LLDB .endif # LLVM lacks support for FreeBSD 64-bit atomic operations for ARMv4/ARMv5 .if ${__T} == "arm" || ${__T} == "armeb"