svn commit: r357338 - in head: . contrib/bmake/mk gnu/lib lib/csu share/mk targets/pseudo/userland/gnu tools/build/options

Ed Maste emaste at FreeBSD.org
Fri Jan 31 18:04:07 UTC 2020 

Author: emaste
Date: Fri Jan 31 18:04:04 2020
New Revision: 357338
URL: https://svnweb.freebsd.org/changeset/base/357338

Log:
  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

Deleted:
  head/tools/build/options/WITHOUT_BSD_CRTBEGIN
  head/tools/build/options/WITH_BSD_CRTBEGIN
Modified:
  head/Makefile.inc1
  head/contrib/bmake/mk/meta2deps.sh
  head/gnu/lib/Makefile
  head/lib/csu/Makefile.inc
  head/share/mk/local.dirdeps-options.mk
  head/share/mk/local.dirdeps.mk
  head/share/mk/local.gendirdeps.mk
  head/share/mk/meta2deps.sh
  head/share/mk/src.opts.mk
  head/targets/pseudo/userland/gnu/Makefile.depend

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Jan 31 17:49:15 2020	(r357337)
+++ head/Makefile.inc1	Fri Jan 31 18:04:04 2020	(r357338)
@@ -2783,13 +2783,10 @@ _prereq_libs+= lib/libssp_nonshared
 
 # 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"

Modified: head/contrib/bmake/mk/meta2deps.sh
==============================================================================
--- head/contrib/bmake/mk/meta2deps.sh	Fri Jan 31 17:49:15 2020	(r357337)
+++ head/contrib/bmake/mk/meta2deps.sh	Fri Jan 31 18:04:04 2020	(r357338)
@@ -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

Modified: head/gnu/lib/Makefile
==============================================================================
--- head/gnu/lib/Makefile	Fri Jan 31 17:49:15 2020	(r357337)
+++ head/gnu/lib/Makefile	Fri Jan 31 18:04:04 2020	(r357338)
@@ -10,10 +10,6 @@ SUBDIR+=		libgomp
 .endif
 SUBDIR.${MK_TESTS}+=	tests
 
-.if ${MK_BSD_CRTBEGIN} == "no"
-SUBDIR+=		csu
-.endif
-
 .if ${MK_GNU_GREP} != "no" || ${MK_GNU_GREP_COMPAT} != "no" || \
     ${MK_GDB} != "no"
 SUBDIR+=		libregex

Modified: head/lib/csu/Makefile.inc
==============================================================================
--- head/lib/csu/Makefile.inc	Fri Jan 31 17:49:15 2020	(r357337)
+++ head/lib/csu/Makefile.inc	Fri Jan 31 18:04:04 2020	(r357338)
@@ -8,7 +8,7 @@ NO_WMISSING_VARIABLE_DECLARATIONS=
 
 .include <src.opts.mk>
 
-.if ${MK_BSD_CRTBEGIN} != "no" && !defined(BUILDING_TESTS)
+.if !defined(BUILDING_TESTS)
 
 OBJS+=	crtbegin.o crtbeginS.o crtbeginT.o
 OBJS+=	crtend.o crtendS.o

Modified: head/share/mk/local.dirdeps-options.mk
==============================================================================
--- head/share/mk/local.dirdeps-options.mk	Fri Jan 31 17:49:15 2020	(r357337)
+++ head/share/mk/local.dirdeps-options.mk	Fri Jan 31 18:04:04 2020	(r357338)
@@ -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

Modified: head/share/mk/local.dirdeps.mk
==============================================================================
--- head/share/mk/local.dirdeps.mk	Fri Jan 31 17:49:15 2020	(r357337)
+++ head/share/mk/local.dirdeps.mk	Fri Jan 31 18:04:04 2020	(r357338)
@@ -38,7 +38,6 @@ DIRDEPS_FILTER.host = \
 	Nlib/csu* \
 	Nlib/libc \
 	Nlib/[mn]* \
-	Ngnu/lib/csu* \
 	Ngnu/lib/lib[a-r]* \
 	Nsecure/lib* \
 	Nusr.bin/xinstall* \
@@ -219,11 +218,6 @@ DIRDEPS+= ${_lib${_lib}reldir}
 .if ${DEP_RELDIR} != "targets/pseudo/stage"
 DIRDEPS += targets/pseudo/stage
 .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}}

Modified: head/share/mk/local.gendirdeps.mk
==============================================================================
--- head/share/mk/local.gendirdeps.mk	Fri Jan 31 17:49:15 2020	(r357337)
+++ head/share/mk/local.gendirdeps.mk	Fri Jan 31 18:04:04 2020	(r357338)
@@ -10,7 +10,6 @@ GENDIRDEPS_FILTER+= \
 	Nlib/libssp_nonshared \
 	Ncddl/usr.bin/ctf* \
 	Nlib/libc_nonshared \
-	Ngnu/lib/csu \
 	Ngnu/lib/libgcc \
 	Nlib/libgcc_eh \
 	Nlib/libgcc_s \

Modified: head/share/mk/meta2deps.sh
==============================================================================
--- head/share/mk/meta2deps.sh	Fri Jan 31 17:49:15 2020	(r357337)
+++ head/share/mk/meta2deps.sh	Fri Jan 31 18:04:04 2020	(r357338)
@@ -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

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Fri Jan 31 17:49:15 2020	(r357337)
+++ head/share/mk/src.opts.mk	Fri Jan 31 18:04:04 2020	(r357338)
@@ -69,7 +69,6 @@ __DEFAULT_YES_OPTIONS = \
     BOOTPARAMD \
     BOOTPD \
     BSD_CPIO \
-    BSD_CRTBEGIN \
     BSDINSTALL \
     BSNMP \
     BZIP2 \
@@ -394,8 +393,6 @@ BROKEN_OPTIONS+=NVME
 .endif
 
 .if ${__T:Msparc64}
-# Sparc64 need extra crt*.o files - PR 239851
-BROKEN_OPTIONS+=BSD_CRTBEGIN
 # PR 233405
 BROKEN_OPTIONS+=LLVM_LIBUNWIND
 .endif

Modified: head/targets/pseudo/userland/gnu/Makefile.depend
==============================================================================
--- head/targets/pseudo/userland/gnu/Makefile.depend	Fri Jan 31 17:49:15 2020	(r357337)
+++ head/targets/pseudo/userland/gnu/Makefile.depend	Fri Jan 31 18:04:04 2020	(r357338)
@@ -7,7 +7,6 @@
 # This file is not autogenerated - take care!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	gnu/lib/libdialog \
 	gnu/lib/libgcov \
 	gnu/lib/libgomp \

More information about the svn-src-all mailing list