From owner-svn-src-head@freebsd.org Thu Apr 19 20:58:10 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B8A3BFA1DFE; Thu, 19 Apr 2018 20:58:10 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 683BE7DA0C; Thu, 19 Apr 2018 20:58:10 +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 633CA6F10; Thu, 19 Apr 2018 20:58:10 +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 w3JKwAHU030359; Thu, 19 Apr 2018 20:58:10 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3JKwAMS030357; Thu, 19 Apr 2018 20:58:10 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201804192058.w3JKwAMS030357@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 19 Apr 2018 20:58:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r332794 - in head: share/mk stand/i386 X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: share/mk stand/i386 X-SVN-Commit-Revision: 332794 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Apr 2018 20:58:10 -0000 Author: emaste Date: Thu Apr 19 20:58:09 2018 New Revision: 332794 URL: https://svnweb.freebsd.org/changeset/base/332794 Log: Add support for linker-type-specific flags r332090 added a LINKER_TYPE test to add the --no-rosegment flag when linking the i386 loader components with lld. Instead, introduce a general mechanism for setting LDFLAGS for a specific linker type, and use it for --no-rosegment. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D14998 Modified: head/share/mk/bsd.sys.mk head/stand/i386/Makefile.inc Modified: head/share/mk/bsd.sys.mk ============================================================================== --- head/share/mk/bsd.sys.mk Thu Apr 19 20:47:53 2018 (r332793) +++ head/share/mk/bsd.sys.mk Thu Apr 19 20:58:09 2018 (r332794) @@ -226,6 +226,8 @@ ACFLAGS+= ${ACFLAGS.${.IMPSRC:T}} CFLAGS+= ${CFLAGS.${.IMPSRC:T}} CXXFLAGS+= ${CXXFLAGS.${.IMPSRC:T}} +LDFLAGS+= ${LDFLAGS.${LINKER_TYPE}} + .if defined(SRCTOP) # Prevent rebuilding during install to support read-only objdirs. .if ${.TARGETS:M*install*} == ${.TARGETS} && empty(.MAKE.MODE:Mmeta) Modified: head/stand/i386/Makefile.inc ============================================================================== --- head/stand/i386/Makefile.inc Thu Apr 19 20:47:53 2018 (r332793) +++ head/stand/i386/Makefile.inc Thu Apr 19 20:58:09 2018 (r332794) @@ -2,13 +2,9 @@ # # $FreeBSD$ -.sinclude - LOADER_ADDRESS?=0x200000 LDFLAGS+= -nostdlib -.if defined(LINKER_TYPE) && ${LINKER_TYPE} == "lld" -LDFLAGS+= -Wl,--no-rosegment -.endif +LDFLAGS.lld+= -Wl,--no-rosegment # BTX components BTXDIR= ${BOOTOBJ}/i386/btx