Mercurial > hg > truffle

comparison agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java @ 5936:970cbbba54b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 Summary: On Mac OS X, align system property "os.arch" with Apple legacy JDKs. Also, improve os.name string matching by using contains() method instead of .startsWith(). Reviewed-by: dcubed, phh, ohair, katleman Contributed-by: james.melvin@oracle.com
author jmelvin
date Fri, 16 Mar 2012 15:13:22 -0400
parents 37be97a58393
children
comparison
equal deleted inserted replaced
5935:a735aec54ea4 5936:970cbbba54b0
1 /* 1 /*
2 * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
215 } 215 }
216 return null; 216 return null;
217 } 217 }
218 218
219 protected void checkNativeLink(SecurityManager sm, String os) { 219 protected void checkNativeLink(SecurityManager sm, String os) {
220 if (os.equals("SunOS") || os.equals("Linux")) { 220 if (os.equals("SunOS") || os.equals("Linux") || os.contains("OS X")) {
221 // link "saproc" - SA native library on SunOS and Linux? 221 // link "saproc" - SA native library on SunOS, Linux, and Mac OS X
222 sm.checkLink("saproc"); 222 sm.checkLink("saproc");
223 } else if (os.startsWith("Windows")) { 223 } else if (os.startsWith("Windows")) {
224 // link "sawindbg" - SA native library on Windows. 224 // link "sawindbg" - SA native library on Windows.
225 sm.checkLink("sawindbg"); 225 sm.checkLink("sawindbg");
226 } else { 226 } else {