Date: Tue, 7 Jul 2020 18:19:06 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r362995 - head/lib/csu Message-ID: <202007071819.067IJ6Qe042579@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007071819.067IJ6Qe042579>