Mercurial > hg > truffle
comparison src/share/vm/runtime/os.cpp @ 17524:89152779163c
Merge with jdk8-b132
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 15 Oct 2014 11:59:32 +0200 |
parents | 6adb14d2320c 6fa574bfd32a |
children | 52b4284cb496 |
comparison
equal
deleted
inserted
replaced
17450:45b45f902bed | 17524:89152779163c |
---|---|
1262 "%/lib/sunrsasign.jar:" | 1262 "%/lib/sunrsasign.jar:" |
1263 "%/lib/jsse.jar:" | 1263 "%/lib/jsse.jar:" |
1264 "%/lib/jce.jar:" | 1264 "%/lib/jce.jar:" |
1265 "%/lib/charsets.jar:" | 1265 "%/lib/charsets.jar:" |
1266 "%/lib/jfr.jar:" | 1266 "%/lib/jfr.jar:" |
1267 #ifdef __APPLE__ | |
1268 "%/lib/JObjC.jar:" | |
1269 #endif | |
1270 #ifdef GRAAL | 1267 #ifdef GRAAL |
1271 "%/lib/graal-loader.jar:" | 1268 "%/lib/graal-loader.jar:" |
1272 #endif | 1269 #endif |
1273 #ifndef NO_TRUFFLE_JAR | 1270 #ifndef NO_TRUFFLE_JAR |
1274 "%/lib/truffle.jar:" | 1271 "%/lib/truffle.jar:" |