From owner-svn-src-all@freebsd.org  Wed Jan  3 17:35:39 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 F3200EA69C4;
 Wed,  3 Jan 2018 17:35:39 +0000 (UTC) (envelope-from jhb@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 BD3F57DB99;
 Wed,  3 Jan 2018 17:35:39 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w03HZcTC082842;
 Wed, 3 Jan 2018 17:35:38 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w03HZcFL082840;
 Wed, 3 Jan 2018 17:35:38 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201801031735.w03HZcFL082840@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 3 Jan 2018 17:35:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r327523 - in head/stand/mips/beri: boot2 loader
X-SVN-Group: head
X-SVN-Commit-Author: jhb
X-SVN-Commit-Paths: in head/stand/mips/beri: boot2 loader
X-SVN-Commit-Revision: 327523
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.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Jan 2018 17:35:40 -0000

Author: jhb
Date: Wed Jan  3 17:35:38 2018
New Revision: 327523
URL: https://svnweb.freebsd.org/changeset/base/327523

Log:
  Don't clobber system LDFLAGS for beri boot loaders.
  
  Prior to r325114, bsd.init.mk was included after assignments to CFLAGS and
  LDFLAGS in these Makefiles.  After r325114, bare assignments (= rather than
  +=) lost system-assigned default values that are needed when compiling with
  an external toolchain.  CFLAGS in both Makefiles already uses +=.  This
  commit changes LDFLAGS to use +=.  While here, depend on the LDFLAGS update
  in the parent Makefile.inc to set -nostdlib.
  
  Sponsored by:	DARPA / AFRL

Modified:
  head/stand/mips/beri/boot2/Makefile
  head/stand/mips/beri/loader/Makefile

Modified: head/stand/mips/beri/boot2/Makefile
==============================================================================
--- head/stand/mips/beri/boot2/Makefile	Wed Jan  3 17:28:01 2018	(r327522)
+++ head/stand/mips/beri/boot2/Makefile	Wed Jan  3 17:35:38 2018	(r327523)
@@ -53,8 +53,7 @@ CFLAGS+=	-I${LDRSRC}			\
 		-fno-pic -mno-abicalls		\
 		-g
 
-LDFLAGS=	-nostdlib			\
-		-static				\
+LDFLAGS+=	-static				\
 		-Wl,-N				\
 		-G0				\
 		-L${.CURDIR}

Modified: head/stand/mips/beri/loader/Makefile
==============================================================================
--- head/stand/mips/beri/loader/Makefile	Wed Jan  3 17:28:01 2018	(r327522)
+++ head/stand/mips/beri/loader/Makefile	Wed Jan  3 17:35:38 2018	(r327523)
@@ -85,8 +85,7 @@ CFLAGS+=	-G0					\
 		-mno-abicalls				\
 		-g
 
-LDFLAGS=	-nostdlib				\
-		-static					\
+LDFLAGS+=	-static					\
 		-T ${.CURDIR}/loader.ldscript		\
 		-L${.CURDIR}				\
 		-e __start