[illumos-gate merge]

commit 81b505b772ab015c588c56bb116239ee549b6eee
    8384 AVX512 dis - EVEX prefix support
    8385 32-bit avx dis test mishandles EVEX prefix
    8386 32-bit bound dis is incorrect
commit 6ddde3c29e802380fc0318df29c80e7820847f48
    8362 libc: install_legacy() overwrites __runetype, __maplower, and __mapupper for _DefaultRuneLocale
commit cdcc9e2ce0563ac9f9076ee350d4fd008f61f1eb
    8349 thrd_equal implements the wrong specification

	Conflicts:
	usr/src/common/dis/i386/dis_tables.c

5 files changed, 250 insertions, 230 deletions

diff --git a/usr/src/common/dis/i386/dis_tables.c b/usr/src/common/dis/i386/dis_tables.c
index 7e3dfe9a25..000cb020f3 100644
--- a/usr/src/common/dis/i386/dis_tables.c
+++ b/usr/src/common/dis/i386/dis_tables.c
@@ -245,7 +245,7 @@ enum {
 	ADX,		/* ADX instructions, support REX.w, mod_rm->mod_reg */
 	EVEX_RX,        /* EVEX  mod_reg                      -> mod_rm */
 	EVEX_MX,        /* EVEX  mod_rm                       -> mod_reg */
-	EVEX_RMrX,	/* EVEX  EVEX.vvvv, mod_rm            -> mod_reg */
+	EVEX_RMrX	/* EVEX  EVEX.vvvv, mod_rm            -> mod_reg */
 };
 
 /*
@@ -2636,9 +2636,10 @@ dtrace_vex_adjust(uint_t vex_byte1, uint_t mode, uint_t *reg, uint_t *r_m)
 /*
  * Adjust the instruction mnemonic with the appropriate suffix.
  */
+/* ARGSUSED */
 static void
 dtrace_evex_mnem_adjust(dis86_t *x, instable_t *dp, uint_t vex_W,
-   uint_t evex_byte2)
+    uint_t evex_byte2)
 {
 #ifdef DIS_TEXT
 	if (dp == &dis_opAVX62[0x7f] ||		/* vmovdq */
@@ -2650,7 +2651,7 @@ dtrace_evex_mnem_adjust(dis86_t *x, instable_t *dp, uint_t vex_W,
 			    OPLEN);
 		} else {
 			(void) strlcat(x->d86_mnem, "u", OPLEN);
-			switch(evex_byte2 & 0x81) {
+			switch (evex_byte2 & 0x81) {
 			case 0x0:
 				(void) strlcat(x->d86_mnem, "32", OPLEN);
 				break;
@@ -2756,6 +2757,7 @@ dtrace_evex_adjust_disp8_n(dis86_t *x, int opindex, uint_t L, uint_t modrm)
 /*
  * Adjust target for opmask and zeroing. See IASDv2 Section 2.6.1 Table 2-30.
  */
+/* ARGSUSED */
 static void
 dtrace_evex_adjust_z_opmask(dis86_t *x, uint_t evex_byte3)
 {
@@ -3449,7 +3451,7 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
 		/* Currently only 3 valid values for evex L'L: 00, 01, 10 */
 		evex_L = (opcode8 & EVEX_L) >> 1;
 
-		dp = (instable_t *) &dis_opAVX62[(opcode1 << 4) | opcode2];
+		dp = (instable_t *)&dis_opAVX62[(opcode1 << 4) | opcode2];
 	}
 not_avx512:
 
@@ -4099,9 +4101,8 @@ not_avx512:
 				 * To handle PINSRD and PEXTRD
 				 */
 				(void) strlcat(x->d86_mnem, "d", OPLEN);
-			} else if (dp == &dis_distable[0x6][0x2]) {
-				/* It's a bound instn. no suffix */
-			} else {
+			} else if (dp != &dis_distable[0x6][0x2]) {
+				/* bound instructions (0x62) have no suffix */
 				(void) strlcat(x->d86_mnem, types[opnd_size],
 				    OPLEN);
 			}
diff --git a/usr/src/lib/libc/port/locale/table.c b/usr/src/lib/libc/port/locale/table.c
index 272e3d18d2..3c0ce09901 100644
--- a/usr/src/lib/libc/port/locale/table.c
+++ b/usr/src/lib/libc/port/locale/table.c
@@ -1,6 +1,6 @@
 /*
  * Copyright 2013 Garrett D'Amore <garrett@damore.org>
- * Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2017 Nexenta Systems, Inc.
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -39,230 +39,241 @@
 #include "mblocal.h"
 #include "_ctype.h"
 
+#define	_DEFRUNETYPE { \
+	/* 00 */ \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	/* 08 */ \
+	_CTYPE_C, \
+	_CTYPE_C|_CTYPE_S|_CTYPE_B, \
+	_CTYPE_C|_CTYPE_S, \
+	_CTYPE_C|_CTYPE_S, \
+	_CTYPE_C|_CTYPE_S, \
+	_CTYPE_C|_CTYPE_S, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	/* 10 */ \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	/* 18 */ \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	_CTYPE_C, \
+	/* 20 */ \
+	_CTYPE_S|_CTYPE_B|_CTYPE_R, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	/* 28 */ \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	/* 30 */ \
+	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X, \
+	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X, \
+	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X, \
+	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X, \
+	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X, \
+	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X, \
+	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X, \
+	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X, \
+	/* 38 */ \
+	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X, \
+	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	/* 40 */ \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	/* 48 */ \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	/* 50 */ \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	/* 58 */ \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	/* 60 */ \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	/* 68 */ \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	/* 70 */ \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	/* 78 */ \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_P|_CTYPE_R|_CTYPE_G, \
+	_CTYPE_C, \
+}
+
+#define	_DEFMAPLOWER { \
+	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07, \
+	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f, \
+	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17, \
+	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f, \
+	0x20,	0x21,	0x22,	0x23,	0x24,	0x25,	0x26,	0x27, \
+	0x28,	0x29,	0x2a,	0x2b,	0x2c,	0x2d,	0x2e,	0x2f, \
+	0x30,	0x31,	0x32,	0x33,	0x34,	0x35,	0x36,	0x37, \
+	0x38,	0x39,	0x3a,	0x3b,	0x3c,	0x3d,	0x3e,	0x3f, \
+	0x40,	'a',	'b',	'c',	'd',	'e',	'f',	'g', \
+	'h',	'i',	'j',	'k',	'l',	'm',	'n',	'o', \
+	'p',	'q',	'r',	's',	't',	'u',	'v',	'w', \
+	'x',	'y',	'z',	0x5b,	0x5c,	0x5d,	0x5e,	0x5f, \
+	0x60,	'a',	'b',	'c',	'd',	'e',	'f',	'g', \
+	'h',	'i',	'j',	'k',	'l',	'm',	'n',	'o', \
+	'p',	'q',	'r',	's',	't',	'u',	'v',	'w', \
+	'x',	'y',	'z',	0x7b,	0x7c,	0x7d,	0x7e,	0x7f, \
+	0x80,	0x81,	0x82,	0x83,	0x84,	0x85,	0x86,	0x87, \
+	0x88,	0x89,	0x8a,	0x8b,	0x8c,	0x8d,	0x8e,	0x8f, \
+	0x90,	0x91,	0x92,	0x93,	0x94,	0x95,	0x96,	0x97, \
+	0x98,	0x99,	0x9a,	0x9b,	0x9c,	0x9d,	0x9e,	0x9f, \
+	0xa0,	0xa1,	0xa2,	0xa3,	0xa4,	0xa5,	0xa6,	0xa7, \
+	0xa8,	0xa9,	0xaa,	0xab,	0xac,	0xad,	0xae,	0xaf, \
+	0xb0,	0xb1,	0xb2,	0xb3,	0xb4,	0xb5,	0xb6,	0xb7, \
+	0xb8,	0xb9,	0xba,	0xbb,	0xbc,	0xbd,	0xbe,	0xbf, \
+	0xc0,	0xc1,	0xc2,	0xc3,	0xc4,	0xc5,	0xc6,	0xc7, \
+	0xc8,	0xc9,	0xca,	0xcb,	0xcc,	0xcd,	0xce,	0xcf, \
+	0xd0,	0xd1,	0xd2,	0xd3,	0xd4,	0xd5,	0xd6,	0xd7, \
+	0xd8,	0xd9,	0xda,	0xdb,	0xdc,	0xdd,	0xde,	0xdf, \
+	0xe0,	0xe1,	0xe2,	0xe3,	0xe4,	0xe5,	0xe6,	0xe7, \
+	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef, \
+	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7, \
+	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff, \
+}
+
+#define	_DEFMAPUPPER { \
+	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07, \
+	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f, \
+	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17, \
+	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f, \
+	0x20,	0x21,	0x22,	0x23,	0x24,	0x25,	0x26,	0x27, \
+	0x28,	0x29,	0x2a,	0x2b,	0x2c,	0x2d,	0x2e,	0x2f, \
+	0x30,	0x31,	0x32,	0x33,	0x34,	0x35,	0x36,	0x37, \
+	0x38,	0x39,	0x3a,	0x3b,	0x3c,	0x3d,	0x3e,	0x3f, \
+	0x40,	'A',	'B',	'C',	'D',	'E',	'F',	'G', \
+	'H',	'I',	'J',	'K',	'L',	'M',	'N',	'O', \
+	'P',	'Q',	'R',	'S',	'T',	'U',	'V',	'W', \
+	'X',	'Y',	'Z',	0x5b,	0x5c,	0x5d,	0x5e,	0x5f, \
+	0x60,	'A',	'B',	'C',	'D',	'E',	'F',	'G', \
+	'H',	'I',	'J',	'K',	'L',	'M',	'N',	'O', \
+	'P',	'Q',	'R',	'S',	'T',	'U',	'V',	'W', \
+	'X',	'Y',	'Z',	0x7b,	0x7c,	0x7d,	0x7e,	0x7f, \
+	0x80,	0x81,	0x82,	0x83,	0x84,	0x85,	0x86,	0x87, \
+	0x88,	0x89,	0x8a,	0x8b,	0x8c,	0x8d,	0x8e,	0x8f, \
+	0x90,	0x91,	0x92,	0x93,	0x94,	0x95,	0x96,	0x97, \
+	0x98,	0x99,	0x9a,	0x9b,	0x9c,	0x9d,	0x9e,	0x9f, \
+	0xa0,	0xa1,	0xa2,	0xa3,	0xa4,	0xa5,	0xa6,	0xa7, \
+	0xa8,	0xa9,	0xaa,	0xab,	0xac,	0xad,	0xae,	0xaf, \
+	0xb0,	0xb1,	0xb2,	0xb3,	0xb4,	0xb5,	0xb6,	0xb7, \
+	0xb8,	0xb9,	0xba,	0xbb,	0xbc,	0xbd,	0xbe,	0xbf, \
+	0xc0,	0xc1,	0xc2,	0xc3,	0xc4,	0xc5,	0xc6,	0xc7, \
+	0xc8,	0xc9,	0xca,	0xcb,	0xcc,	0xcd,	0xce,	0xcf, \
+	0xd0,	0xd1,	0xd2,	0xd3,	0xd4,	0xd5,	0xd6,	0xd7, \
+	0xd8,	0xd9,	0xda,	0xdb,	0xdc,	0xdd,	0xde,	0xdf, \
+	0xe0,	0xe1,	0xe2,	0xe3,	0xe4,	0xe5,	0xe6,	0xe7, \
+	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef, \
+	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7, \
+	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff, \
+}
+
 _RuneLocale _DefaultRuneLocale = {
 	_RUNE_MAGIC_1,
 	"NONE",
-	{
-		/* 00 */
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		/* 08 */
-		_CTYPE_C,
-		_CTYPE_C|_CTYPE_S|_CTYPE_B,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C,
-		_CTYPE_C,
-		/* 10 */
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		/* 18 */
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		/* 20 */
-		_CTYPE_S|_CTYPE_B|_CTYPE_R,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		/* 28 */
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		/* 30 */
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X,
-		/* 38 */
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		/* 40 */
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		/* 48 */
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		/* 50 */
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		/* 58 */
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		/* 60 */
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		/* 68 */
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		/* 70 */
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		/* 78 */
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_C,
-	},
-
-	/* BEGIN CSTYLED */
-	{
-	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
-     	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,
-	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17,
-     	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f,
-	0x20,	0x21,	0x22,	0x23,	0x24,	0x25,	0x26,	0x27,
-     	0x28,	0x29,	0x2a,	0x2b,	0x2c,	0x2d,	0x2e,	0x2f,
-	0x30,	0x31,	0x32,	0x33,	0x34,	0x35,	0x36,	0x37,
-     	0x38,	0x39,	0x3a,	0x3b,	0x3c,	0x3d,	0x3e,	0x3f,
-	0x40,	'a',	'b',	'c',	'd',	'e',	'f',	'g',
-     	'h',	'i',	'j',	'k',	'l',	'm',	'n',	'o',
-	'p',	'q',	'r',	's',	't',	'u',	'v',	'w',
-     	'x',	'y',	'z',	0x5b,	0x5c,	0x5d,	0x5e,	0x5f,
-	0x60,	'a',	'b',	'c',	'd',	'e',	'f',	'g',
-     	'h',	'i',	'j',	'k',	'l',	'm',	'n',	'o',
-	'p',	'q',	'r',	's',	't',	'u',	'v',	'w',
-     	'x',	'y',	'z',	0x7b,	0x7c,	0x7d,	0x7e,	0x7f,
-	0x80,	0x81,	0x82,	0x83,	0x84,	0x85,	0x86,	0x87,
-     	0x88,	0x89,	0x8a,	0x8b,	0x8c,	0x8d,	0x8e,	0x8f,
-	0x90,	0x91,	0x92,	0x93,	0x94,	0x95,	0x96,	0x97,
-     	0x98,	0x99,	0x9a,	0x9b,	0x9c,	0x9d,	0x9e,	0x9f,
-	0xa0,	0xa1,	0xa2,	0xa3,	0xa4,	0xa5,	0xa6,	0xa7,
-     	0xa8,	0xa9,	0xaa,	0xab,	0xac,	0xad,	0xae,	0xaf,
-	0xb0,	0xb1,	0xb2,	0xb3,	0xb4,	0xb5,	0xb6,	0xb7,
-     	0xb8,	0xb9,	0xba,	0xbb,	0xbc,	0xbd,	0xbe,	0xbf,
-	0xc0,	0xc1,	0xc2,	0xc3,	0xc4,	0xc5,	0xc6,	0xc7,
-     	0xc8,	0xc9,	0xca,	0xcb,	0xcc,	0xcd,	0xce,	0xcf,
-	0xd0,	0xd1,	0xd2,	0xd3,	0xd4,	0xd5,	0xd6,	0xd7,
-     	0xd8,	0xd9,	0xda,	0xdb,	0xdc,	0xdd,	0xde,	0xdf,
-	0xe0,	0xe1,	0xe2,	0xe3,	0xe4,	0xe5,	0xe6,	0xe7,
-     	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef,
-	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7,
-     	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff,
-	},
-	{
-	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
-     	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,
-	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17,
-     	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f,
-	0x20,	0x21,	0x22,	0x23,	0x24,	0x25,	0x26,	0x27,
-     	0x28,	0x29,	0x2a,	0x2b,	0x2c,	0x2d,	0x2e,	0x2f,
-	0x30,	0x31,	0x32,	0x33,	0x34,	0x35,	0x36,	0x37,
-     	0x38,	0x39,	0x3a,	0x3b,	0x3c,	0x3d,	0x3e,	0x3f,
-	0x40,	'A',	'B',	'C',	'D',	'E',	'F',	'G',
-     	'H',	'I',	'J',	'K',	'L',	'M',	'N',	'O',
-	'P',	'Q',	'R',	'S',	'T',	'U',	'V',	'W',
-     	'X',	'Y',	'Z',	0x5b,	0x5c,	0x5d,	0x5e,	0x5f,
-	0x60,	'A',	'B',	'C',	'D',	'E',	'F',	'G',
-     	'H',	'I',	'J',	'K',	'L',	'M',	'N',	'O',
-	'P',	'Q',	'R',	'S',	'T',	'U',	'V',	'W',
-     	'X',	'Y',	'Z',	0x7b,	0x7c,	0x7d,	0x7e,	0x7f,
-	0x80,	0x81,	0x82,	0x83,	0x84,	0x85,	0x86,	0x87,
-     	0x88,	0x89,	0x8a,	0x8b,	0x8c,	0x8d,	0x8e,	0x8f,
-	0x90,	0x91,	0x92,	0x93,	0x94,	0x95,	0x96,	0x97,
-     	0x98,	0x99,	0x9a,	0x9b,	0x9c,	0x9d,	0x9e,	0x9f,
-	0xa0,	0xa1,	0xa2,	0xa3,	0xa4,	0xa5,	0xa6,	0xa7,
-     	0xa8,	0xa9,	0xaa,	0xab,	0xac,	0xad,	0xae,	0xaf,
-	0xb0,	0xb1,	0xb2,	0xb3,	0xb4,	0xb5,	0xb6,	0xb7,
-     	0xb8,	0xb9,	0xba,	0xbb,	0xbc,	0xbd,	0xbe,	0xbf,
-	0xc0,	0xc1,	0xc2,	0xc3,	0xc4,	0xc5,	0xc6,	0xc7,
-     	0xc8,	0xc9,	0xca,	0xcb,	0xcc,	0xcd,	0xce,	0xcf,
-	0xd0,	0xd1,	0xd2,	0xd3,	0xd4,	0xd5,	0xd6,	0xd7,
-     	0xd8,	0xd9,	0xda,	0xdb,	0xdc,	0xdd,	0xde,	0xdf,
-	0xe0,	0xe1,	0xe2,	0xe3,	0xe4,	0xe5,	0xe6,	0xe7,
-     	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef,
-	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7,
-     	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff,
-	},
-	/* END CSTYLED */
+	_DEFRUNETYPE,
+	_DEFMAPLOWER,
+	_DEFMAPUPPER,
 };
 
-/* Taken from former _ctype.c */
-unsigned int *__ctype_mask = _DefaultRuneLocale.__runetype;
+/*
+ * __ctype_mask, __trans_lower, and __trans_upper come from former _ctype.c and
+ * have to stay pointers for binary compatibility, so we provide separate
+ * storage for them, initialized to "C" locale contents by default.
+ */
+static unsigned int ___ctype_mask[_CACHED_RUNES] = _DEFRUNETYPE;
+unsigned int *__ctype_mask = ___ctype_mask;
+
+static int ___trans_lower[_CACHED_RUNES] = _DEFMAPLOWER;
+int *__trans_lower = ___trans_lower;
 
-int *__trans_lower = _DefaultRuneLocale.__maplower;
-int *__trans_upper = _DefaultRuneLocale.__mapupper;
+static int ___trans_upper[_CACHED_RUNES] = _DEFMAPUPPER;
+int *__trans_upper = ___trans_upper;
diff --git a/usr/src/man/man3c/thrd_equal.3c b/usr/src/man/man3c/thrd_equal.3c
index 1712bbb6f9..28c6baeb1f 100644
--- a/usr/src/man/man3c/thrd_equal.3c
+++ b/usr/src/man/man3c/thrd_equal.3c
@@ -42,7 +42,9 @@ if
 and
 .Fa thrd1
 refer to the same thread.
-Otherwise, a non-zero value is returned, indicating that
+Otherwise,
+.Sy 0
+is returned, indicating that
 .Fa thrd0
 and
 .Fa thrd1
diff --git a/usr/src/pkg/manifests/system-test-utiltest.mf b/usr/src/pkg/manifests/system-test-utiltest.mf
index eacc8a3f52..a8cab5ba5c 100644
--- a/usr/src/pkg/manifests/system-test-utiltest.mf
+++ b/usr/src/pkg/manifests/system-test-utiltest.mf
@@ -42,6 +42,8 @@ file path=opt/util-tests/tests/dis/i386/32.avx.out mode=0555
 file path=opt/util-tests/tests/dis/i386/32.avx.s mode=0555
 file path=opt/util-tests/tests/dis/i386/32.avx2.out mode=0555
 file path=opt/util-tests/tests/dis/i386/32.avx2.s mode=0555
+file path=opt/util-tests/tests/dis/i386/32.avx512.out mode=0555
+file path=opt/util-tests/tests/dis/i386/32.avx512.s mode=0555
 file path=opt/util-tests/tests/dis/i386/32.bmi1.out mode=0555
 file path=opt/util-tests/tests/dis/i386/32.bmi1.s mode=0555
 file path=opt/util-tests/tests/dis/i386/32.bmi2.out mode=0555
@@ -86,6 +88,8 @@ file path=opt/util-tests/tests/dis/i386/64.avx.out mode=0555
 file path=opt/util-tests/tests/dis/i386/64.avx.s mode=0555
 file path=opt/util-tests/tests/dis/i386/64.avx2.out mode=0555
 file path=opt/util-tests/tests/dis/i386/64.avx2.s mode=0555
+file path=opt/util-tests/tests/dis/i386/64.avx512.out mode=0555
+file path=opt/util-tests/tests/dis/i386/64.avx512.s mode=0555
 file path=opt/util-tests/tests/dis/i386/64.bmi1.out mode=0555
 file path=opt/util-tests/tests/dis/i386/64.bmi1.s mode=0555
 file path=opt/util-tests/tests/dis/i386/64.bmi2.out mode=0555
diff --git a/usr/src/test/util-tests/tests/dis/Makefile b/usr/src/test/util-tests/tests/dis/Makefile
index ccc5dfcb3f..53cf7ccd40 100644
--- a/usr/src/test/util-tests/tests/dis/Makefile
+++ b/usr/src/test/util-tests/tests/dis/Makefile
@@ -28,6 +28,7 @@ I386_TESTS =		\
 	32.adx 		\
 	32.avx		\
 	32.avx2		\
+	32.avx512	\
 	32.aes 		\
 	32.bmi1 	\
 	32.bmi2 	\
@@ -49,6 +50,7 @@ I386_TESTS =		\
 	32.xsave 	\
 	64.avx		\
 	64.avx2		\
+	64.avx512	\
 	64.adx 		\
 	64.aes 		\
 	64.bmi1 	\