# HG changeset patch
# User kevinw
# Date 1379573266 -7200
# Node ID 6eb908998b3277b184368bf7d1d642e4ebe09fac
# Parent  dfae98867ee8a951997aa47a9a6d19c75744142a# Parent  8c84f04ff977f33286f66dd5b2a0e69f17e87c19
Merge

diff -r 8c84f04ff977 -r 6eb908998b32 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Wed Sep 18 19:50:44 2013 +0200
+++ b/src/share/vm/runtime/arguments.cpp	Thu Sep 19 08:47:46 2013 +0200
@@ -2409,21 +2409,6 @@
     return result;
   }
 
-  if (AggressiveOpts) {
-    // Insert alt-rt.jar between user-specified bootclasspath
-    // prefix and the default bootclasspath.  os::set_boot_path()
-    // uses meta_index_dir as the default bootclasspath directory.
-    const char* altclasses_jar = "alt-rt.jar";
-    size_t altclasses_path_len = strlen(get_meta_index_dir()) + 1 +
-                                 strlen(altclasses_jar);
-    char* altclasses_path = NEW_C_HEAP_ARRAY(char, altclasses_path_len, mtInternal);
-    strcpy(altclasses_path, get_meta_index_dir());
-    strcat(altclasses_path, altclasses_jar);
-    scp.add_suffix_to_prefix(altclasses_path);
-    scp_assembly_required = true;
-    FREE_C_HEAP_ARRAY(char, altclasses_path, mtInternal);
-  }
-
   // Parse _JAVA_OPTIONS environment variable (if present) (mimics classic VM)
   result = parse_java_options_environment_variable(&scp, &scp_assembly_required);
   if (result != JNI_OK) {