Page MenuHomeFreeBSD
Files F105764177

D25374.id73588.diff
No OneTemporary
Actions

D25374.id73588.diff
View Options

Index: head/lib/csu/aarch64/Makefile
===================================================================
--- head/lib/csu/aarch64/Makefile
+++ head/lib/csu/aarch64/Makefile
@@ -18,20 +18,21 @@
.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>
Index: head/lib/csu/aarch64/crt1_s.S
===================================================================
--- head/lib/csu/aarch64/crt1_s.S
+++ head/lib/csu/aarch64/crt1_s.S
@@ -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 */
Index: head/lib/csu/arm/Makefile
===================================================================
--- head/lib/csu/arm/Makefile
+++ head/lib/csu/arm/Makefile
@@ -18,23 +18,24 @@
.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>
Index: head/lib/csu/arm/crt1_s.S
===================================================================
--- head/lib/csu/arm/crt1_s.S
+++ head/lib/csu/arm/crt1_s.S
@@ -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 */
Index: head/lib/csu/i386/Makefile
===================================================================
--- head/lib/csu/i386/Makefile
+++ head/lib/csu/i386/Makefile
@@ -18,22 +18,23 @@
.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>
Index: head/lib/csu/i386/crt1_s.S
===================================================================
--- head/lib/csu/i386/crt1_s.S
+++ head/lib/csu/i386/crt1_s.S
@@ -25,9 +25,6 @@
#include <machine/asm.h>
__FBSDID("$FreeBSD$");
-#include "crtbrand.S"
-#include "ignore_init_note.S"
-
.text
.align 4
.globl _start
Index: head/lib/csu/riscv/Makefile
===================================================================
--- head/lib/csu/riscv/Makefile
+++ head/lib/csu/riscv/Makefile
@@ -18,20 +18,21 @@
.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>
Index: head/lib/csu/riscv/crt1_s.S
===================================================================
--- head/lib/csu/riscv/crt1_s.S
+++ head/lib/csu/riscv/crt1_s.S
@@ -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

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 21, 8:48 AM (15 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15539673
Default Alt Text
D25374.id73588.diff (5 KB)

Event Timeline