From 70e8b7685dff9c5c33ce1edb552f0b643ca4a3c2 Mon Sep 17 00:00:00 2001
From: Bob Vandette <bobv@openjdk.org>
Date: Thu, 9 Feb 2017 15:24:38 -0500
Subject: [PATCH] 8172670: AOT Platform Support for Windows and Mac OS X x64

Reviewed-by: mchung, alanb
---
 .../java.base/unix/classes/module-info.java.extra    |  4 +---
 .../java.base/windows/classes/module-info.java.extra | 12 +++++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/jdk/src/java.base/unix/classes/module-info.java.extra b/jdk/src/java.base/unix/classes/module-info.java.extra
index 43f85b0309a..a19a37a55cb 100644
--- a/jdk/src/java.base/unix/classes/module-info.java.extra
+++ b/jdk/src/java.base/unix/classes/module-info.java.extra
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,5 +32,3 @@ opens com.sun.crypto.provider to jdk.vm.compiler;
 
 exports jdk.internal.module to jdk.vm.compiler;
 
-// AOT uses jdk.internal.misc.Unsafe
-exports jdk.internal.misc to jdk.aot;
diff --git a/jdk/src/java.base/windows/classes/module-info.java.extra b/jdk/src/java.base/windows/classes/module-info.java.extra
index 1e4a3a6ccb9..d967971708f 100644
--- a/jdk/src/java.base/windows/classes/module-info.java.extra
+++ b/jdk/src/java.base/windows/classes/module-info.java.extra
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,3 +26,13 @@
 exports sun.security.rsa to jdk.crypto.mscapi;
 exports sun.security.internal.spec to jdk.crypto.mscapi;
 exports sun.security.util to jdk.crypto.mscapi;
+
+// jdk.vm.compiler uses Unsafe and VM classes from jdk.internal.misc
+exports jdk.internal.misc to jdk.vm.compiler;
+opens   jdk.internal.misc to jdk.vm.compiler;
+
+// jdk.vm.compiler uses com.sun.crypto.provider to generate crypto intrinsics
+opens com.sun.crypto.provider to jdk.vm.compiler;
+
+exports jdk.internal.module to jdk.vm.compiler;
+