Index: lib/csu/Makefile.inc
===================================================================
--- lib/csu/Makefile.inc
+++ lib/csu/Makefile.inc
@@ -13,7 +13,7 @@
 OBJS+=	crtend.o crtendS.o
 OBJS+=	crti.o crtn.o
 
-CRT1OBJS+=	crtbrand.o ignore_init_note.o
+CRT1OBJS+=	crtbrand.o feature_note.o ignore_init_note.o
 
 ACFLAGS+=	-DLOCORE
 
@@ -33,6 +33,7 @@
 .undef LIBRARIES_ONLY
 
 CLEANFILES+=	${OBJS} ${CRT1OBJS} crt1_c.o gcrt1_c.o Scrt1_c.o
+CLEANFILES+=	crti_s.o
 
 crt1.o:	crt1_c.o ${CRT1OBJS}
 	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
@@ -68,6 +69,12 @@
 	${CC} ${CFLAGS} -I${.CURDIR} ${CFLAGS_CRTS} -c -o ${.TARGET} \
 	    ${.ALLSRC:N*.h:[1]}
 
+crti_s.o: crti.S
+	${CC} ${CFLAGS} ${ACFLAGS} -c ${.ALLSRC:M*.S} -o ${.TARGET}
+
+crti.o: crti_s.o crtbrand.o
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
+
 .endif
 
 .include "../Makefile.inc"
Index: lib/csu/common/crtbrand.S
===================================================================
--- lib/csu/common/crtbrand.S
+++ lib/csu/common/crtbrand.S
@@ -38,7 +38,7 @@
  * for more information.
  */
 
-	.section .note.tag,"a",%note
+	.section .note.tag,"aG",%note,.freebsd.noteG,comdat
 	.p2align	2
 	.4byte		2f-1f
 	.4byte		4f-3f
@@ -46,14 +46,4 @@
 1:	.asciz		NOTE_FREEBSD_VENDOR
 2:	.p2align	2
 3:	.4byte		__FreeBSD_version
-4:
-
-	.section .note.tag,"a",%note
-	.p2align	2
-	.4byte		2f-1f
-	.4byte		4f-3f
-	.4byte		NT_FREEBSD_FEATURE_CTL
-1:	.asciz		NOTE_FREEBSD_VENDOR
-2:	.p2align	2
-3:	.4byte		0
 4:
Index: lib/csu/common/feature_note.S
===================================================================
--- lib/csu/common/feature_note.S
+++ lib/csu/common/feature_note.S
@@ -28,26 +28,9 @@
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
 #include <sys/elf_common.h>
 #include "notes.h"
 
-/*
- * Special ".note.tag" entry specifying the ABI version.  See
- * http://www.netbsd.org/Documentation/kernel/elf-notes.html
- * for more information.
- */
-
-	.section .note.tag,"a",%note
-	.p2align	2
-	.4byte		2f-1f
-	.4byte		4f-3f
-	.4byte		NT_FREEBSD_ABI_TAG
-1:	.asciz		NOTE_FREEBSD_VENDOR
-2:	.p2align	2
-3:	.4byte		__FreeBSD_version
-4:
-
 	.section .note.tag,"a",%note
 	.p2align	2
 	.4byte		2f-1f