[illumos-gate merge]

commit e25cb0e77ab84d3147918b8aef1f5161fbccb30e
    11967 need TAA mitigation
commit b666b5bebdde1067e2d0f2b91fd28a5243311a1a
    12165 lp: argument to 'alloca' may be too large
commit dd2ed563fd8f7f157d5cd583cae81fef585c2ffc
    12151 libc: specifies less restrictive attribute than its target
commit e830fb12ed60bbd91c87459b169b5d1cc6ef0b9e
    10241 ZFS not detecting faulty spares in a timely manner
    12132 zfs-retire agent crashes fmd on systems without vdev devids
    12034 zfs test send_encrypted_props can fail
commit 356ce177517a15babb8fd801d490f239298643b7
    12178 Allow bytes to be removed from a custr

	Conflicts:
	usr/src/uts/intel/sys/x86_archext.h
	usr/src/uts/common/fs/zfs/spa_misc.c
	usr/src/test/util-tests/tests/Makefile

5 files changed, 20 insertions, 17 deletions

diff --git a/usr/src/lib/libc/amd64/gen/siglongjmp.c b/usr/src/lib/libc/amd64/gen/siglongjmp.c
index 07a89b485f..d71f40a034 100644
--- a/usr/src/lib/libc/amd64/gen/siglongjmp.c
+++ b/usr/src/lib/libc/amd64/gen/siglongjmp.c
@@ -24,15 +24,14 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#pragma weak _siglongjmp = siglongjmp
-
 #include "lint.h"
 #include <sys/types.h>
 #include <sys/ucontext.h>
 #include <setjmp.h>
 #include <ucontext.h>
+#include "libc.h"
+
+#pragma weak _siglongjmp = siglongjmp
 
 void
 siglongjmp(sigjmp_buf env, int val)
diff --git a/usr/src/lib/libc/i386/gen/siglongjmp.c b/usr/src/lib/libc/i386/gen/siglongjmp.c
index ea23fcf749..9157412083 100644
--- a/usr/src/lib/libc/i386/gen/siglongjmp.c
+++ b/usr/src/lib/libc/i386/gen/siglongjmp.c
@@ -26,17 +26,16 @@
 
 /*	Copyright (c) 1990, 1991 UNIX System Laboratories, Inc.	*/
 /*	Copyright (c) 1988 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#pragma weak _siglongjmp = siglongjmp
+/*	  All Rights Reserved	*/
 
 #include "lint.h"
 #include <sys/types.h>
 #include <sys/ucontext.h>
 #include <setjmp.h>
 #include <ucontext.h>
+#include "libc.h"
+
+#pragma weak _siglongjmp = siglongjmp
 
 void
 siglongjmp(sigjmp_buf env, int val)
diff --git a/usr/src/lib/libc/inc/libc.h b/usr/src/lib/libc/inc/libc.h
index 3d440ab2e2..448523df01 100644
--- a/usr/src/lib/libc/inc/libc.h
+++ b/usr/src/lib/libc/inc/libc.h
@@ -50,6 +50,7 @@
 #include <wchar.h>
 #include <wctype.h>
 #include <libnvpair.h>
+#include <setjmp.h>
 
 #ifdef	__cplusplus
 extern "C" {
@@ -61,6 +62,7 @@ extern long _sysconfig(int);
 extern int kill(pid_t pid, int sig);
 
 extern int primary_link_map;
+extern void _thr_exit(void *) __NORETURN;
 extern int thr_main(void);
 extern int thr_kill(thread_t tid, int sig);
 extern thread_t thr_self(void);
@@ -195,6 +197,11 @@ extern char *getusershell(void);
 extern int __sigaction(int, const struct sigaction *, struct sigaction *);
 
 /*
+ * defined in siglongjmp.c
+ */
+extern void _siglongjmp(sigjmp_buf, int) __NORETURN;
+
+/*
  * defined in _getsp.s
  */
 extern greg_t _getsp(void);
diff --git a/usr/src/lib/libc/sparc/gen/siglongjmp.c b/usr/src/lib/libc/sparc/gen/siglongjmp.c
index 83a640397d..d72c076a8c 100644
--- a/usr/src/lib/libc/sparc/gen/siglongjmp.c
+++ b/usr/src/lib/libc/sparc/gen/siglongjmp.c
@@ -25,11 +25,7 @@
  */
 
 /*	Copyright (c) 1988 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#pragma weak _siglongjmp = siglongjmp
+/*	  All Rights Reserved	*/
 
 #include "lint.h"
 #include <sys/types.h>
@@ -41,6 +37,8 @@
 #include "sigjmp_struct.h"
 #include "libc.h"
 
+#pragma weak _siglongjmp = siglongjmp
+
 void
 siglongjmp(sigjmp_buf env, int val)
 {
diff --git a/usr/src/lib/libc/sparcv9/gen/siglongjmp.c b/usr/src/lib/libc/sparcv9/gen/siglongjmp.c
index 5d4ca06426..2063e6cd2c 100644
--- a/usr/src/lib/libc/sparcv9/gen/siglongjmp.c
+++ b/usr/src/lib/libc/sparcv9/gen/siglongjmp.c
@@ -24,9 +24,7 @@
  */
 
 /*	Copyright (c) 1988 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-#pragma weak _siglongjmp = siglongjmp
+/*	  All Rights Reserved	*/
 
 #include "lint.h"
 #include <sys/types.h>
@@ -38,6 +36,8 @@
 #include "sigjmp_struct.h"
 #include "libc.h"
 
+#pragma weak _siglongjmp = siglongjmp
+
 void
 siglongjmp(sigjmp_buf env, int val)
 {