Mercurial > hg > truffle
annotate agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java @ 5936:970cbbba54b0
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 | 436b4a3231bf |
| children | a9fed06c01d2 |
| rev | line source |
|---|---|
| 0 | 1 /* |
|
5936
970cbbba54b0
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6
jmelvin
parents:
4006
diff
changeset
|
2 * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. |
| 0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 * | |
| 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 | |
| 7 * published by the Free Software Foundation. | |
| 8 * | |
| 9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
| 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 * version 2 for more details (a copy is included in the LICENSE file that | |
| 13 * accompanied this code). | |
| 14 * | |
| 15 * You should have received a copy of the GNU General Public License version | |
| 16 * 2 along with this work; if not, write to the Free Software Foundation, | |
| 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 18 * | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
21 * questions. |
| 0 | 22 * |
| 23 */ | |
| 24 | |
| 25 package sun.jvm.hotspot.utilities; | |
| 26 | |
| 27 /** Provides canonicalized OS and CPU information for the rest of the | |
| 28 system. */ | |
| 29 | |
| 30 public class PlatformInfo { | |
| 31 /* Returns "solaris" if on Solaris; "win32" if Windows; "linux" if | |
| 32 Linux. Used to determine location of dbx and import module, or | |
| 33 possible debugger agent on win32. */ | |
| 34 public static String getOS() throws UnsupportedPlatformException { | |
| 35 String os = System.getProperty("os.name"); | |
| 36 if (os.equals("SunOS")) { | |
| 37 return "solaris"; | |
| 38 } else if (os.equals("Linux")) { | |
| 39 return "linux"; | |
| 3960 | 40 } else if (os.equals("FreeBSD")) { |
| 41 return "bsd"; | |
| 42 } else if (os.equals("NetBSD")) { | |
| 43 return "bsd"; | |
| 44 } else if (os.equals("OpenBSD")) { | |
| 45 return "bsd"; | |
|
5936
970cbbba54b0
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6
jmelvin
parents:
4006
diff
changeset
|
46 } else if (os.equals("Darwin") || os.contains("OS X")) { |
| 3960 | 47 return "bsd"; |
| 0 | 48 } else if (os.startsWith("Windows")) { |
| 49 return "win32"; | |
| 50 } else { | |
| 51 throw new UnsupportedPlatformException("Operating system " + os + " not yet supported"); | |
| 52 } | |
| 53 } | |
| 54 | |
|
5936
970cbbba54b0
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6
jmelvin
parents:
4006
diff
changeset
|
55 /* Returns "sparc" for SPARC based platforms and "x86" for x86 based |
|
970cbbba54b0
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6
jmelvin
parents:
4006
diff
changeset
|
56 platforms. Otherwise returns the value of os.arch. If the value |
|
970cbbba54b0
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6
jmelvin
parents:
4006
diff
changeset
|
57 is not recognized as supported, an exception is thrown instead. */ |
| 0 | 58 public static String getCPU() throws UnsupportedPlatformException { |
| 59 String cpu = System.getProperty("os.arch"); | |
|
5936
970cbbba54b0
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6
jmelvin
parents:
4006
diff
changeset
|
60 if (cpu.equals("i386") || cpu.equals("x86")) { |
| 0 | 61 return "x86"; |
|
5936
970cbbba54b0
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6
jmelvin
parents:
4006
diff
changeset
|
62 } else if (cpu.equals("sparc") || cpu.equals("sparcv9")) { |
|
970cbbba54b0
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6
jmelvin
parents:
4006
diff
changeset
|
63 return "sparc"; |
|
970cbbba54b0
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6
jmelvin
parents:
4006
diff
changeset
|
64 } else if (cpu.equals("ia64") || cpu.equals("amd64") || cpu.equals("x86_64")) { |
| 0 | 65 return cpu; |
| 66 } else { | |
| 67 throw new UnsupportedPlatformException("CPU type " + cpu + " not yet supported"); | |
| 68 } | |
| 69 } | |
| 70 | |
| 71 // this main is invoked from Makefile to make platform specific agent Makefile(s). | |
| 72 public static void main(String[] args) { | |
| 73 System.out.println(getOS()); | |
| 74 } | |
| 75 } |