From owner-svn-src-head@freebsd.org  Mon Nov 27 17:54:19 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75108DBAE56;
 Mon, 27 Nov 2017 17:54:19 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4EB1E7D900;
 Mon, 27 Nov 2017 17:54:19 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARHsIZn078724;
 Mon, 27 Nov 2017 17:54:18 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARHsIuf078719;
 Mon, 27 Nov 2017 17:54:18 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201711271754.vARHsIuf078719@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 27 Nov 2017 17:54:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326285 - in head/cddl:
 contrib/opensolaris/cmd/dtrace/test/tst/common/uctf
 usr.sbin/dtrace/tests/common/probes usr.sbin/dtrace/tests/common/speculation
 usr.sbin/dtrace/tests/common/uct...
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: in head/cddl:
 contrib/opensolaris/cmd/dtrace/test/tst/common/uctf
 usr.sbin/dtrace/tests/common/probes usr.sbin/dtrace/tests/common/speculation
 usr.sbin/dtrace/tests/common/uctf usr.sbin/dtrace/tests/t...
X-SVN-Commit-Revision: 326285
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 17:54:19 -0000

Author: markj
Date: Mon Nov 27 17:54:17 2017
New Revision: 326285
URL: https://svnweb.freebsd.org/changeset/base/326285

Log:
  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.

Modified:
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
  head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
  head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh	Mon Nov 27 17:46:38 2017	(r326284)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh	Mon Nov 27 17:54:17 2017	(r326285)
@@ -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;

Modified: head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile	Mon Nov 27 17:46:38 2017	(r326284)
+++ head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile	Mon Nov 27 17:54:17 2017	(r326285)
@@ -35,4 +35,5 @@ CFILES= \
      tst.probestar.c  \
 
 
+
 .include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile	Mon Nov 27 17:46:38 2017	(r326284)
+++ head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile	Mon Nov 27 17:54:17 2017	(r326285)
@@ -70,6 +70,7 @@ ${PACKAGE}FILES= \
 TESTEXES= \
      tst.NoSpecBuffer.exe  \
 
+
 CFILES= \
 
 

Modified: head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile	Mon Nov 27 17:46:38 2017	(r326284)
+++ head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile	Mon Nov 27 17:54:17 2017	(r326285)
@@ -40,6 +40,4 @@ CFILES= \
 
 WITH_CTF=YES
 
-CFLAGS.tst.chasestrings.exe+= -m32
-
 .include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh	Mon Nov 27 17:46:38 2017	(r326284)
+++ head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh	Mon Nov 27 17:54:17 2017	(r326285)
@@ -53,8 +53,6 @@ TEST_METADATA.t_dtrace_contrib+=	required_memory=\"4g\
     uctf)
         special="
 WITH_CTF=YES
-
-CFLAGS.tst.chasestrings.exe+= -m32
 "
         ;;
     esac