Wed Jun 6 17:16:56 2018 UTC ()

Correct compilation of osnet/dev/dtrace/x86/dis_tables.c under Clang

Constify dgr_suffix.

This could be done with -W flags, but they are incompatible between
compilers.

This is a step forward functional MKLLVM=yes HAVE_LLVM=yes build.

Sponsored by <The NetBSD Foundation>


(kamil)

diff -r1.1 -r1.2 src/external/cddl/osnet/dev/dtrace/x86/dis_tables.c

--- src/external/cddl/osnet/dev/dtrace/x86/dis_tables.c 2018/05/28 23:47:39	1.1
+++ src/external/cddl/osnet/dev/dtrace/x86/dis_tables.c 2018/06/06 17:16:56	1.2

 @@ -2335,27 +2335,27 @@ static int isize64[] = {1, 2, 4, 8};
  * The simplest way to deal with this is to just define a table based on the
  * instruction opcodes, which are 0x90-0x93, so we subtract 0x90 to index into
  * them.
+ *
  * We further have to subdivide this based on the value of VEX_W and the value
  * of VEX_L. The array is constructed to be indexed as:
  * 	[opcode - 0x90][VEX_W][VEX_L].
  */
 /* w = 0, 0x90 */
 typedef struct dis_gather_regs {
 	uint_t dgr_arg0;	/* src reg */
 	uint_t dgr_arg1;	/* vsib reg */
 	uint_t dgr_arg2;	/* dst reg */
-	char   *dgr_suffix;	/* suffix to append */
+	const char   *dgr_suffix;	/* suffix to append */
 } dis_gather_regs_t;
 static dis_gather_regs_t dis_vgather[4][2][2] = {
+	{
 		/* op 0x90, W.0 */
+		{
 			{ XMM_OPND, XMM_OPND, XMM_OPND, "d" },
 			{ YMM_OPND, YMM_OPND, YMM_OPND, "d" }
 		},
 		/* op 0x90, W.1 */
+		{
 			{ XMM_OPND, XMM_OPND, XMM_OPND, "q" },
 			{ YMM_OPND, XMM_OPND, YMM_OPND, "q" }