Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh	(revision 279416)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh	(revision 279417)
@@ -1,131 +1,131 @@
 #!/bin/ksh -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 
 #
 # This test verifies that probes will be picked up after a dlopen(3C)
 # when the pid provider is specified as a glob (e.g., p*d$target.)
 #
 
 if [ $# != 1 ]; then
 	echo expected one argument: '<'dtrace-path'>'
 	exit 2
 fi
 
 dtrace=$1
 DIR=${TMPDIR:-/tmp}/dtest.$$
 
 mkdir $DIR
 cd $DIR
 
 cat > Makefile <<EOF
 all: main altlib.so
 
 main: main.o
 	cc -o main main.o
 
 main.o: main.c
 	cc -c main.c
 
 altlib.so: altlib.o
-	cc -z defs -G -o altlib.so altlib.o -lc
+	cc -shared -o altlib.so altlib.o -lc
 
 altlib.o: altlib.c
 	cc -c altlib.c
 EOF
 
 cat > altlib.c <<EOF
 void
 go(void)
 {
 }
 EOF
 
 cat > main.c <<EOF
 #include <dlfcn.h>
 #include <unistd.h>
 #include <stdio.h>
 
 void
 go(void)
 {
 }
 
 int
 main(int argc, char **argv)
 {
 	void *alt;
 	void *alt_go;
 
 	go();
 
 	if ((alt = dlopen("./altlib.so", RTLD_LAZY | RTLD_LOCAL)) 
 	    == NULL) {
 		printf("dlopen of altlib.so failed: %s\n", dlerror());
 		return (1);
 	}
 
 	if ((alt_go = dlsym(alt, "go")) == NULL) {
 		printf("failed to lookup 'go' in altlib.so\n");
 		return (1);
 	}
 
 	((void (*)(void))alt_go)();
 
 	return (0);
 }
 EOF
 
 make > /dev/null
 if [ $? -ne 0 ]; then
 	print -u2 "failed to build"
 	exit 1
 fi
 
 cat > main.d <<'EOF'
 p*d$target::go:entry
 {
 	@foo[probemod, probefunc, probename] = count();
 }
 
 END
 {
 	printa("%s:%s:%s %@u\n",@foo);
 }
 EOF
 
 script() {
 	$dtrace -q -s ./main.d -c ./main
 }
 
 script
 status=$?
 
 cd /tmp
 /bin/rm -rf $DIR
 
 exit $status
Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh	(revision 279416)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh	(revision 279417)
@@ -1,154 +1,154 @@
 #!/bin/ksh -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 
 #
 # This test verifies that USDT probes will be picked up after a dlopen(3C)
 # when a regex in the provider name matches both USDT probes and pid probes
 # (e.g., p*d$target matches both pid$target and pyramid$target.)
 #
 
 if [ $# != 1 ]; then
 	echo expected one argument: '<'dtrace-path'>'
 	exit 2
 fi
 
 dtrace=$1
 DIR=${TMPDIR:-/tmp}/dtest.$$
 
 mkdir $DIR
 cd $DIR
 
 cat > Makefile <<EOF
 all: main altlib.so
 
 main: main.o provmain.o
 	cc -o main main.o provmain.o
 
 main.o: main.c prov.h
 	cc -c main.c
 
 prov.h: prov.d
 	$dtrace -h -s prov.d
 
 provmain.o: prov.d main.o
 	$dtrace -G -32 -o provmain.o -s prov.d main.o
 
 altlib.so: altlib.o provalt.o
-	cc -z defs -G -o altlib.so altlib.o provalt.o -lc
+	cc -shared -o altlib.so altlib.o provalt.o -lc
 
 altlib.o: altlib.c prov.h
 	cc -c altlib.c
 
 provalt.o: prov.d altlib.o
 	$dtrace -G -32 -o provalt.o -s prov.d altlib.o
 EOF
 
 cat > prov.d <<EOF
 provider pyramid {
 	probe entry();
 };
 EOF
 
 cat > altlib.c <<EOF
 #include <sys/sdt.h>
 #include "prov.h"
 
 void
 go(void)
 {
 	PYRAMID_ENTRY();
 }
 EOF
 
 cat > main.c <<EOF
 #include <dlfcn.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/sdt.h>
 #include "prov.h"
 
 void
 go(void)
 {
 	PYRAMID_ENTRY();
 }
 
 int
 main(int argc, char **argv)
 {
 	void *alt;
 	void *alt_go;
 
 	go();
 
 	if ((alt = dlopen("./altlib.so", RTLD_LAZY | RTLD_LOCAL)) 
 	    == NULL) {
 		printf("dlopen of altlib.so failed: %s\n", dlerror());
 		return (1);
 	}
 
 	if ((alt_go = dlsym(alt, "go")) == NULL) {
 		printf("failed to lookup 'go' in altlib.so\n");
 		return (1);
 	}
 
 	((void (*)(void))alt_go)();
 
 	return (0);
 }
 EOF
 
 make > /dev/null
 if [ $? -ne 0 ]; then
 	print -u2 "failed to build"
 	exit 1
 fi
 
 cat > main.d <<'EOF'
 p*d$target::go:entry
 {
 	@foo[probemod, probefunc, probename] = count();
 }
 
 END
 {
 	printa("%s:%s:%s %@u\n",@foo);
 }
 EOF
 
 script() {
 	$dtrace -q -s ./main.d -c ./main
 }
 
 script
 status=$?
 
 cd /tmp
 /bin/rm -rf $DIR
 
 exit $status
Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh	(revision 279416)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh	(revision 279417)
@@ -1,162 +1,162 @@
 #!/bin/ksh -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 
 #
 # This test verifies that USDT providers are removed when its associated
 # load object is closed via dlclose(3dl).
 #
 
 if [ $# != 1 ]; then
 	echo expected one argument: '<'dtrace-path'>'
 	exit 2
 fi
 
 dtrace=$1
 DIR=/var/tmp/dtest.$$
 
 mkdir $DIR
 cd $DIR
 
 cat > Makefile <<EOF
 all: main livelib.so deadlib.so
 
 main: main.o prov.o
 	cc -o main main.o
 
 main.o: main.c
 	cc -c main.c
 
 
 livelib.so: livelib.o prov.o
-	cc -z defs -G -o livelib.so livelib.o prov.o -lc
+	cc -shared -o livelib.so livelib.o prov.o -lc
 
 livelib.o: livelib.c prov.h
 	cc -c livelib.c
 
 prov.o: livelib.o prov.d
 	$dtrace -G -s prov.d livelib.o
 
 prov.h: prov.d
 	$dtrace -h -s prov.d
 
 
 deadlib.so: deadlib.o
-	cc -z defs -G -o deadlib.so deadlib.o -lc
+	cc -shared -o deadlib.so deadlib.o -lc
 
 deadlib.o: deadlib.c
 	cc -c deadlib.c
 
 clean:
 	rm -f main.o livelib.o prov.o prov.h deadlib.o
 
 clobber: clean
 	rm -f main livelib.so deadlib.so
 EOF
 
 cat > prov.d <<EOF
 provider test_prov {
 	probe go();
 };
 EOF
 
 cat > livelib.c <<EOF
 #include "prov.h"
 
 void
 go(void)
 {
 	TEST_PROV_GO();
 }
 EOF
 
 cat > deadlib.c <<EOF
 void
 go(void)
 {
 }
 EOF
 
 
 cat > main.c <<EOF
 #include <dlfcn.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <signal.h>
 
 int
 main(int argc, char **argv)
 {
 	void *live;
 	sigset_t mask;
 
 	if ((live = dlopen("./livelib.so", RTLD_LAZY | RTLD_LOCAL)) == NULL) {
 		printf("dlopen of livelib.so failed: %s\n", dlerror());
 		return (1);
 	}
 
 	(void) dlclose(live);
 
 	(void) sigemptyset(&mask);
 	(void) sigsuspend(&mask);
 
 	return (0);
 }
 EOF
 
 /usr/bin/make > /dev/null
 if [ $? -ne 0 ]; then
 	print -u2 "failed to build"
 	exit 1
 fi
 
 script() {
 	$dtrace -w -x bufsize=1k -c ./main -qs /dev/stdin <<EOF
 	syscall::sigsuspend:entry
 	/pid == \$target/
 	{
 		system("$dtrace -l -P test_prov*");
 		system("kill %d", \$target);
 		exit(0);
 	}
 
 	tick-1s
 	/i++ == 5/
 	{
 		printf("failed\n");
 		exit(1);
 	}
 EOF
 }
 
 script 2>&1
 status=$?
 
 cd /
 /bin/rm -rf $DIR
 
 exit $status
Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose2.ksh
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose2.ksh	(revision 279416)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose2.ksh	(revision 279417)
@@ -1,160 +1,160 @@
 #!/bin/ksh -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 
 if [ $# != 1 ]; then
 	echo expected one argument: '<'dtrace-path'>'
 	exit 2
 fi
 
 dtrace=$1
 DIR=/var/tmp/dtest.$$
 
 mkdir $DIR
 cd $DIR
 
 cat > Makefile <<EOF
 all: main livelib.so deadlib.so
 
 main: main.o prov.o
 	cc -o main main.o
 
 main.o: main.c
 	cc -c main.c
 
 
 livelib.so: livelib.o prov.o
-	cc -z defs -G -o livelib.so livelib.o prov.o -lc
+	cc -shared -o livelib.so livelib.o prov.o -lc
 
 livelib.o: livelib.c prov.h
 	cc -c livelib.c
 
 prov.o: livelib.o prov.d
 	$dtrace -G -s prov.d livelib.o
 
 prov.h: prov.d
 	$dtrace -h -s prov.d
 
 
 deadlib.so: deadlib.o
-	cc -z defs -G -o deadlib.so deadlib.o -lc
+	cc -shared -o deadlib.so deadlib.o -lc
 
 deadlib.o: deadlib.c
 	cc -c deadlib.c
 
 clean:
 	rm -f main.o livelib.o prov.o prov.h deadlib.o
 
 clobber: clean
 	rm -f main livelib.so deadlib.so
 EOF
 
 cat > prov.d <<EOF
 provider test_prov {
 	probe go();
 };
 EOF
 
 cat > livelib.c <<EOF
 #include "prov.h"
 
 void
 go(void)
 {
 	TEST_PROV_GO();
 }
 EOF
 
 cat > deadlib.c <<EOF
 void
 go(void)
 {
 }
 EOF
 
 
 cat > main.c <<EOF
 #include <dlfcn.h>
 #include <unistd.h>
 #include <stdio.h>
 
 int
 main(int argc, char **argv)
 {
 	void *live, *dead;
 	void *go;
 
 	if ((live = dlopen("./livelib.so", RTLD_LAZY | RTLD_LOCAL)) == NULL) {
 		printf("dlopen of livelib.so failed: %s\n", dlerror());
 		return (1);
 	}
 
 	(void) dlclose(live);
 
 	if ((dead = dlopen("./deadlib.so", RTLD_LAZY | RTLD_LOCAL)) == NULL) {
 		printf("dlopen of deadlib.so failed: %s\n", dlerror());
 		return (1);
 	}
 
 	if ((live = dlopen("./livelib.so", RTLD_LAZY | RTLD_LOCAL)) == NULL) {
 		printf("dlopen of livelib.so failed: %s\n", dlerror());
 		return (1);
 	}
 
 	if ((go = dlsym(live, "go")) == NULL) {
 		printf("failed to lookup 'go' in livelib.so\n");
 		return (1);
 	}
 
 	((void (*)(void))go)();
 
 	return (0);
 }
 EOF
 
 /usr/bin/make > /dev/null
 if [ $? -ne 0 ]; then
 	print -u2 "failed to build"
 	exit 1
 fi
 
 script() {
 	$dtrace -w -c ./main -Zqs /dev/stdin <<EOF
 	test_prov*:::
 	{
 		printf("%s:%s:%s\n", probemod, probefunc, probename);
 	}
 EOF
 }
 
 script
 status=$?
 
 cd /
 /bin/rm -rf $DIR
 
 exit $status
Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose3.ksh
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose3.ksh	(revision 279416)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose3.ksh	(revision 279417)
@@ -1,170 +1,170 @@
 #!/bin/ksh -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 
 #
 # This test verifies that performing a dlclose(3dl) on a library doesn't
 # cause existing pid provider probes to become invalid.
 #
 
 if [ $# != 1 ]; then
 	echo expected one argument: '<'dtrace-path'>'
 	exit 2
 fi
 
 dtrace=$1
 DIR=/var/tmp/dtest.$$
 
 mkdir $DIR
 cd $DIR
 
 cat > Makefile <<EOF
 all: main livelib.so deadlib.so
 
 main: main.o prov.o
 	cc -o main main.o
 
 main.o: main.c
 	cc -c main.c
 
 
 livelib.so: livelib.o prov.o
-	cc -z defs -G -o livelib.so livelib.o prov.o -lc
+	cc -shared -o livelib.so livelib.o prov.o -lc
 
 livelib.o: livelib.c prov.h
 	cc -c livelib.c
 
 prov.o: livelib.o prov.d
 	$dtrace -G -s prov.d livelib.o
 
 prov.h: prov.d
 	$dtrace -h -s prov.d
 
 
 deadlib.so: deadlib.o
-	cc -z defs -G -o deadlib.so deadlib.o -lc
+	cc -shared -o deadlib.so deadlib.o -lc
 
 deadlib.o: deadlib.c
 	cc -c deadlib.c
 
 clean:
 	rm -f main.o livelib.o prov.o prov.h deadlib.o
 
 clobber: clean
 	rm -f main livelib.so deadlib.so
 EOF
 
 cat > prov.d <<EOF
 provider test_prov {
 	probe go();
 };
 EOF
 
 cat > livelib.c <<EOF
 #include "prov.h"
 
 void
 go(void)
 {
 	TEST_PROV_GO();
 }
 EOF
 
 cat > deadlib.c <<EOF
 void
 go(void)
 {
 }
 EOF
 
 
 cat > main.c <<EOF
 #include <dlfcn.h>
 #include <unistd.h>
 #include <stdio.h>
 
 static void
 foo(void)
 {
 	(void) close(-1);
 }
 
 int
 main(int argc, char **argv)
 {
 	void *live;
 
 	if ((live = dlopen("./livelib.so", RTLD_LAZY | RTLD_LOCAL)) == NULL) {
 		printf("dlopen of livelib.so failed: %s\n", dlerror());
 		return (1);
 	}
 
 	(void) dlclose(live);
 
 	foo();
 
 	return (0);
 }
 EOF
 
 /usr/bin/make > /dev/null
 if [ $? -ne 0 ]; then
 	print -u2 "failed to build"
 	exit 1
 fi
 
 script() {
 	$dtrace -c ./main -s /dev/stdin <<EOF
 	pid\$target:a.out:foo:entry
 	{
 		gotit = 1;
 		exit(0);
 	}
 
 	tick-1s
 	/i++ == 5/
 	{
 		printf("test timed out");
 		exit(1);
 	}
 
 	END
 	/!gotit/
 	{
 		printf("program ended without hitting probe");
 		exit(1);
 	}
 EOF
 }
 
 script
 status=$?
 
 cd /
 /bin/rm -rf $DIR
 
 exit $status