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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
