20 files changed, 706 insertions, 1 deletions

diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 5daba7518af0..6dbef4d4065b 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -2,12 +2,16 @@
 
 .include <src.opts.mk>
 
-SUBDIR=			csu
+SUBDIR=
 SUBDIR.${MK_DIALOG}+=	libdialog
 SUBDIR.${MK_GCC}+=	libgcov libgomp
 SUBDIR.${MK_SSP}+=	libssp
 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
diff --git a/lib/csu/Makefile b/lib/csu/Makefile
index 5f1cddcde662..c5ff9207427d 100644
--- a/lib/csu/Makefile
+++ b/lib/csu/Makefile
@@ -6,4 +6,10 @@ SUBDIR+= ${MACHINE_ARCH}
 SUBDIR+= ${MACHINE_CPUARCH}
 .endif
 
+.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
+    ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc64"
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
+.endif
+
 .include <bsd.subdir.mk>
diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc
index 95d5c5e5f355..e5f6bb7f5638 100644
--- a/lib/csu/Makefile.inc
+++ b/lib/csu/Makefile.inc
@@ -6,4 +6,27 @@ SED_FIX_NOTE = -i "" -e '/\.note\.tag/s/progbits/note/'
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
+.include <src.opts.mk>
+
+.if ${MK_BSD_CRTBEGIN} != "no" && !defined(BUILDING_TESTS)
+
+OBJS+=	crtbegin.o crtbeginS.o crtbeginT.o
+OBJS+=	crtend.o crtendS.o
+
+CFLAGS_CRTS=	-DSHARED ${PICFLAG}
+
+crtbegin.o: crtbegin.c
+crtbeginS.o: crtbegin.c
+crtbeginT.o: crtbegin.c
+crtend.o: crtend.c
+crtendS.o: crtend.c
+
+crtbegin.o crtend.o crtbeginT.o:
+	${CC} ${CFLAGS} -I${.CURDIR} -c -o ${.TARGET} ${.ALLSRC}
+
+crtbeginS.o crtendS.o:
+	${CC} ${CFLAGS} -I${.CURDIR} ${CFLAGS_CRTS} -c -o ${.TARGET} ${.ALLSRC}
+
+.endif
+
 .include "../Makefile.inc"
diff --git a/lib/csu/aarch64/crt.h b/lib/csu/aarch64/crt.h
new file mode 100644
index 000000000000..9f41c2fac0fe
--- /dev/null
+++ b/lib/csu/aarch64/crt.h
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+/* Empty so we can include this unconditionally */
diff --git a/lib/csu/amd64/crt.h b/lib/csu/amd64/crt.h
new file mode 100644
index 000000000000..2de2788506b1
--- /dev/null
+++ b/lib/csu/amd64/crt.h
@@ -0,0 +1,32 @@
+/*-
+ * SPDX-License-Identifier: BSD-1-Clause
+ *
+ * Copyright 2018 Andrew Turner
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _CRT_H_
+#define	_CRT_H_
+
+#define	HAVE_CTORS
+#define	INIT_CALL_SEQ(func)	"call " __STRING(func)
+
+#endif
diff --git a/lib/csu/common/crtbegin.c b/lib/csu/common/crtbegin.c
new file mode 100644
index 000000000000..46e604927ac0
--- /dev/null
+++ b/lib/csu/common/crtbegin.c
@@ -0,0 +1,99 @@
+/*-
+ * SPDX-License-Identifier: BSD-1-Clause
+ *
+ * Copyright 2018 Andrew Turner
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+
+#include "crt.h"
+
+typedef void (*crt_func)(void);
+
+/*
+ * On some architectures and toolchains we may need to call the .dtors.
+ * These are called in the order they are in the ELF file.
+ */
+#ifdef HAVE_CTORS
+static void __do_global_dtors_aux(void) __used;
+
+crt_func __CTOR_LIST__[] __section(".ctors") __hidden = {
+	(crt_func)-1
+};
+crt_func __DTOR_LIST__[] __section(".dtors") __hidden = {
+	(crt_func)-1
+};
+
+static void
+__do_global_dtors_aux(void)
+{
+	crt_func fn;
+	int n;
+
+	for (n = 1;; n++) {
+		fn = __DTOR_LIST__[n];
+		if (fn == (crt_func)0 || fn == (crt_func)-1)
+			break;
+		fn();
+	}
+}
+
+asm (
+    ".pushsection .fini		\n"
+    "\t" INIT_CALL_SEQ(__do_global_dtors_aux) "\n"
+    ".popsection		\n"
+);
+#endif
+
+/*
+ * Handler for gcj. These provide a _Jv_RegisterClasses function and fill
+ * out the .jcr section. We just need to call this function with a pointer
+ * to the appropriate section.
+ */
+extern void _Jv_RegisterClasses(void *) __weak_symbol;
+static void register_classes(void) __used;
+
+crt_func __JCR_LIST__[] __section(".jcr") __used __hidden = { };
+
+#ifndef CTORS_CONSTRUCTORS
+__attribute__((constructor))
+#endif
+static void
+register_classes(void)
+{
+
+	if (_Jv_RegisterClasses != NULL && __JCR_LIST__[0] != 0)
+		_Jv_RegisterClasses(__JCR_LIST__);
+}
+
+/*
+ * We can't use constructors when they use the .ctors section as they may be
+ * placed before __CTOR_LIST__.
+ */
+#ifdef CTORS_CONSTRUCTORS
+asm (
+    ".pushsection .init		\n"
+    "\t" INIT_CALL_SEQ(register_classes) "\n"
+    ".popsection		\n"
+);
+#endif
diff --git a/lib/csu/common/crtend.c b/lib/csu/common/crtend.c
new file mode 100644
index 000000000000..15eccb98e6cf
--- /dev/null
+++ b/lib/csu/common/crtend.c
@@ -0,0 +1,64 @@
+/*-
+ * SPDX-License-Identifier: BSD-1-Clause
+ *
+ * Copyright 2018 Andrew Turner
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "crt.h"
+
+#ifdef HAVE_CTORS
+typedef void (*crt_func)(void);
+
+/*
+ * On some architectures and toolchains we may need to call the .ctors.
+ * These are called in the reverse order they are in the ELF file.
+ */
+static void __do_global_ctors_aux(void) __used;
+
+crt_func __CTOR_END__[] __section(".ctors") __used __hidden = {
+	(crt_func)0
+};
+crt_func __DTOR_END__[] __section(".dtors") __used __hidden = {
+	(crt_func)0
+};
+
+static void
+__do_global_ctors_aux(void)
+{
+	crt_func fn;
+	int n;
+
+	for (n = 1;; n++) {
+		fn = __CTOR_END__[-n];
+		if (fn == (crt_func)0 || fn == (crt_func)-1)
+			break;
+		fn();
+	}
+}
+
+asm (
+    ".pushsection .init		\n"
+    "\t" INIT_CALL_SEQ(__do_global_ctors_aux) "\n"
+    ".popsection		\n"
+);
+#endif
diff --git a/lib/csu/i386/crt.h b/lib/csu/i386/crt.h
new file mode 100644
index 000000000000..2de2788506b1
--- /dev/null
+++ b/lib/csu/i386/crt.h
@@ -0,0 +1,32 @@
+/*-
+ * SPDX-License-Identifier: BSD-1-Clause
+ *
+ * Copyright 2018 Andrew Turner
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _CRT_H_
+#define	_CRT_H_
+
+#define	HAVE_CTORS
+#define	INIT_CALL_SEQ(func)	"call " __STRING(func)
+
+#endif
diff --git a/lib/csu/powerpc64/crt.h b/lib/csu/powerpc64/crt.h
new file mode 100644
index 000000000000..304db572c621
--- /dev/null
+++ b/lib/csu/powerpc64/crt.h
@@ -0,0 +1,33 @@
+/*-
+ * SPDX-License-Identifier: BSD-1-Clause
+ *
+ * Copyright 2018 Andrew Turner
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _CRT_H_
+#define	_CRT_H_
+
+#define	HAVE_CTORS
+#define	CTORS_CONSTRUCTORS
+#define	INIT_CALL_SEQ(func)	"bl " __STRING(func) "; nop"
+
+#endif
diff --git a/lib/csu/tests/Makefile b/lib/csu/tests/Makefile
new file mode 100644
index 000000000000..021f5ac9ebb9
--- /dev/null
+++ b/lib/csu/tests/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+TESTS_SUBDIRS=	dynamic
+TESTS_SUBDIRS+=	static
+
+.include <bsd.test.mk>
diff --git a/lib/csu/tests/Makefile.inc b/lib/csu/tests/Makefile.inc
new file mode 100644
index 000000000000..a9e3386bbcaa
--- /dev/null
+++ b/lib/csu/tests/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+TESTSDIR:=      ${TESTSBASE}/${RELDIR:C/csu\/tests/csu/}
diff --git a/lib/csu/tests/Makefile.tests b/lib/csu/tests/Makefile.tests
new file mode 100644
index 000000000000..4e766ddd59b2
--- /dev/null
+++ b/lib/csu/tests/Makefile.tests
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+ATF_TESTS_C+=	init_test
+ATF_TESTS_C+=	fini_test
+ATF_TESTS_CXX+=	cxx_constructors
+
+.if exists(${.CURDIR:H:H}/${MACHINE_ARCH})
+CFLAGS+= -I${.CURDIR:H:H}/${MACHINE_ARCH}
+.else
+CFLAGS+= -I${.CURDIR:H:H}/${MACHINE_CPUARCH}
+.endif
diff --git a/lib/csu/tests/cxx_constructors.cc b/lib/csu/tests/cxx_constructors.cc
new file mode 100644
index 000000000000..f60b528d22d0
--- /dev/null
+++ b/lib/csu/tests/cxx_constructors.cc
@@ -0,0 +1,92 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2018 Andrew Turner
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <atf-c++.hpp>
+
+static volatile int constructor_run;
+static bool run_destructor_test = false;
+struct Foo {
+	Foo() {
+		constructor_run = 1;
+	}
+	~Foo() {
+		if (run_destructor_test)
+			_exit(1);
+	}
+};
+extern Foo foo;
+Foo foo;
+
+ATF_TEST_CASE_WITHOUT_HEAD(cxx_constructor);
+ATF_TEST_CASE_BODY(cxx_constructor)
+{
+
+	ATF_REQUIRE(constructor_run == 1);
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(cxx_destructor);
+ATF_TEST_CASE_BODY(cxx_destructor)
+{
+	pid_t pid, wpid;
+	int status;
+
+	pid = fork();
+	switch(pid) {
+	case -1:
+		break;
+	case 0:
+		run_destructor_test = true;
+		exit(0);
+	default:
+		while ((wpid = waitpid(pid, &status, 0)) == -1 &&
+		    errno == EINTR)
+			;
+		ATF_REQUIRE(WEXITSTATUS(status) == 1);
+		break;
+	}
+}
+
+ATF_INIT_TEST_CASES(tcs)
+{
+
+	ATF_ADD_TEST_CASE(tcs, cxx_constructor);
+	ATF_ADD_TEST_CASE(tcs, cxx_destructor);
+}
diff --git a/lib/csu/tests/dynamic/Makefile b/lib/csu/tests/dynamic/Makefile
new file mode 100644
index 000000000000..61c9a322e7b5
--- /dev/null
+++ b/lib/csu/tests/dynamic/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR:H}
+WARNS?=		6
+
+.include "../Makefile.tests"
+.include <bsd.test.mk>
diff --git a/lib/csu/tests/fini_test.c b/lib/csu/tests/fini_test.c
new file mode 100644
index 000000000000..7c6001e4f9b1
--- /dev/null
+++ b/lib/csu/tests/fini_test.c
@@ -0,0 +1,129 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2018 Andrew Turner
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include <crt.h>
+
+typedef void (*func_ptr)(void);
+
+static bool run_dtors_test = false;
+static bool run_fini_array_test = false;
+
+static void
+dtors_handler(void)
+{
+
+	if (run_dtors_test)
+		_exit(1);
+}
+__section(".dtors") __used static func_ptr dtors_func =
+    &dtors_handler;
+
+ATF_TC_WITHOUT_HEAD(dtors_test);
+ATF_TC_BODY(dtors_test, tc)
+{
+	pid_t pid, wpid;
+	int status;
+
+	pid = fork();
+	switch(pid) {
+	case -1:
+		break;
+	case 0:
+		run_dtors_test = true;
+		exit(0);
+	default:
+		while ((wpid = waitpid(pid, &status, 0)) == -1 &&
+		    errno == EINTR)
+			;
+#ifdef HAVE_CTORS
+		ATF_REQUIRE_MSG(WEXITSTATUS(status) == 1,
+		    ".dtors failed to run");
+#else
+		ATF_REQUIRE_MSG(WEXITSTATUS(status) == 0,
+		    ".dtors incorrectly ran");
+#endif
+		break;
+	}
+}
+
+static void
+fini_array_handler(void)
+{
+
+	if (run_fini_array_test)
+		_exit(1);
+}
+__section(".fini_array") __used static func_ptr fini_array_func =
+    &fini_array_handler;
+
+ATF_TC_WITHOUT_HEAD(fini_array_test);
+ATF_TC_BODY(fini_array_test, tc)
+{
+	pid_t pid, wpid;
+	int status;
+
+	pid = fork();
+	switch(pid) {
+	case -1:
+		break;
+	case 0:
+		run_fini_array_test = true;
+		exit(0);
+	default:
+		while ((wpid = waitpid(pid, &status, 0)) == -1 &&
+		    errno == EINTR)
+			;
+		ATF_REQUIRE_MSG(WEXITSTATUS(status) == 1,
+		    ".fini_array failed to run");
+		break;
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, dtors_test);
+	ATF_TP_ADD_TC(tp, fini_array_test);
+
+	return (atf_no_error());
+}
diff --git a/lib/csu/tests/init_test.c b/lib/csu/tests/init_test.c
new file mode 100644
index 000000000000..68c87ca386e9
--- /dev/null
+++ b/lib/csu/tests/init_test.c
@@ -0,0 +1,137 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2018 Andrew Turner
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <atf-c.h>
+
+#include <crt.h>
+
+typedef void (*func_ptr)(void);
+
+static volatile int jcr_run;
+static const func_ptr *jcr_ptr;
+static volatile int ctors_run;
+static volatile int preinit_array_run;
+static volatile int preinit_array_state = -1;
+static volatile int init_array_run;
+static volatile int init_array_state = -1;
+
+void _Jv_RegisterClasses(const func_ptr *);
+
+__section(".jcr") __used static func_ptr jcr_func = (func_ptr)1;
+
+void
+_Jv_RegisterClasses(const func_ptr *jcr __unused)
+{
+
+	jcr_run = 1;
+	jcr_ptr = jcr;
+}
+
+ATF_TC_WITHOUT_HEAD(jcr_test);
+ATF_TC_BODY(jcr_test, tc)
+{
+
+	ATF_REQUIRE_MSG(jcr_run == 1, ".jcr not run");
+	ATF_REQUIRE_MSG(jcr_ptr == &jcr_func,
+	    "Incorrect pointer passed to _Jv_RegisterClasses");
+}
+
+static void
+ctors_handler(void)
+{
+
+	ctors_run = 1;
+}
+__section(".ctors") __used static func_ptr ctors_func =
+    &ctors_handler;
+
+ATF_TC_WITHOUT_HEAD(ctors_test);
+ATF_TC_BODY(ctors_test, tc)
+{
+
+#ifdef HAVE_CTORS
+	ATF_REQUIRE_MSG(ctors_run == 1, ".ctors not run");
+#else
+	ATF_REQUIRE_MSG(ctors_run == 0, ".ctors run");
+#endif
+}
+
+static void
+preinit_array_handler(void)
+{
+
+	preinit_array_run = 1;
+	preinit_array_state = init_array_run;
+}
+__section(".preinit_array") __used static func_ptr preinit_array_func =
+    &preinit_array_handler;
+
+ATF_TC_WITHOUT_HEAD(preinit_array_test);
+ATF_TC_BODY(preinit_array_test, tc)
+{
+
+	ATF_REQUIRE_MSG(preinit_array_run == 1, ".preinit_array not run");
+	ATF_REQUIRE_MSG(preinit_array_state == 0,
+	    ".preinit_array was not run before .init_array");
+}
+
+static void
+init_array_handler(void)
+{
+
+	init_array_run = 1;
+	init_array_state = preinit_array_run;
+}
+__section(".init_array") __used static func_ptr init_array_func =
+    &init_array_handler;
+
+ATF_TC_WITHOUT_HEAD(init_array_test);
+ATF_TC_BODY(init_array_test, tc)
+{
+
+	ATF_REQUIRE_MSG(init_array_run == 1, ".init_array not run");
+	ATF_REQUIRE_MSG(init_array_state == 1,
+	    ".init_array was not run after .preinit_array");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, jcr_test);
+	ATF_TP_ADD_TC(tp, ctors_test);
+	ATF_TP_ADD_TC(tp, preinit_array_test);
+	ATF_TP_ADD_TC(tp, init_array_test);
+
+	return (atf_no_error());
+}
diff --git a/lib/csu/tests/static/Makefile b/lib/csu/tests/static/Makefile
new file mode 100644
index 000000000000..c5261186e258
--- /dev/null
+++ b/lib/csu/tests/static/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR:H}
+NO_SHARED=
+WARNS?=		6
+
+.include "../Makefile.tests"
+.include <bsd.test.mk>
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 3769d0557aa5..7091db36459f 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -385,6 +385,13 @@ BROKEN_OPTIONS+=HYPERV
 BROKEN_OPTIONS+=NVME
 .endif
 
+.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || \
+    ${__T} == "powerpc64"
+__DEFAULT_NO_OPTIONS+=BSD_CRTBEGIN
+.else
+BROKEN_OPTIONS+=BSD_CRTBEGIN
+.endif
+
 .include <bsd.mkopt.mk>
 
 #
diff --git a/tools/build/options/WITHOUT_BSD_CRTBEGIN b/tools/build/options/WITHOUT_BSD_CRTBEGIN
new file mode 100644
index 000000000000..7f054be243ea
--- /dev/null
+++ b/tools/build/options/WITHOUT_BSD_CRTBEGIN
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Disable the BSD licensed
+.Pa crtbegin.o
+and
+.Pa crtend.o .
diff --git a/tools/build/options/WITH_BSD_CRTBEGIN b/tools/build/options/WITH_BSD_CRTBEGIN
new file mode 100644
index 000000000000..390a0613b1c3
--- /dev/null
+++ b/tools/build/options/WITH_BSD_CRTBEGIN
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Enable the BSD licensed
+.Pa crtbegin.o
+and
+.Pa crtend.o .