Mercurial > hg > truffle
comparison src/share/vm/runtime/os.cpp @ 4006:436b4a3231bf
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 | 04b9a2566eec 7ab5f6318694 |
comparison
equal
deleted
inserted
replaced
4005:2ef3386478e6 | 4006:436b4a3231bf |
---|---|
1093 "%/lib/rt.jar:" | 1093 "%/lib/rt.jar:" |
1094 "%/lib/sunrsasign.jar:" | 1094 "%/lib/sunrsasign.jar:" |
1095 "%/lib/jsse.jar:" | 1095 "%/lib/jsse.jar:" |
1096 "%/lib/jce.jar:" | 1096 "%/lib/jce.jar:" |
1097 "%/lib/charsets.jar:" | 1097 "%/lib/charsets.jar:" |
1098 #ifdef __APPLE__ | |
1099 "%/lib/JObjC.jar:" | |
1100 #endif | |
1098 "%/classes"; | 1101 "%/classes"; |
1099 char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); | 1102 char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); |
1100 if (sysclasspath == NULL) return false; | 1103 if (sysclasspath == NULL) return false; |
1101 Arguments::set_sysclasspath(sysclasspath); | 1104 Arguments::set_sysclasspath(sysclasspath); |
1102 | 1105 |