From 7126b67e9e9df7b9133232f0cc90048e2ff3df52 Mon Sep 17 00:00:00 2001 From: jhb Date: Tue, 7 Jul 2020 18:19:05 +0000 Subject: [PATCH] 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 Reviewed by: kib Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D25585 --- lib/csu/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc index 7d7136e8c1a6..319f70750938 100644 --- a/lib/csu/Makefile.inc +++ b/lib/csu/Makefile.inc @@ -37,7 +37,7 @@ CLEANFILES+= ${OBJS} ${CRT1OBJS} crt1_c.o gcrt1_c.o Scrt1_c.o 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