From owner-svn-src-all@freebsd.org  Tue Jul  7 18:19:06 2020
Return-Path: <owner-svn-src-all@freebsd.org>
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 7AAB1348AC3;
 Tue,  7 Jul 2020 18:19:06 +0000 (UTC) (envelope-from jhb@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)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 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 4B1W0p2fsYz3gMH;
 Tue,  7 Jul 2020 18:19:06 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3A66D139A7;
 Tue,  7 Jul 2020 18:19:06 +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 067IJ6IG042580;
 Tue, 7 Jul 2020 18:19:06 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 067IJ6Qe042579;
 Tue, 7 Jul 2020 18:19:06 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <202007071819.067IJ6Qe042579@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: Tue, 7 Jul 2020 18:19:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r362995 - head/lib/csu
X-SVN-Group: head
X-SVN-Commit-Author: jhb
X-SVN-Commit-Paths: head/lib/csu
X-SVN-Commit-Revision: 362995
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.33
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: Tue, 07 Jul 2020 18:19:06 -0000

Author: jhb
Date: Tue Jul  7 18:19:05 2020
New Revision: 362995
URL: https://svnweb.freebsd.org/changeset/base/362995

Log:
  Invoke objcopy on the right object when building Scrt1.o on i386.
  
  This was a copy-paste bug in r362902.  While here, switch to using
  ${.TARGET}.
  
  Reported by:	Kjell Tore Ullavik <ktullavik@gmail.com>
  Reviewed by:	kib
  Sponsored by:	DARPA
  Differential Revision:	https://reviews.freebsd.org/D25585

Modified:
  head/lib/csu/Makefile.inc

Modified: head/lib/csu/Makefile.inc
==============================================================================
--- head/lib/csu/Makefile.inc	Tue Jul  7 17:02:23 2020	(r362994)
+++ head/lib/csu/Makefile.inc	Tue Jul  7 18:19:05 2020	(r362995)
@@ -37,7 +37,7 @@ CLEANFILES+=	${OBJS} ${CRT1OBJS} crt1_c.o gcrt1_c.o Sc
 crt1.o:	crt1_c.o ${CRT1OBJS}
 	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
 .if ${MACHINE_ARCH} == "i386"
-	${OBJCOPY} --localize-symbol _start1 crt1.o
+	${OBJCOPY} --localize-symbol _start1 ${.TARGET}
 .endif
 
 gcrt1_c.o: crt1_c.c
@@ -52,7 +52,7 @@ Scrt1_c.o: crt1_c.c
 Scrt1.o: Scrt1_c.o ${CRT1OBJS}
 	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
 .if ${MACHINE_ARCH} == "i386"
-	${OBJCOPY} --localize-symbol _start1 crt1.o
+	${OBJCOPY} --localize-symbol _start1 ${.TARGET}
 .endif
 
 crtbegin.o: crtbegin.c