Mercurial > hg > truffle

diff agent/src/share/classes/sun/jvm/hotspot/asm/Disassembler.java @ 12818:763705f0fec3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8016845: SA is unable to use hsdis on windows Summary: Added sadis.c to the build to provide missing symbols in sawindbg.dll. Added code to use the correct hsdisXXX.dll filename on different windows platforms. Reviewed-by: sla, mgerdin Contributed-by: fredrik.arvidsson@oracle.com
author sla
date Fri, 04 Oct 2013 13:01:07 +0200
parents 5a98bf7d847b
children de6a9e811145
line wrap: on
line diff
--- a/agent/src/share/classes/sun/jvm/hotspot/asm/Disassembler.java	Fri Oct 04 12:45:39 2013 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/asm/Disassembler.java	Fri Oct 04 13:01:07 2013 +0200
@@ -67,6 +67,13 @@
          String libname = "hsdis";
          String arch = System.getProperty("os.arch");
          if (os.lastIndexOf("Windows", 0) != -1) {
+            if (arch.equals("x86")) {
+               libname +=  "-i386";
+            } else if (arch.equals("amd64")) {
+               libname +=  "-amd64";
+            } else {
+               libname +=  "-" + arch;
+            }
             path.append(sep + "bin" + sep);
             libname += ".dll";
          } else if (os.lastIndexOf("SunOS", 0) != -1) {