Mercurial > hg > graal-jvmci-8

comparison agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java @ 4006:436b4a3231bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7098194: integrate macosx-port changes Summary: Integrate bsd-port/hotspot and macosx-port/hotspot changes as of 2011.09.29. Reviewed-by: kvn, dholmes, never, phh Contributed-by: Christos Zoulas <christos@zoulas.com>, Greg Lewis <glewis@eyesbeyond.com>, Kurt Miller <kurt@intricatesoftware.com>, Alexander Strange <astrange@apple.com>, Mike Swingler <swingler@apple.com>, Roger Hoover <rhoover@apple.com>, Victor Hernandez <vhernandez@apple.com>, Pratik Solanki <psolanki@apple.com>
author dcubed
date Thu, 13 Oct 2011 09:35:42 -0700
parents f08d439fab8c
children 970cbbba54b0
comparison
equal deleted inserted replaced
4005:2ef3386478e6 4006:436b4a3231bf
41 return "bsd"; 41 return "bsd";
42 } else if (os.equals("NetBSD")) { 42 } else if (os.equals("NetBSD")) {
43 return "bsd"; 43 return "bsd";
44 } else if (os.equals("OpenBSD")) { 44 } else if (os.equals("OpenBSD")) {
45 return "bsd"; 45 return "bsd";
46 } else if (os.equals("Darwin")) { 46 } else if (os.equals("Darwin") || os.startsWith("Mac OS X")) {
47 return "bsd"; 47 return "bsd";
48 } else if (os.startsWith("Windows")) { 48 } else if (os.startsWith("Windows")) {
49 return "win32"; 49 return "win32";
50 } else { 50 } else {
51 throw new UnsupportedPlatformException("Operating system " + os + " not yet supported"); 51 throw new UnsupportedPlatformException("Operating system " + os + " not yet supported");