archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Nils Eliasson 2015-11-06 11:34:03 +01:00
commit 3307d0f163
326 changed files with 9465 additions and 4610 deletions
Download patch file Download diff file Expand all files Collapse all files

27
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -3481,33 +3481,8 @@ jint Arguments::finalize_vm_init_args(SysClassPath* scp_p, bool scp_assembly_req
sprintf(path, "%s%slib%sendorsed", Arguments::get_java_home(), fileSep, fileSep);
#if INCLUDE_JVMCI
jint res = JVMCIRuntime::save_options(_system_properties);
if (res != JNI_OK) {
return res;
}
if (EnableJVMCI) {
// Append lib/jvmci/*.jar to boot class path
char jvmciDir[JVM_MAXPATHLEN];
const char* fileSep = os::file_separator();
jio_snprintf(jvmciDir, sizeof(jvmciDir), "%s%slib%sjvmci", Arguments::get_java_home(), fileSep, fileSep);
DIR* dir = os::opendir(jvmciDir);
if (dir != NULL) {
struct dirent *entry;
char *dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(jvmciDir), mtInternal);
while ((entry = os::readdir(dir, (dirent *) dbuf)) != NULL) {
const char* name = entry->d_name;
const char* ext = name + strlen(name) - 4;
if (ext > name && strcmp(ext, ".jar") == 0) {
char fileName[JVM_MAXPATHLEN];
jio_snprintf(fileName, sizeof(fileName), "%s%s%s", jvmciDir, fileSep, name);
scp_p->add_suffix(fileName);
scp_assembly_required = true;
}
}
FREE_C_HEAP_ARRAY(char, dbuf);
os::closedir(dir);
}
JVMCIRuntime::save_options(_system_properties);
}
#endif // INCLUDE_JVMCI