From owner-svn-src-projects@FreeBSD.ORG Thu Mar 26 22:31:57 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D34DCA2; Thu, 26 Mar 2015 22:31:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 B4E503C6; Thu, 26 Mar 2015 22:31:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2QMVvR0032606; Thu, 26 Mar 2015 22:31:57 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2QMVuEc032602; Thu, 26 Mar 2015 22:31:56 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201503262231.t2QMVuEc032602@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 26 Mar 2015 22:31:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280715 - in projects/lld-import: . share/mk tools/build/options usr.bin/clang 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.18-1 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 Mar 2015 22:31:58 -0000 Author: dim Date: Thu Mar 26 22:31:55 2015 New Revision: 280715 URL: https://svnweb.freebsd.org/changeset/base/280715 Log: Add src.opts.mk option WITH_LLD, to connect lld to the build. Added: projects/lld-import/tools/build/options/WITH_LLD (contents, props changed) Modified: projects/lld-import/Makefile.inc1 projects/lld-import/share/mk/src.opts.mk projects/lld-import/usr.bin/clang/Makefile Modified: projects/lld-import/Makefile.inc1 ============================================================================== --- projects/lld-import/Makefile.inc1 Thu Mar 26 22:05:31 2015 (r280714) +++ projects/lld-import/Makefile.inc1 Thu Mar 26 22:31:55 2015 (r280715) @@ -259,7 +259,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \ - MK_LLDB=no MK_TESTS=no + MK_LLD=no MK_LLDB=no MK_TESTS=no # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ @@ -271,7 +271,7 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ -DNO_LINT \ -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \ - MK_LLDB=no MK_TESTS=no + MK_LLD=no MK_LLDB=no MK_TESTS=no # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ @@ -1527,7 +1527,7 @@ NXBMAKE= ${NXBENV} ${MAKE} \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \ - MK_LLDB=no + MK_LLD=no MK_LLDB=no native-xtools: .MAKE mkdir -p ${OBJTREE}/nxb-bin/bin Modified: projects/lld-import/share/mk/src.opts.mk ============================================================================== --- projects/lld-import/share/mk/src.opts.mk Thu Mar 26 22:05:31 2015 (r280714) +++ projects/lld-import/share/mk/src.opts.mk Thu Mar 26 22:31:55 2015 (r280715) @@ -181,6 +181,7 @@ __DEFAULT_NO_OPTIONS = \ EISA \ FMAKE \ HESIOD \ + LLD \ LLDB \ NAND \ OFED \ @@ -382,6 +383,7 @@ MK_${vv:H}:= ${MK_${vv:T}} .if !${COMPILER_FEATURES:Mc++11} MK_LLDB:= no +MK_LLD:= no .endif # gcc 4.8 and newer supports libc++, so suppress gnuc++ in that case. Added: projects/lld-import/tools/build/options/WITH_LLD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/lld-import/tools/build/options/WITH_LLD Thu Mar 26 22:31:55 2015 (r280715) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to build the LLD linker. Modified: projects/lld-import/usr.bin/clang/Makefile ============================================================================== --- projects/lld-import/usr.bin/clang/Makefile Thu Mar 26 22:05:31 2015 (r280714) +++ projects/lld-import/usr.bin/clang/Makefile Thu Mar 26 22:31:55 2015 (r280715) @@ -25,6 +25,10 @@ SUBDIR+=bugpoint \ opt .endif +.if ${MK_LLD} != "no" +SUBDIR+=lld +.endif + .if ${MK_LLDB} != "no" SUBDIR+=lldb .endif