# HG changeset patch
# User asaha
# Date 1386568766 28800
# Node ID 100ddcb2119f56c9b3c7a38a3edc3cc288cf02bd
# Parent  57e8ab42b57e7f27b18fc9b2d5d9d4067585894d# Parent  e254e5940c195e75343f5187f6e60eaba476c0c5
Merge

diff -r 57e8ab42b57e -r 100ddcb2119f src/share/vm/classfile/classFileParser.cpp
diff -r 57e8ab42b57e -r 100ddcb2119f src/share/vm/runtime/os.cpp
--- a/src/share/vm/runtime/os.cpp	Sun Dec 08 20:15:15 2013 -0800
+++ b/src/share/vm/runtime/os.cpp	Sun Dec 08 21:59:26 2013 -0800
@@ -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;