# HG changeset patch
# User kizune
# Date 1386247049 -14400
# Node ID e254e5940c195e75343f5187f6e60eaba476c0c5
# Parent  0611ce949aaac26c17eed532a3efd53b95a9eff0# Parent  a3dc98dc4d21adda679b382ebaecebccea5ef136
Merge

diff -r a3dc98dc4d21 -r e254e5940c19 src/share/vm/classfile/classFileParser.cpp
diff -r a3dc98dc4d21 -r e254e5940c19 src/share/vm/runtime/os.cpp
--- a/src/share/vm/runtime/os.cpp	Wed Dec 04 23:11:03 2013 -0800
+++ b/src/share/vm/runtime/os.cpp	Thu Dec 05 16:37:29 2013 +0400
@@ -1264,9 +1264,6 @@
         "%/lib/jce.jar:"
         "%/lib/charsets.jar:"
         "%/lib/jfr.jar:"
-#ifdef __APPLE__
-        "%/lib/JObjC.jar:"
-#endif
         "%/classes";
     char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep);
     if (sysclasspath == NULL) return false;