# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1436135101 -7200
# Node ID 32434ca987d7bfd7e5e0836f8844ce5a38cbc412
# Parent  18480847a17b37167810c9c64e56d66f7377107a
fixed Windows build issues

diff -r 18480847a17b -r 32434ca987d7 mx.graal/mx_graal.py
--- a/mx.graal/mx_graal.py	Fri Jul 03 14:10:26 2015 +0200
+++ b/mx.graal/mx_graal.py	Mon Jul 06 00:25:01 2015 +0200
@@ -2349,7 +2349,7 @@
             return True
         if arcname.startswith('META-INF/jvmci.providers/'):
             provider = arcname[len('META-INF/jvmci.providers/'):]
-            for service in contents.split('\n'):
+            for service in contents.split(os.linesep):
                 self.jvmciServices.setdefault(service, []).append(provider)
             return True
         elif arcname.startswith('META-INF/jvmci.options/'):
diff -r 18480847a17b -r 32434ca987d7 mxtool/mx.py
--- a/mxtool/mx.py	Fri Jul 03 14:10:26 2015 +0200
+++ b/mxtool/mx.py	Mon Jul 06 00:25:01 2015 +0200
@@ -291,7 +291,7 @@
                             else:
                                 for f in files:
                                     arcname = join(relpath, f).replace(os.sep, '/')
-                                    with open(join(root, f), 'r') as fp:
+                                    with open(join(root, f), 'rb') as fp:
                                         contents = fp.read()
                                     if not self.archiveparticipant or not self.archiveparticipant.__add__(arcname, contents):
                                         arc.zf.writestr(arcname, contents)
diff -r 18480847a17b -r 32434ca987d7 src/share/vm/jvmci/jvmciCodeInstaller.cpp
--- a/src/share/vm/jvmci/jvmciCodeInstaller.cpp	Fri Jul 03 14:10:26 2015 +0200
+++ b/src/share/vm/jvmci/jvmciCodeInstaller.cpp	Mon Jul 06 00:25:01 2015 +0200
@@ -433,7 +433,7 @@
     methodHandle method = getMethodFromHotSpotMethod(HotSpotCompiledNmethod::method(compiled_code));
     jint entry_bci = HotSpotCompiledNmethod::entryBCI(compiled_code);
     jint id = HotSpotCompiledNmethod::id(compiled_code);
-    jboolean has_unsafe_access = HotSpotCompiledNmethod::hasUnsafeAccess(compiled_code);
+    bool has_unsafe_access = HotSpotCompiledNmethod::hasUnsafeAccess(compiled_code) == JNI_TRUE;
     JVMCIEnv* env = (JVMCIEnv*) (address) HotSpotCompiledNmethod::jvmciEnv(compiled_code);
     if (id == -1) {
       // Make sure a valid compile_id is associated with every compile
@@ -442,7 +442,7 @@
     result = JVMCIEnv::register_method(method, nm, entry_bci, &_offsets, _custom_stack_area_offset, &buffer,
                                        stack_slots, _debug_recorder->_oopmaps, &_exception_handler_table,
                                        JVMCICompiler::instance(), _debug_recorder, _dependencies, env, id,
-                                       (bool) has_unsafe_access, _has_wide_vector, installed_code, compiled_code, speculation_log);
+                                       has_unsafe_access, _has_wide_vector, installed_code, compiled_code, speculation_log);
     cb = nm;
   }