Site Navigation

Date:      Wed, 24 Jun 2020 17:54:25 +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: r362589 - in head/lib/csu: aarch64 arm i386 riscv
Message-ID:  <202006241754.05OHsPvS018050@repo.freebsd.org>

---

next in thread | raw e-mail | index | archive | help

---

Author: jhb
Date: Wed Jun 24 17:54:24 2020
New Revision: 362589
URL: https://svnweb.freebsd.org/changeset/base/362589

Log:
  Always compile the brand and ignore init ELF notes standalone.
  
  Reviewed by:	kib
  Sponsored by:	DARPA
  Differential Revision:	https://reviews.freebsd.org/D25374

Modified:
  head/lib/csu/aarch64/Makefile
  head/lib/csu/aarch64/crt1_s.S
  head/lib/csu/arm/Makefile
  head/lib/csu/arm/crt1_s.S
  head/lib/csu/i386/Makefile
  head/lib/csu/i386/crt1_s.S
  head/lib/csu/riscv/Makefile
  head/lib/csu/riscv/crt1_s.S

Modified: head/lib/csu/aarch64/Makefile
==============================================================================
--- head/lib/csu/aarch64/Makefile	Wed Jun 24 17:31:21 2020	(r362588)
+++ head/lib/csu/aarch64/Makefile	Wed Jun 24 17:54:24 2020	(r362589)
@@ -18,20 +18,21 @@ FILESDIR=	${LIBDIR}
 .undef LIBRARIES_ONLY
 
 CLEANFILES=	${OBJS} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
+CLEANFILES+=	crtbrand.o ignore_init_note.o
 
 gcrt1_c.o: crt1_c.c
 	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
 
-gcrt1.o: gcrt1_c.o crt1_s.o
-	${LD} ${_LDFLAGS} -o gcrt1.o -r crt1_s.o gcrt1_c.o
+gcrt1.o: gcrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC}
 
-crt1.o:	crt1_c.o crt1_s.o
-	${LD} ${_LDFLAGS} -o crt1.o -r crt1_s.o crt1_c.o
+crt1.o:	crt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC}
 
 Scrt1_c.o: crt1_c.c
 	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
 
-Scrt1.o: Scrt1_c.o crt1_s.o
-	${LD} ${_LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o
+Scrt1.o: Scrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC}
 
 .include <bsd.lib.mk>

Modified: head/lib/csu/aarch64/crt1_s.S
==============================================================================
--- head/lib/csu/aarch64/crt1_s.S	Wed Jun 24 17:31:21 2020	(r362588)
+++ head/lib/csu/aarch64/crt1_s.S	Wed Jun 24 17:54:24 2020	(r362589)
@@ -32,9 +32,6 @@
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
-#include "crtbrand.S"
-#include "ignore_init_note.S"
-
 ENTRY(_start)
 	mov	x3, x2		/* cleanup */
 	add	x1, x0, #8	/* load argv */

Modified: head/lib/csu/arm/Makefile
==============================================================================
--- head/lib/csu/arm/Makefile	Wed Jun 24 17:31:21 2020	(r362588)
+++ head/lib/csu/arm/Makefile	Wed Jun 24 17:54:24 2020	(r362589)
@@ -18,23 +18,24 @@ FILESDIR=	${LIBDIR}
 .undef LIBRARIES_ONLY
 
 CLEANFILES=	${OBJS} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
+CLEANFILES+=	crtbrand.o ignore_init_note.o
 
 crt1_c.o: crt1_c.c
 	${CC} ${CFLAGS} ${STATIC_CFLAGS} -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
 
-crt1.o:	crt1_c.o crt1_s.o
-	${LD} ${_LDFLAGS} -o crt1.o -r crt1_s.o crt1_c.o
+crt1.o:	crt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC}
 
 gcrt1_c.o: crt1_c.c
 	${CC} ${CFLAGS} ${STATIC_CFLAGS} -DGCRT -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
 
-gcrt1.o: gcrt1_c.o crt1_s.o
-	${LD} ${_LDFLAGS} -o gcrt1.o -r crt1_s.o gcrt1_c.o
+gcrt1.o: gcrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC}
 
 Scrt1_c.o: crt1_c.c
 	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
 
-Scrt1.o: Scrt1_c.o crt1_s.o
-	${LD} ${_LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o
+Scrt1.o: Scrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC}
 
 .include <bsd.lib.mk>

Modified: head/lib/csu/arm/crt1_s.S
==============================================================================
--- head/lib/csu/arm/crt1_s.S	Wed Jun 24 17:31:21 2020	(r362588)
+++ head/lib/csu/arm/crt1_s.S	Wed Jun 24 17:54:24 2020	(r362589)
@@ -44,8 +44,9 @@
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
-#include "crtbrand.S"
-#include "ignore_init_note.S"
+#include <sys/param.h>
+#include <sys/elf_common.h>
+#include "notes.h"
 
 ENTRY(_start)
 	mov	r5, r2		/* cleanup */

Modified: head/lib/csu/i386/Makefile
==============================================================================
--- head/lib/csu/i386/Makefile	Wed Jun 24 17:31:21 2020	(r362588)
+++ head/lib/csu/i386/Makefile	Wed Jun 24 17:54:24 2020	(r362589)
@@ -18,22 +18,23 @@ FILESDIR=	${LIBDIR}
 .undef LIBRARIES_ONLY
 
 CLEANFILES=	${OBJS} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
+CLEANFILES+=	crtbrand.o ignore_init_note.o
 
 gcrt1_c.o: crt1_c.c
 	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
 
-gcrt1.o: gcrt1_c.o crt1_s.o
-	${LD} ${_LDFLAGS} -o gcrt1.o -r crt1_s.o gcrt1_c.o
+gcrt1.o: gcrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC}
 
-crt1.o:	crt1_c.o crt1_s.o
-	${LD} ${_LDFLAGS} -o crt1.o -r crt1_s.o crt1_c.o
+crt1.o:	crt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC}
 	${OBJCOPY} --localize-symbol _start1 crt1.o
 
 Scrt1_c.o: crt1_c.c
 	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
 
-Scrt1.o: Scrt1_c.o crt1_s.o
-	${LD} ${_LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o
+Scrt1.o: Scrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC}
 	${OBJCOPY} --localize-symbol _start1 Scrt1.o
 
 .include <bsd.lib.mk>

Modified: head/lib/csu/i386/crt1_s.S
==============================================================================
--- head/lib/csu/i386/crt1_s.S	Wed Jun 24 17:31:21 2020	(r362588)
+++ head/lib/csu/i386/crt1_s.S	Wed Jun 24 17:54:24 2020	(r362589)
@@ -25,9 +25,6 @@
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
-#include "crtbrand.S"
-#include "ignore_init_note.S"
-
 	.text
 	.align	4
 	.globl	_start

Modified: head/lib/csu/riscv/Makefile
==============================================================================
--- head/lib/csu/riscv/Makefile	Wed Jun 24 17:31:21 2020	(r362588)
+++ head/lib/csu/riscv/Makefile	Wed Jun 24 17:54:24 2020	(r362589)
@@ -18,20 +18,21 @@ FILESDIR=	${LIBDIR}
 .undef LIBRARIES_ONLY
 
 CLEANFILES=	${OBJS} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
+CLEANFILES+=	crtbrand.o ignore_init_note.o
 
 gcrt1_c.o: crt1_c.c
 	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
 
-gcrt1.o: gcrt1_c.o crt1_s.o
-	${LD} ${_LDFLAGS} -o gcrt1.o -r crt1_s.o gcrt1_c.o
+gcrt1.o: gcrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC}
 
-crt1.o:	crt1_c.o crt1_s.o
-	${LD} ${_LDFLAGS} -o crt1.o -r crt1_s.o crt1_c.o
+crt1.o:	crt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC}
 
 Scrt1_c.o: crt1_c.c
 	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
 
-Scrt1.o: Scrt1_c.o crt1_s.o
-	${LD} ${_LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o
+Scrt1.o: Scrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC}
 
 .include <bsd.lib.mk>

Modified: head/lib/csu/riscv/crt1_s.S
==============================================================================
--- head/lib/csu/riscv/crt1_s.S	Wed Jun 24 17:31:21 2020	(r362588)
+++ head/lib/csu/riscv/crt1_s.S	Wed Jun 24 17:54:24 2020	(r362589)
@@ -36,9 +36,6 @@
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
-#include "crtbrand.S"
-#include "ignore_init_note.S"
-
 ENTRY(_start)
 	mv	a3, a2		# cleanup
 	addi	a1, a0, 8	# get argv

---

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006241754.05OHsPvS018050>

Legal Notices | © 1995-2025 The FreeBSD Project. All rights reserved.

Contact