[GR-42125] Merge in jdk-11.0.18+2.

PullRequest: labsjdk-ce-11/321
graalvm · Nov 10, 2022 · c0e5522 · c0e5522
2 parents 6af5210 + 25ea0fd
commit c0e5522
Show file tree

Hide file tree

Showing 444 changed files with 12,340 additions and 4,027 deletions.
diff --git a/.jcheck/conf b/.jcheck/conf
@@ -1,7 +1,7 @@
 [general]
 project=jdk-updates
 jbs=JDK
-version=11.0.17
+version=11.0.18
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace

diff --git a/ci.jsonnet b/ci.jsonnet
@@ -263,7 +263,7 @@ local labsjdk_builder_version = "e9c60b5174490f2012c7c5d60a20aace93209a56";
     },
 
     # Downstream Graal branch to test against.
-    local downstream_branch = "master",
+    local downstream_branch = "cpu/graal-vm/22.3",
 
     local clone_graal = {
         run+: [

diff --git a/make/CreateJmods.gmk b/make/CreateJmods.gmk
@@ -173,6 +173,11 @@ else # not java.base
         JMOD_FLAGS += --exclude '$(notdir $(MSVCR_DLL))'
       endif
     endif
+    ifneq ($(VCRUNTIME_1_DLL), )
+      ifneq ($(wildcard $(LIBS_DIR)/$(notdir $(VCRUNTIME_1_DLL))), )
+        JMOD_FLAGS += --exclude '$(notdir $(VCRUNTIME_1_DLL))'
+      endif
+    endif
     ifneq ($(MSVCP_DLL), )
       ifneq ($(wildcard $(LIBS_DIR)/$(notdir $(MSVCP_DLL))), )
         JMOD_FLAGS += --exclude '$(notdir $(MSVCP_DLL))'