Mercurial > hg > truffle

comparison agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java @ 8849:e458120c6e1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8002118: WindbgDebuggerLocal should not try to load 64-bit debug libraries for 32-bit JVM Reviewed-by: sspitsyn, zgu Contributed-by: peter.allwin@oracle.com
author sla
date Thu, 28 Mar 2013 15:39:52 +0100
parents 8e47bac5643a
children de6a9e811145
comparison
equal deleted inserted replaced
8848:d886ac1dfd36 8849:e458120c6e1a
570 // name variations that we know of: 570 // name variations that we know of:
571 String sysRoot = System.getenv("SYSTEMROOT"); 571 String sysRoot = System.getenv("SYSTEMROOT");
572 DTFWHome = sysRoot + File.separator + ".." + File.separator + 572 DTFWHome = sysRoot + File.separator + ".." + File.separator +
573 "Program Files" + File.separator + "Debugging Tools For Windows"; 573 "Program Files" + File.separator + "Debugging Tools For Windows";
574 searchList.add(DTFWHome); 574 searchList.add(DTFWHome);
575 searchList.add(DTFWHome + " (x86)"); 575
576 searchList.add(DTFWHome + " (x64)"); 576 // Only add the search path for the current CPU architecture:
577 577 String cpu = PlatformInfo.getCPU();
578 if (cpu.equals("x86")) {
579 searchList.add(DTFWHome + " (x86)");
580 } else if (cpu.equals("amd64")) {
581 searchList.add(DTFWHome + " (x64)");
582 }
578 // The last place to search is the system directory: 583 // The last place to search is the system directory:
579 searchList.add(sysRoot + File.separator + "system32"); 584 searchList.add(sysRoot + File.separator + "system32");
580 } 585 }
581 586
582 for (int i = 0; i < searchList.size(); i++) { 587 for (int i = 0; i < searchList.size(); i++) {