retire BSD_CRTBEGIN option

BSD crt is currently used on all architectures (other than sparc64).
Remove the option and use BSD crt everywhere as part of the GCC 4.2.1
retirement plan.

https://lists.freebsd.org/pipermail/freebsd-arch/2020-January/019823.html

PR:		239851
Reviewed by:	andrew, brooks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D23122
This commit is contained in:
Ed Maste
2020-01-31 18:04:04 +00:00
parent cca117a17b
commit 43e8403953
12 changed files with 2 additions and 33 deletions
+1 -4
View File
@@ -2783,13 +2783,10 @@ _prereq_libs+= lib/libssp_nonshared
# These dependencies are not automatically generated: # 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. # all shared libraries for ELF.
# #
_startup_libs= lib/csu _startup_libs= lib/csu
.if ${MK_BSD_CRTBEGIN} == "no"
_startup_libs+= gnu/lib/csu
.endif
_startup_libs+= lib/libc _startup_libs+= lib/libc
_startup_libs+= lib/libc_nonshared _startup_libs+= lib/libc_nonshared
.if ${MK_LIBCPLUSPLUS} != "no" .if ${MK_LIBCPLUSPLUS} != "no"
-1
View File
@@ -49,7 +49,6 @@
# The output, is a set of absolute paths with "SB" like: # The output, is a set of absolute paths with "SB" like:
#.nf #.nf
# #
# $SB/obj-i386/bsd/gnu/lib/csu
# $SB/obj-i386/bsd/gnu/lib/libgcc # $SB/obj-i386/bsd/gnu/lib/libgcc
# $SB/obj-i386/bsd/include # $SB/obj-i386/bsd/include
# $SB/obj-i386/bsd/lib/csu/i386 # $SB/obj-i386/bsd/lib/csu/i386
-4
View File
@@ -10,10 +10,6 @@ SUBDIR+= libgomp
.endif .endif
SUBDIR.${MK_TESTS}+= tests SUBDIR.${MK_TESTS}+= tests
.if ${MK_BSD_CRTBEGIN} == "no"
SUBDIR+= csu
.endif
.if ${MK_GNU_GREP} != "no" || ${MK_GNU_GREP_COMPAT} != "no" || \ .if ${MK_GNU_GREP} != "no" || ${MK_GNU_GREP_COMPAT} != "no" || \
${MK_GDB} != "no" ${MK_GDB} != "no"
SUBDIR+= libregex SUBDIR+= libregex
+1 -1
View File
@@ -8,7 +8,7 @@ NO_WMISSING_VARIABLE_DECLARATIONS=
.include <src.opts.mk> .include <src.opts.mk>
.if ${MK_BSD_CRTBEGIN} != "no" && !defined(BUILDING_TESTS) .if !defined(BUILDING_TESTS)
OBJS+= crtbegin.o crtbeginS.o crtbeginT.o OBJS+= crtbegin.o crtbeginS.o crtbeginT.o
OBJS+= crtend.o crtendS.o OBJS+= crtend.o crtendS.o
-1
View File
@@ -3,7 +3,6 @@
# avoid duplication # avoid duplication
DIRDEPS.AUDIT.yes= lib/libbsm DIRDEPS.AUDIT.yes= lib/libbsm
DIRDEPS.BLACKLIST_SUPPORT.yes+= lib/libblacklist DIRDEPS.BLACKLIST_SUPPORT.yes+= lib/libblacklist
DIRDEPS.BSD_CRTBEGIN.no+= gnu/lib/csu
DIRDEPS.CASPER.yes+= lib/libcasper/libcasper DIRDEPS.CASPER.yes+= lib/libcasper/libcasper
DIRDEPS.GSSAPI.yes+= lib/libgssapi DIRDEPS.GSSAPI.yes+= lib/libgssapi
DIRDEPS.JAIL.yes+= lib/libjail DIRDEPS.JAIL.yes+= lib/libjail
-6
View File
@@ -38,7 +38,6 @@ DIRDEPS_FILTER.host = \
Nlib/csu* \ Nlib/csu* \
Nlib/libc \ Nlib/libc \
Nlib/[mn]* \ Nlib/[mn]* \
Ngnu/lib/csu* \
Ngnu/lib/lib[a-r]* \ Ngnu/lib/lib[a-r]* \
Nsecure/lib* \ Nsecure/lib* \
Nusr.bin/xinstall* \ Nusr.bin/xinstall* \
@@ -221,11 +220,6 @@ DIRDEPS += targets/pseudo/stage
.endif .endif
.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}} DEP_MACHINE_ARCH = ${MACHINE_ARCH.${DEP_MACHINE}}
CSU_DIR.${DEP_MACHINE_ARCH} ?= csu/${DEP_MACHINE_ARCH} CSU_DIR.${DEP_MACHINE_ARCH} ?= csu/${DEP_MACHINE_ARCH}
CSU_DIR := ${CSU_DIR.${DEP_MACHINE_ARCH}} CSU_DIR := ${CSU_DIR.${DEP_MACHINE_ARCH}}
-1
View File
@@ -10,7 +10,6 @@ GENDIRDEPS_FILTER+= \
Nlib/libssp_nonshared \ Nlib/libssp_nonshared \
Ncddl/usr.bin/ctf* \ Ncddl/usr.bin/ctf* \
Nlib/libc_nonshared \ Nlib/libc_nonshared \
Ngnu/lib/csu \
Ngnu/lib/libgcc \ Ngnu/lib/libgcc \
Nlib/libgcc_eh \ Nlib/libgcc_eh \
Nlib/libgcc_s \ Nlib/libgcc_s \
-1
View File
@@ -49,7 +49,6 @@
# The output, is a set of absolute paths with "SB" like: # The output, is a set of absolute paths with "SB" like:
#.nf #.nf
# #
# $SB/obj-i386/bsd/gnu/lib/csu
# $SB/obj-i386/bsd/gnu/lib/libgcc # $SB/obj-i386/bsd/gnu/lib/libgcc
# $SB/obj-i386/bsd/include # $SB/obj-i386/bsd/include
# $SB/obj-i386/bsd/lib/csu/i386 # $SB/obj-i386/bsd/lib/csu/i386
-3
View File
@@ -69,7 +69,6 @@ __DEFAULT_YES_OPTIONS = \
BOOTPARAMD \ BOOTPARAMD \
BOOTPD \ BOOTPD \
BSD_CPIO \ BSD_CPIO \
BSD_CRTBEGIN \
BSDINSTALL \ BSDINSTALL \
BSNMP \ BSNMP \
BZIP2 \ BZIP2 \
@@ -394,8 +393,6 @@ BROKEN_OPTIONS+=NVME
.endif .endif
.if ${__T:Msparc64} .if ${__T:Msparc64}
# Sparc64 need extra crt*.o files - PR 239851
BROKEN_OPTIONS+=BSD_CRTBEGIN
# PR 233405 # PR 233405
BROKEN_OPTIONS+=LLVM_LIBUNWIND BROKEN_OPTIONS+=LLVM_LIBUNWIND
.endif .endif
@@ -7,7 +7,6 @@
# This file is not autogenerated - take care! # This file is not autogenerated - take care!
DIRDEPS = \ DIRDEPS = \
gnu/lib/csu \
gnu/lib/libdialog \ gnu/lib/libdialog \
gnu/lib/libgcov \ gnu/lib/libgcov \
gnu/lib/libgomp \ gnu/lib/libgomp \
-5
View File
@@ -1,5 +0,0 @@
.\" $FreeBSD$
Disable the BSD licensed
.Pa crtbegin.o
and
.Pa crtend.o .
-5
View File
@@ -1,5 +0,0 @@
.\" $FreeBSD$
Enable the BSD licensed
.Pa crtbegin.o
and
.Pa crtend.o .