Index: Makefile.inc1 =================================================================== --- Makefile.inc1 +++ Makefile.inc1 @@ -2793,13 +2793,10 @@ # These dependencies are not automatically generated: # -# gnu/lib/csu, gnu/lib/libgcc, lib/csu and lib/libc must be built before +# gnu/lib/libgcc, lib/csu and lib/libc must be built before # all shared libraries for ELF. # _startup_libs= lib/csu -.if ${MK_BSD_CRTBEGIN} == "no" -_startup_libs+= gnu/lib/csu -.endif _startup_libs+= lib/libc _startup_libs+= lib/libc_nonshared .if ${MK_LIBCPLUSPLUS} != "no" Index: contrib/bmake/mk/meta2deps.sh =================================================================== --- contrib/bmake/mk/meta2deps.sh +++ contrib/bmake/mk/meta2deps.sh @@ -49,7 +49,6 @@ # The output, is a set of absolute paths with "SB" like: #.nf # -# $SB/obj-i386/bsd/gnu/lib/csu # $SB/obj-i386/bsd/gnu/lib/libgcc # $SB/obj-i386/bsd/include # $SB/obj-i386/bsd/lib/csu/i386 Index: lib/csu/Makefile.inc =================================================================== --- lib/csu/Makefile.inc +++ lib/csu/Makefile.inc @@ -8,7 +8,7 @@ .include -.if ${MK_BSD_CRTBEGIN} != "no" && !defined(BUILDING_TESTS) +.if !defined(BUILDING_TESTS) OBJS+= crtbegin.o crtbeginS.o crtbeginT.o OBJS+= crtend.o crtendS.o Index: share/mk/local.dirdeps-options.mk =================================================================== --- share/mk/local.dirdeps-options.mk +++ share/mk/local.dirdeps-options.mk @@ -3,7 +3,6 @@ # avoid duplication DIRDEPS.AUDIT.yes= lib/libbsm DIRDEPS.BLACKLIST_SUPPORT.yes+= lib/libblacklist -DIRDEPS.BSD_CRTBEGIN.no+= gnu/lib/csu DIRDEPS.CASPER.yes+= lib/libcasper/libcasper DIRDEPS.GSSAPI.yes+= lib/libgssapi DIRDEPS.JAIL.yes+= lib/libjail Index: share/mk/local.dirdeps.mk =================================================================== --- share/mk/local.dirdeps.mk +++ share/mk/local.dirdeps.mk @@ -38,7 +38,6 @@ Nlib/csu* \ Nlib/libc \ Nlib/[mn]* \ - Ngnu/lib/csu* \ Ngnu/lib/lib[a-r]* \ Nsecure/lib* \ Nusr.bin/xinstall* \ @@ -221,11 +220,6 @@ .endif .endif -# this one is too pervasive -.if ${MK_BSD_CRTBEGIN} == "no" && ${DEP_RELDIR:N.:Ngnu/lib/csu:Ninclude*:Ntargets/*} != "" -DIRDEPS+= gnu/lib/csu -.endif - DEP_MACHINE_ARCH = ${MACHINE_ARCH.${DEP_MACHINE}} CSU_DIR.${DEP_MACHINE_ARCH} ?= csu/${DEP_MACHINE_ARCH} CSU_DIR := ${CSU_DIR.${DEP_MACHINE_ARCH}} Index: share/mk/local.gendirdeps.mk =================================================================== --- share/mk/local.gendirdeps.mk +++ share/mk/local.gendirdeps.mk @@ -10,7 +10,6 @@ Nlib/libssp_nonshared \ Ncddl/usr.bin/ctf* \ Nlib/libc_nonshared \ - Ngnu/lib/csu \ Ngnu/lib/libgcc \ Nlib/libgcc_eh \ Nlib/libgcc_s \ Index: share/mk/meta2deps.sh =================================================================== --- share/mk/meta2deps.sh +++ share/mk/meta2deps.sh @@ -49,7 +49,6 @@ # The output, is a set of absolute paths with "SB" like: #.nf # -# $SB/obj-i386/bsd/gnu/lib/csu # $SB/obj-i386/bsd/gnu/lib/libgcc # $SB/obj-i386/bsd/include # $SB/obj-i386/bsd/lib/csu/i386 Index: share/mk/src.opts.mk =================================================================== --- share/mk/src.opts.mk +++ share/mk/src.opts.mk @@ -70,7 +70,6 @@ BOOTPARAMD \ BOOTPD \ BSD_CPIO \ - BSD_CRTBEGIN \ BSDINSTALL \ BSNMP \ BZIP2 \ @@ -390,8 +389,6 @@ .endif .if ${__T:Msparc64} -# Sparc64 need extra crt*.o files - PR 239851 -BROKEN_OPTIONS+=BSD_CRTBEGIN # PR 233405 BROKEN_OPTIONS+=LLVM_LIBUNWIND .endif Index: targets/pseudo/userland/gnu/Makefile.depend =================================================================== --- targets/pseudo/userland/gnu/Makefile.depend +++ targets/pseudo/userland/gnu/Makefile.depend @@ -7,7 +7,6 @@ # This file is not autogenerated - take care! DIRDEPS = \ - gnu/lib/csu \ gnu/lib/libdialog \ gnu/lib/libgcov \ gnu/lib/libgomp \ Index: tools/build/options/WITHOUT_BSD_CRTBEGIN =================================================================== --- tools/build/options/WITHOUT_BSD_CRTBEGIN +++ /dev/null @@ -1,5 +0,0 @@ -.\" $FreeBSD$ -Disable the BSD licensed -.Pa crtbegin.o -and -.Pa crtend.o . Index: tools/build/options/WITH_BSD_CRTBEGIN =================================================================== --- tools/build/options/WITH_BSD_CRTBEGIN +++ /dev/null @@ -1,5 +0,0 @@ -.\" $FreeBSD$ -Enable the BSD licensed -.Pa crtbegin.o -and -.Pa crtend.o .