# HG changeset patch
# User chegar
# Date 1382360889 -3600
# Node ID 6795fcebbf421944dd30a90b067199d3b77c41c1
# Parent  6fa574bfd32ac559142d046606390354e68e4960# Parent  e39b138b2518cd7c880637fee2b18c349995e8e4
Merge

diff -r e39b138b2518 -r 6795fcebbf42 src/share/vm/classfile/classFileParser.cpp
diff -r e39b138b2518 -r 6795fcebbf42 src/share/vm/runtime/os.cpp
--- a/src/share/vm/runtime/os.cpp	Sat Oct 19 18:32:34 2013 -0400
+++ b/src/share/vm/runtime/os.cpp	Mon Oct 21 14:08:09 2013 +0100
@@ -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;