Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/os.cpp @ 4970:33df1aeaebbf
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 27 Feb 2012 13:10:13 +0100 |
parents | 04b9a2566eec 94ec88ca68e2 |
children | 957c266d8bc5 |
line wrap: on
line diff
--- a/src/share/vm/runtime/os.cpp Fri Feb 24 18:30:42 2012 -0800 +++ b/src/share/vm/runtime/os.cpp Mon Feb 27 13:10:13 2012 +0100 @@ -82,6 +82,12 @@ julong os::free_bytes = 0; // # of bytes freed #endif +void os_init_globals() { + // Called from init_globals(). + // See Threads::create_vm() in thread.cpp, and init.cpp. + os::init_globals(); +} + // Fill in buffer with current local time as an ISO-8601 string. // E.g., yyyy-mm-ddThh:mm:ss-zzzz. // Returns buffer, or NULL if it failed. @@ -1095,6 +1101,7 @@ "%/lib/jsse.jar:" "%/lib/jce.jar:" "%/lib/charsets.jar:" + "%/lib/jfr.jar:" #ifdef __APPLE__ "%/lib/JObjC.jar:" #endif