From f4b90f5a5cc1e9ad229183bc6d0c3d1e769d6b32 Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 27 Nov 2017 17:54:17 +0000
Subject: [PATCH] Revert r326181 for now.

We can't link an executable using -m32 until the lib32 phase of a
buildworld, though the build works fine when executing make from
cddl/usr.sbin/dtrace/tests. Some other solution will need to be found.
---
 .../cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh         | 2 +-
 cddl/usr.sbin/dtrace/tests/common/probes/Makefile               | 1 +
 cddl/usr.sbin/dtrace/tests/common/speculation/Makefile          | 1 +
 cddl/usr.sbin/dtrace/tests/common/uctf/Makefile                 | 2 --
 cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh                | 2 --
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
index 072fca7206df..54d975f63aff 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
@@ -38,7 +38,7 @@ fi
 ./$exe &
 pid=$!
 
-$dtrace -32 -qs /dev/stdin <<EOF
+$dtrace -qs /dev/stdin <<EOF
 typedef struct info {
         char    *zi_gamename;
         int     zi_ndungeons;
diff --git a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
index 7e02b9a73900..4adb82857b08 100644
--- a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
@@ -35,4 +35,5 @@ CFILES= \
      tst.probestar.c  \
 
 
+
 .include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
index 5afee0225e89..eb871e9585e7 100644
--- a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
@@ -70,6 +70,7 @@ ${PACKAGE}FILES= \
 TESTEXES= \
      tst.NoSpecBuffer.exe  \
 
+
 CFILES= \
 
 
diff --git a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
index 01f0336fcc40..945a853b69df 100644
--- a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
@@ -40,6 +40,4 @@ CFILES= \
 
 WITH_CTF=YES
 
-CFLAGS.tst.chasestrings.exe+= -m32
-
 .include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
index 8487387c62a1..767b22f57783 100755
--- a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
@@ -53,8 +53,6 @@ TEST_METADATA.t_dtrace_contrib+=	required_memory=\"4g\"
     uctf)
         special="
 WITH_CTF=YES
-
-CFLAGS.tst.chasestrings.exe+= -m32
 "
         ;;
     esac