diff options
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 6 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 5c7f3ba9afc8..578c51f0b0cc 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -52,12 +52,10 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/client/jvm.dll", "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll", - "/bin/jrockit/jvm.dll", - "/bin/server/jvm.dll" // needed by Azul + "/bin/jrockit/jvm.dll" #elif defined UNX #ifdef MACOSX - "/../../../../../Frameworks/JavaVM.framework/JavaVM", //as of 1.6.0_22 - "/lib/server/libjvm.dylib" // needed by Azul + "/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22 #else "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx index 183075e0c9af..b68152e80906 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx @@ -40,6 +40,7 @@ VendorSupportMapEntry const gVendorMap[] ={ VENDOR_MAP_ENTRY<SunInfo>("Oracle Corporation"), VENDOR_MAP_ENTRY<SunInfo>("AdoptOpenJdk"), VENDOR_MAP_ENTRY<SunInfo>("Amazon.com Inc."), + VENDOR_MAP_ENTRY<SunInfo>("Azul Systems, Inc."), #ifndef MACOSX VENDOR_MAP_ENTRY<OtherInfo>("IBM Corporation"), VENDOR_MAP_ENTRY<OtherInfo>("Blackdown Java-Linux Team"), @@ -47,7 +48,6 @@ VendorSupportMapEntry const gVendorMap[] ={ VENDOR_MAP_ENTRY<GnuInfo>("Free Software Foundation, Inc."), VENDOR_MAP_ENTRY<OtherInfo>("The FreeBSD Foundation"), #endif - VENDOR_MAP_ENTRY<OtherInfo>("Azul Systems, Inc."), {nullptr, nullptr, nullptr} }; } |