Page MenuHomeFreeBSD
Files F164328330

D23122.id67567.diff
No OneTemporary
Actions

D23122.id67567.diff
View Options

Index: head/Makefile.inc1
===================================================================
--- head/Makefile.inc1
+++ head/Makefile.inc1
@@ -2783,13 +2783,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: head/contrib/bmake/mk/meta2deps.sh
===================================================================
--- head/contrib/bmake/mk/meta2deps.sh
+++ head/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: head/gnu/lib/Makefile
===================================================================
--- head/gnu/lib/Makefile
+++ head/gnu/lib/Makefile
@@ -10,10 +10,6 @@
.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
Index: head/lib/csu/Makefile.inc
===================================================================
--- head/lib/csu/Makefile.inc
+++ head/lib/csu/Makefile.inc
@@ -8,7 +8,7 @@
.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
Index: head/share/mk/local.dirdeps-options.mk
===================================================================
--- head/share/mk/local.dirdeps-options.mk
+++ head/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: head/share/mk/local.dirdeps.mk
===================================================================
--- head/share/mk/local.dirdeps.mk
+++ head/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* \
@@ -219,11 +218,6 @@
.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}}
Index: head/share/mk/local.gendirdeps.mk
===================================================================
--- head/share/mk/local.gendirdeps.mk
+++ head/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: head/share/mk/meta2deps.sh
===================================================================
--- head/share/mk/meta2deps.sh
+++ head/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: head/share/mk/src.opts.mk
===================================================================
--- head/share/mk/src.opts.mk
+++ head/share/mk/src.opts.mk
@@ -69,7 +69,6 @@
BOOTPARAMD \
BOOTPD \
BSD_CPIO \
- BSD_CRTBEGIN \
BSDINSTALL \
BSNMP \
BZIP2 \
@@ -394,8 +393,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: head/targets/pseudo/userland/gnu/Makefile.depend
===================================================================
--- head/targets/pseudo/userland/gnu/Makefile.depend
+++ head/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: head/tools/build/options/WITHOUT_BSD_CRTBEGIN
===================================================================
--- head/tools/build/options/WITHOUT_BSD_CRTBEGIN
+++ head/tools/build/options/WITHOUT_BSD_CRTBEGIN
@@ -1,5 +0,0 @@
-.\" $FreeBSD$
-Disable the BSD licensed
-.Pa crtbegin.o
-and
-.Pa crtend.o .
Index: head/tools/build/options/WITH_BSD_CRTBEGIN
===================================================================
--- head/tools/build/options/WITH_BSD_CRTBEGIN
+++ head/tools/build/options/WITH_BSD_CRTBEGIN
@@ -1,5 +0,0 @@
-.\" $FreeBSD$
-Enable the BSD licensed
-.Pa crtbegin.o
-and
-.Pa crtend.o .

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 31, 8:36 PM (4 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35754431
Default Alt Text
D23122.id67567.diff (4 KB)

Event Timeline