939 SUNWdtrt needs to be willing to use 64bit java

Reviewed by: Albert Lee <trisk@opensolaris.org>
Reviewed by: Garrett D'Amore <garrett@nexenta.com>
Approved by: Garrett D'Amore <garrett@nexenta.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/usr/src/cmd/dtrace/test/cmd/jdtrace/jdtrace.c b/usr/src/cmd/dtrace/test/cmd/jdtrace/jdtrace.c
index 095126569c..81a2d9bcdf 100644
--- a/usr/src/cmd/dtrace/test/cmd/jdtrace/jdtrace.c
+++ b/usr/src/cmd/dtrace/test/cmd/jdtrace/jdtrace.c
@@ -22,25 +22,27 @@
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright 2011, Richard Lowe
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <alloca.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <err.h>
 #include <sys/systeminfo.h>
 
 int
 main(int argc, char **argv)
 {
-	int i, ac, has64;
+	int i, ac;
 	char **av, **p;
+	char isaname[16];
 
 	ac = argc + 3;
 	av = p = alloca(sizeof (char *) * ac);
 
-	*p++ = "java";
+	*p++ = "/usr/java/bin/java";
 	*p++ = "-jar";
 	*p++ = "/opt/SUNWdtrt/lib/java/jdtrace.jar";
 
@@ -52,9 +54,9 @@ main(int argc, char **argv)
 	}
 	p[i] = NULL;
 
-	(void) execvp(av[0], av);
-
-	perror("exec failed");
+	if (sysinfo(SI_ARCHITECTURE_64, isaname, sizeof (isaname)) != -1)
+		asprintf(av, "/usr/java/bin/%s/java", isaname);
 
-	return (0);
+	(void) execv(av[0], av);
+	err(1, "exec failed");
 }