[illumos-gate merge]release-20201119

commit 5a0af8165ce9590e7a18f1ef4f9badc4dd72c6e6
    13274 enable -fstack-protector-strong by default in user land
commit 6a817834d81cc75ce12d0d393320837b1fec1e85
    5788 Want support for GCC's stack protector in libc
commit 350ffdd54baf880f440ddf9697666e283894ded1
    13273 want upanic(2)
commit 7fdea60d55a95f0e46066fd021c4ef1b1321bafc
    13300 mlxcx_cq_setup() doesn't take required locks for ASSERTs

Merge notes:
- Manifest changes to match package changes (including shipping libssp_ns.a)
- Modified lx_vdso tools to not include SSP, to match other build-only tools.

2 files changed, 37 insertions, 0 deletions

diff --git a/usr/src/head/Makefile b/usr/src/head/Makefile
index 1f598f5849..ac2e8a89f7 100644
--- a/usr/src/head/Makefile
+++ b/usr/src/head/Makefile
@@ -206,6 +206,7 @@ HDRS=   $($(MACH)_HDRS)	\
 	ucred.h		\
 	ulimit.h	\
 	unistd.h	\
+	upanic.h	\
 	userdefs.h	\
 	ustat.h		\
 	utime.h		\
diff --git a/usr/src/head/upanic.h b/usr/src/head/upanic.h
new file mode 100644
index 0000000000..be34d02b84
--- /dev/null
+++ b/usr/src/head/upanic.h
@@ -0,0 +1,36 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2020 Oxide Computer Company
+ */
+
+#ifndef _UPANIC_H
+#define	_UPANIC_H
+
+/*
+ * Support for guaranteed user process abort-like termination.
+ */
+
+#include <sys/feature_tests.h>
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern _NORETURN_KYWD void upanic(const char *, size_t) __NORETURN;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UPANIC_H */