Skip to content

Commit 7ecd49e

Browse files
vsebevsebe
committed
Add support for windows platforms
Signed-off-by: Violeta Sebe <[email protected]>
1 parent 0251de1 commit 7ecd49e

File tree

8 files changed

+100
-59
lines changed

8 files changed

+100
-59
lines changed

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/.project
2+
/build
3+
/omr
4+
/openj9
5+

‎closed/OpenJ9.gmk

+46-19
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,19 @@ OPENJ9_REDIRECTOR := redirector/$(LIBRARY_PREFIX)jvm$(SHARED_LIBRARY_SUFFIX)
5555
#openjdk makeflags don't work with openj9/omr native compiles; override with number of cpus which openj9 and omr need supplied
5656
override MAKEFLAGS := -j $(JOBS)
5757

58+
ifeq ($(OPENJDK_TARGET_OS),windows)
59+
# set Visual Studio environment
60+
EXPORT_MSVS_ENV_VARS := PATH="$(PATH)" INCLUDE="$(INCLUDE)" LIB="$(LIB)"
61+
# disable mingw on windows, use default c compiler
62+
EXPORT_NO_USE_MINGW := NO_USE_MINGW=true
63+
# set the output directory for shared libraries
64+
OPENJ9_LIBS_OUTPUT_DIR := bin
65+
else
66+
EXPORT_MSVS_ENV_VARS :=
67+
EXPORT_NO_USE_MINGW :=
68+
OPENJ9_LIBS_OUTPUT_DIR := lib$(OPENJDK_TARGET_CPU_LIBDIR)
69+
endif
70+
5871
.PHONY : \
5972
build-j9 \
6073
clean-j9 \
@@ -72,20 +85,20 @@ override MAKEFLAGS := -j $(JOBS)
7285
# param 2 = The jdk/jre directory to add openj9 content
7386
define generated_target_rules
7487
.PHONY : stage_openj9_$1
75-
$(foreach file,$(OPENJ9_SHARED_LIBRARIES),$(eval $(call openj9_copy_file,$2/lib$(OPENJDK_TARGET_CPU_LIBDIR)/compressedrefs/$(file),$(OUTPUT_ROOT)/vm/$(file))))
76-
$(foreach file,$(OPENJ9_ALT_SHARED_LIBRARIES),$(eval $(call openj9_copy_file,$2/lib$(OPENJDK_TARGET_CPU_LIBDIR)/compressedrefs/$(notdir $(file)),$(OUTPUT_ROOT)/vm/$(file))))
77-
$(foreach file,$(OPENJ9_VM_FILES) $(OPENJ9_PROPERTY_FILES),$(eval $(call openj9_copy_file,$2/lib$(OPENJDK_TARGET_CPU_LIBDIR)/compressedrefs/$(file),$(OUTPUT_ROOT)/vm/$(file))))
88+
$(foreach file,$(OPENJ9_SHARED_LIBRARIES),$(eval $(call openj9_copy_file,$2/$(OPENJ9_LIBS_OUTPUT_DIR)/compressedrefs/$(file),$(OUTPUT_ROOT)/vm/$(file))))
89+
$(foreach file,$(OPENJ9_ALT_SHARED_LIBRARIES),$(eval $(call openj9_copy_file,$2/$(OPENJ9_LIBS_OUTPUT_DIR)/compressedrefs/$(notdir $(file)),$(OUTPUT_ROOT)/vm/$(file))))
90+
$(foreach file,$(OPENJ9_VM_FILES) $(OPENJ9_PROPERTY_FILES),$(eval $(call openj9_copy_file,$2/$(OPENJ9_LIBS_OUTPUT_DIR)/compressedrefs/$(file),$(OUTPUT_ROOT)/vm/$(file))))
7891
$(foreach file,$(OPENJ9_LIB_FILES),$(eval $(call openj9_copy_file,$2/lib/$(file),$(OUTPUT_ROOT)/vm/$(file))))
7992
$(foreach file,$(OPENJ9_NOTICE_FILES),$(eval $(call openj9_copy_file,$2/$(file),$(SRC_ROOT)/$(file))))
80-
$(foreach file,$(OPENJ9_REDIRECTOR),$(eval $(call openj9_copy_file,$2/lib$(OPENJDK_TARGET_CPU_LIBDIR)/j9vm/$(LIBRARY_PREFIX)jvm$(SHARED_LIBRARY_SUFFIX),$(OUTPUT_ROOT)/vm/$(file))))
93+
$(foreach file,$(OPENJ9_REDIRECTOR),$(eval $(call openj9_copy_file,$2/$(OPENJ9_LIBS_OUTPUT_DIR)/j9vm/$(LIBRARY_PREFIX)jvm$(SHARED_LIBRARY_SUFFIX),$(OUTPUT_ROOT)/vm/$(file))))
8194
$(eval $(call openj9_set_classlib_props,$2/lib,$(OUTPUT_ROOT)/vm))
82-
stage_openj9_shared_libraries_$1 := $(addprefix $2/lib$(OPENJDK_TARGET_CPU_LIBDIR)/compressedrefs/,$(OPENJ9_SHARED_LIBRARIES))
83-
stage_openj9_alt_shared_libraries_$1 := $(addprefix $2/lib$(OPENJDK_TARGET_CPU_LIBDIR)/compressedrefs/,$(notdir $(OPENJ9_ALT_SHARED_LIBRARIES)))
95+
stage_openj9_shared_libraries_$1 := $(addprefix $2/$(OPENJ9_LIBS_OUTPUT_DIR)/compressedrefs/,$(OPENJ9_SHARED_LIBRARIES))
96+
stage_openj9_alt_shared_libraries_$1 := $(addprefix $2/$(OPENJ9_LIBS_OUTPUT_DIR)/compressedrefs/,$(notdir $(OPENJ9_ALT_SHARED_LIBRARIES)))
8497
stage_openj9_lib_files_$1 := $(addprefix $2/lib/,$(OPENJ9_LIB_FILES))
8598
stage_openj9_notice_files_$1 := $(addprefix $2/,$(OPENJ9_NOTICE_FILES))
86-
stage_openj9_vm_files_$1 := $(addprefix $2/lib$(OPENJDK_TARGET_CPU_LIBDIR)/compressedrefs/,$(OPENJ9_VM_FILES))
87-
stage_openj9_property_files_$1 := $(addprefix $2/lib$(OPENJDK_TARGET_CPU_LIBDIR)/compressedrefs/,$(OPENJ9_PROPERTY_FILES))
88-
stage_openj9_redirector_$1 := $2/lib$(OPENJDK_TARGET_CPU_LIBDIR)/j9vm/$(LIBRARY_PREFIX)jvm$(SHARED_LIBRARY_SUFFIX)
99+
stage_openj9_vm_files_$1 := $(addprefix $2/$(OPENJ9_LIBS_OUTPUT_DIR)/compressedrefs/,$(OPENJ9_VM_FILES))
100+
stage_openj9_property_files_$1 := $(addprefix $2/$(OPENJ9_LIBS_OUTPUT_DIR)/compressedrefs/,$(OPENJ9_PROPERTY_FILES))
101+
stage_openj9_redirector_$1 := $2/$(OPENJ9_LIBS_OUTPUT_DIR)/j9vm/$(LIBRARY_PREFIX)jvm$(SHARED_LIBRARY_SUFFIX)
89102
stage_openj9_classlib_props_$1 := $2/lib/classlib.properties
90103
stage_openj9_$1 : \
91104
$$(stage_openj9_shared_libraries_$1) \
@@ -238,11 +251,11 @@ run-preprocessors-j9 : stage-j9 \
238251
$(OUTPUT_ROOT)/vm/compiler/jit.version \
239252
$(OUTPUT_ROOT)/vm/util/openj9_version_info.h
240253
@$(ECHO) Running OpenJ9 preprocessors with OPENJ9_BUILDSPEC: $(OPENJ9_BUILDSPEC)
241-
(export BOOT_JDK=$(BOOT_JDK) \
254+
(export BOOT_JDK=$(BOOT_JDK) $(EXPORT_MSVS_ENV_VARS) \
242255
&& cd $(OUTPUT_ROOT)/vm \
243256
&& $(MAKE) $(MAKEFLAGS) -f buildtools.mk \
244257
BUILD_ID=$(BUILD_ID) \
245-
FREEMARKER_JAR=$(FREEMARKER_JAR) \
258+
FREEMARKER_JAR="$(FREEMARKER_JAR)" \
246259
J9VM_SHA=$(OPENJ9_SHA) \
247260
JAVA_VERSION=80 \
248261
VERSION_MAJOR=8 \
@@ -258,7 +271,10 @@ run-preprocessors-j9 : stage-j9 \
258271

259272
build-j9 : run-preprocessors-j9
260273
@$(ECHO) Compiling OpenJ9 in $(OUTPUT_ROOT)/vm
261-
(export OMR_DIR=$(OUTPUT_ROOT)/vm/omr OPENJ9_BUILD=true && cd $(OUTPUT_ROOT)/vm && $(MAKE) $(MAKEFLAGS) JAVA_VERSION=80 VERSION_MAJOR=8 all)
274+
(export OPENJ9_BUILD=true $(EXPORT_NO_USE_MINGW) $(EXPORT_MSVS_ENV_VARS) \
275+
&& cd $(OUTPUT_ROOT)/vm \
276+
&& $(MAKE) $(MAKEFLAGS) JAVA_VERSION=80 VERSION_MAJOR=8 all \
277+
)
262278
@$(ECHO) OpenJ9 compile complete
263279
# jvm and jsig are required for compiling other java.base support natives
264280
@$(MKDIR) -p $(OUTPUT_ROOT)/support/modules_libs/java.base/server/
@@ -276,31 +292,42 @@ J9JCL_SOURCES_DONEFILE := $(JDK_OUTPUTDIR)/j9jcl_sources/j9jcl_sources.done
276292
recur_wildcard = $(foreach dir,$(wildcard $1/*),$(call recur_wildcard,$(dir),$2) $(filter $(subst *,%,$2),$(dir)))
277293
AllJclSource = $(call recur_wildcard,$(OPENJ9_TOPDIR)/jcl/src,*.java)
278294

295+
# FixPath
296+
# On Windows, convert unix path to windows path,
297+
# on other platforms leave it unchanged
298+
# ----------------------
299+
# param 1 = The path to convert
300+
FixPath = $(if $(findstring windows, $(OPENJDK_TARGET_OS)),$(shell $(CYGPATH) -m $1),$1)
301+
302+
JPP_BASE_DIR := $(call FixPath,$(OPENJ9_TOPDIR))
303+
JPP_DEST := $(call FixPath,$(JDK_OUTPUTDIR)/j9jcl_sources/jdk/src/share/classes)
304+
JPP_JAR := $(call FixPath,$(OUTPUT_ROOT)/vm/sourcetools/lib/jpp.jar)
305+
279306
$(J9JCL_SOURCES_DONEFILE) : $(AllJclSource)
280307
@$(ECHO) Generating J9JCL sources
281308
@$(MKDIR) -p $(JDK_OUTPUTDIR)/j9jcl_sources/jdk/src/share/classes
282-
@$(BOOT_JDK)/bin/java \
283-
-cp $(OUTPUT_ROOT)/vm/sourcetools/lib/jpp.jar \
309+
$(BOOT_JDK)/bin/java \
310+
-cp "$(JPP_JAR)" \
284311
-Dfile.encoding=US-ASCII \
285312
com.ibm.jpp.commandline.CommandlineBuilder \
286313
-verdict \
287-
-baseDir $(OPENJ9_TOPDIR)/ \
314+
-baseDir "$(JPP_BASE_DIR)/" \
288315
-config SIDECAR18-SE-OPENJ9 \
289316
-srcRoot jcl/ \
290317
-xml jpp_configuration.xml \
291-
-dest $(JDK_OUTPUTDIR)/j9jcl_sources/jdk/src/share/classes \
318+
-dest "$(JPP_DEST)" \
292319
-macro:define "com.ibm.oti.vm.library.version=29" \
293320
-tag:define "PLATFORM-$(OPENJ9_PLATFORM_CODE)"
294321
@$(BOOT_JDK)/bin/java \
295-
-cp $(OUTPUT_ROOT)/vm/sourcetools/lib/jpp.jar \
322+
-cp "$(JPP_JAR)" \
296323
-Dfile.encoding=US-ASCII \
297324
com.ibm.jpp.commandline.CommandlineBuilder \
298325
-verdict \
299-
-baseDir $(OPENJ9_TOPDIR)/ \
326+
-baseDir "$(JPP_BASE_DIR)/" \
300327
-config SIDECAR18-TOOLS-OPENJ9 \
301328
-srcRoot jcl/ \
302329
-xml jpp_configuration.xml \
303-
-dest $(JDK_OUTPUTDIR)/j9jcl_sources/jdk/src/share/classes \
330+
-dest "$(JPP_DEST)" \
304331
-macro:define "com.ibm.oti.vm.library.version=29" \
305332
-tag:define "PLATFORM-$(OPENJ9_PLATFORM_CODE)"
306333
@$(MKDIR) -p $(@D)

‎closed/make/Main.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ clean-j9vm:
3030
j9vm-build :
3131
+($(CD) $(SRC_ROOT)/closed && $(MAKE) -f OpenJ9.gmk SPEC=$(SPEC) build-j9)
3232

33-
j9vm-compose-buildjvm : j9vm-build $(J9JCL_GENSRC_MAKEFILE)
33+
j9vm-compose-buildjvm : j9vm-build
3434
+($(CD) $(SRC_ROOT)/closed && $(MAKE) -f OpenJ9.gmk SPEC=$(SPEC) stage_openj9_build_jdk)
3535

3636
product-images : openj9-jdk-image openj9-jre-image

‎common/autoconf/generated-configure.sh

+2-14
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,6 @@ infodir
989989
docdir
990990
oldincludedir
991991
includedir
992-
runstatedir
993992
localstatedir
994993
sharedstatedir
995994
sysconfdir
@@ -1145,7 +1144,6 @@ datadir='${datarootdir}'
11451144
sysconfdir='${prefix}/etc'
11461145
sharedstatedir='${prefix}/com'
11471146
localstatedir='${prefix}/var'
1148-
runstatedir='${localstatedir}/run'
11491147
includedir='${prefix}/include'
11501148
oldincludedir='/usr/include'
11511149
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1398,15 +1396,6 @@ do
13981396
| -silent | --silent | --silen | --sile | --sil)
13991397
silent=yes ;;
14001398

1401-
-runstatedir | --runstatedir | --runstatedi | --runstated \
1402-
| --runstate | --runstat | --runsta | --runst | --runs \
1403-
| --run | --ru | --r)
1404-
ac_prev=runstatedir ;;
1405-
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1406-
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1407-
| --run=* | --ru=* | --r=*)
1408-
runstatedir=$ac_optarg ;;
1409-
14101399
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
14111400
ac_prev=sbindir ;;
14121401
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1544,7 +1533,7 @@ fi
15441533
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
15451534
datadir sysconfdir sharedstatedir localstatedir includedir \
15461535
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1547-
libdir localedir mandir runstatedir
1536+
libdir localedir mandir
15481537
do
15491538
eval ac_val=\$$ac_var
15501539
# Remove trailing slashes.
@@ -1697,7 +1686,6 @@ Fine tuning of the installation directories:
16971686
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
16981687
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
16991688
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1700-
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
17011689
--libdir=DIR object code libraries [EPREFIX/lib]
17021690
--includedir=DIR C header files [PREFIX/include]
17031691
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -3924,7 +3912,7 @@ fi
39243912
#CUSTOM_AUTOCONF_INCLUDE
39253913

39263914
# Do not change or remove the following line, it is needed for consistency checks:
3927-
DATE_WHEN_GENERATED=1512638435
3915+
DATE_WHEN_GENERATED=1513206870
39283916

39293917
###############################################################################
39303918
#

‎jdk/make/CreateJars.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents: $(BUILD_TOOLS) $(IMAGES_OU
286286
($(CD) $(JDK_OUTPUTDIR)/classes && \
287287
$(TOOL_JARREORDER) \
288288
-o [email protected] $(IMAGES_OUTPUTDIR)/lib/classlist $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude . )
289-
$(MV) [email protected] $@
289+
$(SED) 's/\r//g' [email protected] > $@
290290

291291
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents
292292
$(MKDIR) -p $(@D)

‎jdk/make/closed/autoconf/custom-hook.m4

+20-4
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,14 @@ AC_DEFUN_ONCE([OPENJ9_PLATFORM_SETUP],
110110
OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_${OPENJ9_CPU}_cmprssptrs"
111111
112112
if test "x$OPENJ9_CPU" = xx86-64; then
113-
OPENJ9_PLATFORM_CODE=xa64
113+
if test "x$OPENJDK_BUILD_OS" = xlinux; then
114+
OPENJ9_PLATFORM_CODE=xa64
115+
elif test "x$OPENJDK_BUILD_OS" = xwindows; then
116+
OPENJ9_PLATFORM_CODE=wa64
117+
OPENJ9_BUILDSPEC="win_x86-64_cmprssptrs"
118+
else
119+
AC_MSG_ERROR([Unsupported OpenJ9 platform ${OPENJDK_BUILD_OS}!])
120+
fi
114121
elif test "x$OPENJ9_CPU" = xppc-64_le; then
115122
OPENJ9_PLATFORM_CODE=xl64
116123
OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_ppc-64_cmprssptrs_le_gcc"
@@ -119,7 +126,7 @@ AC_DEFUN_ONCE([OPENJ9_PLATFORM_SETUP],
119126
elif test "x$OPENJ9_CPU" = xppc-64; then
120127
OPENJ9_PLATFORM_CODE=ap64
121128
else
122-
AC_MSG_ERROR([Unsupported OpenJ9 cpu ${OPENJ9_CPU}, contact support team!])
129+
AC_MSG_ERROR([Unsupported OpenJ9 cpu ${OPENJ9_CPU}!])
123130
fi
124131
125132
AC_SUBST(OPENJ9_BUILDSPEC)
@@ -159,14 +166,23 @@ AC_DEFUN_ONCE([OPENJ9_THIRD_PARTY_REQUIREMENTS],
159166
AC_MSG_ERROR([Cannot continue])
160167
fi
161168
162-
FREEMARKER_JAR=$with_freemarker_jar
169+
if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
170+
FREEMARKER_JAR=`$CYGPATH -m "$with_freemarker_jar"`
171+
else
172+
FREEMARKER_JAR=$with_freemarker_jar
173+
fi
174+
163175
AC_SUBST(FREEMARKER_JAR)
164176
])
165177

166178
AC_DEFUN_ONCE([CUSTOM_LATE_HOOK],
167179
[
168180
# Add the J9VM vm lib directory into native LDFLAGS_JDKLIB path
169-
LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/../vm"
181+
if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
182+
LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -libpath:${JDK_OUTPUTDIR}/../vm/lib"
183+
else
184+
LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/../vm"
185+
fi
170186
171187
CLOSED_AUTOCONF_DIR="$SRC_ROOT/jdk/make/closed/autoconf"
172188

‎jdk/make/closed/autoconf/generated-configure.sh

+21-17
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,6 @@ infodir
10001000
docdir
10011001
oldincludedir
10021002
includedir
1003-
runstatedir
10041003
localstatedir
10051004
sharedstatedir
10061005
sysconfdir
@@ -1160,7 +1159,6 @@ datadir='${datarootdir}'
11601159
sysconfdir='${prefix}/etc'
11611160
sharedstatedir='${prefix}/com'
11621161
localstatedir='${prefix}/var'
1163-
runstatedir='${localstatedir}/run'
11641162
includedir='${prefix}/include'
11651163
oldincludedir='/usr/include'
11661164
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1413,15 +1411,6 @@ do
14131411
| -silent | --silent | --silen | --sile | --sil)
14141412
silent=yes ;;
14151413

1416-
-runstatedir | --runstatedir | --runstatedi | --runstated \
1417-
| --runstate | --runstat | --runsta | --runst | --runs \
1418-
| --run | --ru | --r)
1419-
ac_prev=runstatedir ;;
1420-
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1421-
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1422-
| --run=* | --ru=* | --r=*)
1423-
runstatedir=$ac_optarg ;;
1424-
14251414
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
14261415
ac_prev=sbindir ;;
14271416
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1559,7 +1548,7 @@ fi
15591548
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
15601549
datadir sysconfdir sharedstatedir localstatedir includedir \
15611550
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1562-
libdir localedir mandir runstatedir
1551+
libdir localedir mandir
15631552
do
15641553
eval ac_val=\$$ac_var
15651554
# Remove trailing slashes.
@@ -1712,7 +1701,6 @@ Fine tuning of the installation directories:
17121701
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
17131702
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
17141703
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1715-
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
17161704
--libdir=DIR object code libraries [EPREFIX/lib]
17171705
--includedir=DIR C header files [PREFIX/include]
17181706
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -3976,7 +3964,7 @@ fi
39763964

39773965

39783966
# Do not change or remove the following line, it is needed for consistency checks:
3979-
DATE_WHEN_GENERATED=1512638435
3967+
DATE_WHEN_GENERATED=1513206870
39803968

39813969
###############################################################################
39823970
#
@@ -8249,7 +8237,14 @@ $as_echo "$DEBUG_LEVEL" >&6; }
82498237
OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_${OPENJ9_CPU}_cmprssptrs"
82508238

82518239
if test "x$OPENJ9_CPU" = xx86-64; then
8252-
OPENJ9_PLATFORM_CODE=xa64
8240+
if test "x$OPENJDK_BUILD_OS" = xlinux; then
8241+
OPENJ9_PLATFORM_CODE=xa64
8242+
elif test "x$OPENJDK_BUILD_OS" = xwindows; then
8243+
OPENJ9_PLATFORM_CODE=wa64
8244+
OPENJ9_BUILDSPEC="win_x86-64_cmprssptrs"
8245+
else
8246+
as_fn_error $? "Unsupported OpenJ9 platform ${OPENJDK_BUILD_OS}!" "$LINENO" 5
8247+
fi
82538248
elif test "x$OPENJ9_CPU" = xppc-64_le; then
82548249
OPENJ9_PLATFORM_CODE=xl64
82558250
OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_ppc-64_cmprssptrs_le_gcc"
@@ -8299,7 +8294,12 @@ $as_echo "$as_me: Could not find freemarker.jar" >&6;}
82998294
as_fn_error $? "Cannot continue" "$LINENO" 5
83008295
fi
83018296

8302-
FREEMARKER_JAR=$with_freemarker_jar
8297+
if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
8298+
FREEMARKER_JAR=`$CYGPATH -m "$with_freemarker_jar"`
8299+
else
8300+
FREEMARKER_JAR=$with_freemarker_jar
8301+
fi
8302+
83038303

83048304

83058305

@@ -36813,7 +36813,11 @@ $as_echo "$OUTPUT_DIR_IS_LOCAL" >&6; }
3681336813
# At the end, call the custom hook. (Dummy macro if no custom sources available)
3681436814

3681536815
# Add the J9VM vm lib directory into native LDFLAGS_JDKLIB path
36816-
LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/../vm"
36816+
if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
36817+
LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -libpath:${JDK_OUTPUTDIR}/../vm/lib"
36818+
else
36819+
LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/../vm"
36820+
fi
3681736821

3681836822
CLOSED_AUTOCONF_DIR="$SRC_ROOT/jdk/make/closed/autoconf"
3681936823

‎jdk/src/windows/bin/amd64/jvm.cfg

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
#
3-
#
2+
# (c) Copyright IBM Corp. 2003, 2017 All Rights Reserved
3+
#
44
# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
55
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
66
#
@@ -34,5 +34,6 @@
3434
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
3535
# and may not be available in a future release.
3636
#
37-
-server KNOWN
37+
-j9vm KNOWN
38+
-server IGNORE
3839
-client IGNORE

0 commit comments

Comments
 (0)