# HG changeset patch
# User erikj
# Date 1539392548 -7200
# Node ID 1cad8c4161e3443227674631215a565179eeb49d
# Parent  007ce32735e38b0838cc9fc440f191a25353e774
Fixed windows as far as can be done.

diff -r 007ce32735e3 -r 1cad8c4161e3 make/RunTests.gmk
--- a/make/RunTests.gmk	Fri Oct 12 16:37:22 2018 -0700
+++ b/make/RunTests.gmk	Sat Oct 13 03:02:28 2018 +0200
@@ -124,11 +124,17 @@
   $1_AOT_LIB := $$($1_BIN)/$$(call SHARED_LIBRARY,$$($1_MODULE))
   $1_AOT_CCLIST := $$(wildcard $$(TOPDIR)/test/hotspot/jtreg/compiler/aot/scripts/$1-list.txt)
 
+  ifeq ($(OPENJDK_TARGET_OS), windows)
+    $1_LD := $$(addsuffix $$(EXE_SUFFIX), $$(filter-out $$(FIXPATH), $$(LD)))
+  else
+    $1_LD := $$(LD)
+  endif
+
   $1_JAOTC_OPTS := \
       -J-Xmx4g --info \
       $$(addprefix -J, $$($1_VM_OPTIONS)) \
       $$(addprefix --compile-commands, $$($1_AOT_CCLIST)) \
-      --linker-path $$(LD) \
+      --linker-path $$($1_LD) --verbose \
       #
 
   $$($1_AOT_LIB): $$(JDK_IMAGE_DIR)/release \
diff -r 007ce32735e3 -r 1cad8c4161e3 make/RunTestsPrebuilt.gmk
--- a/make/RunTestsPrebuilt.gmk	Fri Oct 12 16:37:22 2018 -0700
+++ b/make/RunTestsPrebuilt.gmk	Sat Oct 13 03:02:28 2018 +0200
@@ -95,12 +95,12 @@
 # $1: The output file name
 # $2..$N: The lines to output to the file
 define CreateNewSpec
-  $(if $(strip $(29)), \
+  $(if $(strip $(30)), \
     $(error Internal makefile error: \
       Too many arguments to macro, please update CreateNewSpec in RunTestsPrebuilt.gmk) \
   ) \
   $(shell $(RM) $1) \
-  $(foreach i, $(call sequence, 2, 28), \
+  $(foreach i, $(call sequence, 2, 29), \
     $(if $(strip $($i)), \
       $(call AppendFile, $(strip $($i)), $1) \
     ) \
@@ -241,19 +241,23 @@
     LD := $(DEVKIT_HOME)/VC/bin/x64/link
     LIBRARY_PREFIX :=
     SHARED_LIBRARY_SUFFIX := .dll
+    EXE_SUFFIX := .exe
   else ifeq ($(OPENJDK_TARGET_OS), linux)
     LD := $(DEVKIT_HOME)/bin/ld
     LIBRARY_PREFIX := lib
     SHARED_LIBRARY_SUFFIX := .so
+    EXE_SUFFIX :=
   else ifeq ($(OPENJDK_TARGET_OS), macosx)
     LD := $(DEVKIT_HOME)/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
     LIBRARY_PREFIX := lib
     SHARED_LIBRARY_SUFFIX := .dylib
+    EXE_SUFFIX :=
   else ifeq ($(OPENJDK_TARGET_OS), solaris)
     # Prefer system linker for AOT on Solaris.
     LD := ld
     LIBRARY_PREFIX := lib
     SHARED_LIBRARY_SUFFIX := .so
+    EXE_SUFFIX :=
   endif
 else
   LD := ld
@@ -297,6 +301,7 @@
     LD := $(LD), \
     LIBRARY_PREFIX := $(LIBRARY_PREFIX), \
     SHARED_LIBRARY_SUFFIX := $(SHARED_LIBRARY_SUFFIX), \
+    EXE_SUFFIX := $(EXE_SUFFIX), \
     include $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk, \
     $(CUSTOM_NEW_SPEC_LINE), \
 )