Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge lworld #255

Closed
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
790d6e2
8255533: Incorrect javadoc in DateTimeFormatterBuilder.appendPattern(…
naotoj Oct 28, 2020
edd1988
8255530: Additional cleanup after JDK-8235710 (elliptic curve removal)
magicus Oct 28, 2020
a7595b2
8250669: Running JMH micros is broken after JDK-8248135
cl4es Oct 28, 2020
1a5e6c9
8253101: Clean up CallStaticJavaNode EA flags
Oct 28, 2020
d82a6dc
8255438: [Vector API] More instructs in x86.ad should use legacy mode…
DamonFool Oct 28, 2020
7e305ad
8255405: sun/net/ftp/imp/FtpClient uses SimpleDateFormat in not threa…
iignatev Oct 28, 2020
a5b42ec
8233570: [TESTBUG] HTMLEditorKit test bug5043626.java is failing on m…
prsadhuk Oct 29, 2020
caec8d2
8233560: [TESTBUG] ToolTipManager/Test6256140.java is failing on macos
prsadhuk Oct 29, 2020
4031cb4
8254189: Improve comments for StackOverFlow and fix in_xxx() functions
tstuefe Oct 29, 2020
38574d5
8255298: Remove SurvivorAlignmentInBytes functionality
Oct 29, 2020
ea26ff1
8247614: java/nio/channels/DatagramChannel/Connect.java timed out
c-cleary Oct 29, 2020
72ff8e2
8254782: Fix benchmark issues in java/lang/StringIndexOfChar.java ben…
Oct 29, 2020
4b20e46
8255579: x86: Use cmpq(Register,Address) in safepoint_poll
shipilev Oct 29, 2020
579e50b
8255564: InterpreterMacroAssembler::remove_activation() needs to rest…
zhengyu123 Oct 29, 2020
faf23de
8255534: Shenandoah: Fix CmpP optimization wrt native-LRB
rkennke Oct 29, 2020
5b18558
8255243: Reinforce escape barrier interactions with ZGC conc stack pr…
fisk Oct 29, 2020
9e5bbff
8255550: x86: Assembler::cmpq(Address dst, Register src) encoding is …
shipilev Oct 29, 2020
2b18bce
8255600: [lworld] C2 compilation fails with assert: modified node was…
TobiHartmann Oct 29, 2020
5c520c3
8255232: G1: Make G1BiasedMappedArray freeable
Oct 29, 2020
2a50c3f
8241495: Make more compiler related flags available on a per method l…
Oct 29, 2020
2a2fa13
8255449: Improve the exception message of MethodHandles::permuteArgum…
JornVernee Oct 29, 2020
d5138d1
8255604: java/nio/channels/DatagramChannel/Connect.java fails with ja…
c-cleary Oct 29, 2020
5782a2a
8254975: lambda proxy fails to access a protected member inherited fr…
Oct 29, 2020
56eb5f5
8255466: C2 crashes at ciObject::get_oop() const+0x0
Oct 29, 2020
1a89d68
8255285: Move JVMFlag origins into a new enum JVMFlagOrigin
iklam Oct 30, 2020
379ba80
8255595: delay_to_keep_mmu passes wrong arguments to Monitor wait
Oct 30, 2020
d128191
8253473: Javadoc clean up in HttpHandler, HttpPrincipal, HttpContext,…
pconcannon Oct 30, 2020
2c7fc85
8254972: Fix pretouch chunk calculations
Oct 30, 2020
e48016b
8255565: [Vector API] Add missing format strings for extract instruct…
DamonFool Oct 30, 2020
8a065ef
8255005: Fix indentation levels in classFileParser.cpp
Oct 30, 2020
f77a658
8153005: Upgrade the default PKCS12 encryption/MAC algorithms
wangweij Oct 30, 2020
a756320
8255536: Remove the directsign property and option
wangweij Oct 30, 2020
3fd8216
8255612: Explicitly disable dtrace for Oracle OpenJDK Linux builds
erikj79 Oct 30, 2020
9b1eebc
8255620: Build race between modulegraphs and exploded-image-optimize …
erikj79 Oct 30, 2020
8600d0d
8255614: Shenandoah: Consolidate/streamline runtime LRBs
rkennke Oct 30, 2020
d086757
8254052: improve type specificity of TagletWriter and friends
jonathan-gibbons Oct 30, 2020
4158567
8255455: Pre-generate ThreadHeapSampler::_log_table
cl4es Oct 30, 2020
98a69ed
8255690: &nbsp in StringBuilder.subSequence
Oct 30, 2020
0f48603
8214561: Use {@systemProperty} for definition of "java.util.prefs.Pre…
Oct 30, 2020
36c150b
8255489: Unify the parsing of @lambda-proxy and @lambda-form-invokers…
calvinccheung Oct 30, 2020
9d5c9cc
8254309: appcds GCDuringDump.java failed - class must exist
yminqi Oct 31, 2020
80380d5
8255494: PKCS7 should use digest algorithm to verify the signature
wangweij Oct 31, 2020
7597cba
8143021: [TEST_BUG] Test javax/swing/JColorChooser/Test6541987.java f…
prsadhuk Oct 31, 2020
cacce84
8169954: JFileChooser/8021253: java.lang.RuntimeException: Default bu…
prsadhuk Oct 31, 2020
fe7672b
8196099: javax/swing/text/CSSBorder/6796710/bug6796710.java fails
mrserb Oct 31, 2020
f61ce32
8255576: (fs) Files.isHidden() throws ArrayIndexOutOfBoundsException …
sormuras Nov 1, 2020
4c4b8f4
8196302: javax/swing/JFileChooser/8041694/bug8041694.java
prsadhuk Nov 1, 2020
518ff51
8233569: [TESTBUG] JTextComponent test bug6361367.java fails on macos
prsadhuk Nov 1, 2020
64feeab
8255603: Memory/Performance regression after JDK-8210985
RealCLanger Nov 1, 2020
25a3ae8
8255727: [lworld] Withdraw support for @java.lang.ValueBased
Nov 2, 2020
d05df7c
8236842: Surprising 'multiple elements' behaviour from getTypeElement…
Nov 2, 2020
69f5235
8255596: Mutex safepoint checking options and flags should be scoped …
Nov 2, 2020
e97809d
8233641: [TESTBUG] JMenuItem test bug4171437.java fails on macos
prsadhuk Nov 2, 2020
98c91b6
8233637: [TESTBUG] Swing ActionListenerCalledTwiceTest.java fails on …
prsadhuk Nov 2, 2020
79a010f
8255697: LogTargetHandle::print should check if log level is enabled
cl4es Nov 2, 2020
1dbcefc
GitHub actions ignore main project branches
Nov 2, 2020
a133d8f
GH workflow syntax
Nov 2, 2020
eb66418
7124397: [macosx] JSpinner serialiazation - deserialization issue
mrserb Nov 2, 2020
ceab9f3
6816284: Notepad class should be public
mrserb Nov 2, 2020
54c8813
8255734: VM should ignore SIGXFSZ on ppc64, s390 too
tstuefe Nov 2, 2020
3302d3a
8255544: Create a checked cast
Nov 2, 2020
4b775e6
8255721: Remove no-op clean_weak_method_links methods
cl4es Nov 2, 2020
120aec7
8255720: Optimize bci_to_dp/-data by enabling iteration over raw Data…
cl4es Nov 2, 2020
d2812f7
8254072: AArch64: Get rid of --disable-warnings-as-errors on Windows+…
lewurm Nov 2, 2020
1019581
8255691: Shenandoah: Invoke native-LRB only on non-strong refs
rkennke Nov 2, 2020
4c66b15
8255235: ZGC: Allocate and initialize forwarding data structures in p…
pliden Nov 2, 2020
b028074
8255673: Wrong version in docs bundles
erikj79 Nov 2, 2020
1769c48
8255471: ZGC: Rework root iterators and closures
stefank Nov 2, 2020
a3aad11
8255400: Shenandoah: C2 failures after JDK-8255000
rwestrel Nov 2, 2020
0e19ded
8255401: Shenandoah: Allow oldval and newval registers to overlap in …
rkennke Nov 2, 2020
2f7d34f
8255616: Disable AOT and Graal in Oracle OpenJDK
Nov 2, 2020
6dac8d2
8255671: Bidi.reorderVisually has misleading exception messages
naotoj Nov 2, 2020
3e89f72
8255237: ZGC: Bulk free garbage pages during relocation set selection
pliden Nov 2, 2020
d93e3a7
8255760: Shenandoah: match constants style in ShenandoahMarkTask fall…
shipilev Nov 2, 2020
05bcd67
8255529: Remove unused methods from java.util.zip.ZipFile
Nov 2, 2020
bc6085b
8255578: [JVMCI] be more careful about reflective reads of Class.comp…
Nov 2, 2020
acb5f65
8211958: Broken links in java.desktop files
mrserb Nov 2, 2020
a250716
8255694: memory leak in JDWP debug agent after calling JVMTI GetAllTh…
plummercj Nov 2, 2020
ceba2f8
8255696: JDWP debug agent's canSuspendResumeThreadLists() should be r…
plummercj Nov 2, 2020
bee864f
8255766: Fix linux+arm64 build after 8254072
lewurm Nov 2, 2020
c774741
8255695: Some JVMTI calls in the jdwp debug agent are using FUNC_PTR …
plummercj Nov 2, 2020
184db64
8255732: OpenJDK fails to build if $A is set to a value with spaces
erikj79 Nov 2, 2020
f97ec35
8255785: X11 libraries should not be required by configure for headle…
magicus Nov 3, 2020
50357d1
8254723: add diagnostic command to write Linux perf map file
nick-arm Nov 3, 2020
fe4e6b3
8196089: javax/swing/Action/8133039/bug8133039.java fails
prsadhuk Nov 3, 2020
9beb866
8233561: [TESTBUG] Swing text test bug8014863.java fails on macos
jayathirthrao Nov 3, 2020
f0eeca9
8255718: Zero: VM should know it runs in interpreter-only mode
shipilev Nov 3, 2020
6d36b4b
8255743: Relax SIGFPE match in in runtime/ErrorHandling/SecondaryErro…
shipilev Nov 3, 2020
e7a2d5c
8252533: Signal handlers should run with synchronous error signals un…
tstuefe Nov 3, 2020
1580574
8255672: Replace PhaseTransform::eqv by pointer equality check
TobiHartmann Nov 3, 2020
aa2862a
8255741: Zero: print signal name in unhandled signal handler
shipilev Nov 3, 2020
c96a914
8255662: ZGC: Unify nmethod closures in the heap iterator
stefank Nov 3, 2020
9a36747
8255780: Remove unused overloads of VMError::report_and_die()
tstuefe Nov 3, 2020
4107670
8233562: [TESTBUG] Swing StyledEditorKit test bug4506788.java fails o…
jayathirthrao Nov 3, 2020
36998b0
8255716: AArch64: Regression: JVM crashes if manually offline a core
Nov 3, 2020
9bd836e
8255744: Zero: handle JVM_CONSTANT_DynamicInError
shipilev Nov 3, 2020
904561e
8255719: Zero: on return path, check for pending exception before att…
shipilev Nov 3, 2020
9a0cf58
8255615: Zero: demote ZeroStack::abi_stack_available guarantee to assert
shipilev Nov 3, 2020
1d0bd50
8254758: Change G1ServiceThread to be task based
kstefanj Nov 3, 2020
b8d4e02
8255374: Add a dropReturn MethodHandle combinator
JornVernee Nov 3, 2020
63461d5
8255072: [TESTBUG] com/sun/jdi/EATests.java should not fail if expect…
reinrich Nov 3, 2020
93ef009
8255762: Shenandoah: Consolidate/streamline interpreter LRBs
rkennke Nov 3, 2020
f389a71
8255737: Zero: DO_UPDATE_INSTRUCTION_COUNT should only update when re…
shipilev Nov 3, 2020
364b0fe
8255801: Race when building ct.sym build tools
magicus Nov 3, 2020
64a9811
8255798: Remove dead headless code in CompileJavaModules.gmk
magicus Nov 3, 2020
d47336b
8248320: Provide a unique accessible name for <nav role="navigation">
jonathan-gibbons Nov 3, 2020
ca216ba
8255810: Zero: build fails without JVMTI
shipilev Nov 3, 2020
134e22a
8255606: Enable concurrent stack processing on x86_32 platforms
zhengyu123 Nov 3, 2020
83f3cf4
8196087: java/awt/image/DrawImage/IncorrectUnmanagedImageRotatedClip.…
mrserb Nov 3, 2020
f64a15d
8254315: Shenandoah: Concurrent weak reference processing
rkennke Nov 3, 2020
88ee973
8254827: JVMCI: Enable it for Windows+AArch64
lewurm Nov 3, 2020
6606e09
8255380: (zipfs) ZipFileSystem::readExtra can fail if zipinfo-time is…
Nov 3, 2020
b46d73b
8255239: The timezone of the hs_err_pid log file is corrupted in Japa…
calvinccheung Nov 3, 2020
450452b
8254876: (fs) NullPointerException not thrown when first argument to …
Nov 3, 2020
eab99f3
8255852: Shenandoah: Fix incorrect copyright header in new files adde…
rkennke Nov 3, 2020
cdf9cd8
8255784: appcds/javaldr/ExceptionDuringDumpAtObjectsInitPhase.java te…
yminqi Nov 3, 2020
622f72b
8255853: Update all nroff manpages for JDK 16 release
magicus Nov 3, 2020
76fa974
8255850: Hotspot recompiled on first incremental build
erikj79 Nov 3, 2020
2668d23
8255861: Also update jaotc.1 for JDK 16
magicus Nov 3, 2020
4b88119
8253037: G1: Improve check for string dedup
Nov 4, 2020
a5d8a9c
8255617: Zero: purge the remaining bytecode interpreter profiling sup…
shipilev Nov 4, 2020
c7a2c24
8255797: ciReplay: improve documentation of replay file syntax in parser
Nov 4, 2020
ab9192e
8255681: print callstack in error case in runAWTLoopWithApp
MBaesken Nov 4, 2020
6023f6b
8188055: (ref) Add Reference::refersTo predicate
Nov 4, 2020
724217c
8255893: Problemlist runtime/cds/appcds/jigsaw/NewModuleFinderTest.java
JesperIRL Nov 4, 2020
7f4d873
8255215: Unsupported 'valign' attribute for 'tr' tag used in j.s.t.h.…
prsadhuk Nov 4, 2020
61c9247
8255895: Submit workflow artifacts miss hs_errs/replays due to ZIP in…
shipilev Nov 4, 2020
7dcaba6
8253892: Disable misleading-indentation on clang as well as gcc
magicus Nov 4, 2020
c287170
8254742: InputStream::readNBytes(int) result may contain zeros not in…
Nov 4, 2020
5348298
8255855: appcds/jigsaw/NewModuleFinderTest.java test failed due to un…
calvinccheung Nov 4, 2020
2da9981
8255862: Remove @SuppressWarnings from sun.misc.Unsafe
Nov 4, 2020
94ace03
8255863: Clean up test/jdk/java/lang/invoke/defineHiddenClass/BasicTe…
Nov 4, 2020
160759c
8255838: Use 32-bit immediate movslq in macro assembler if 64-bit val…
JornVernee Nov 4, 2020
804bd72
8255128: linux x86 build failure with libJNIPoint.c
JornVernee Nov 4, 2020
26e7ef7
8252870: Finalize (remove "incubator" from) jpackage
Nov 4, 2020
29db1dc
8255886: Shenandoah: Resolve cset address truncation and register cla…
rkennke Nov 4, 2020
a0ade22
8255900: x86: Reduce impact when VerifyOops is disabled
cl4es Nov 4, 2020
a833bd8
Merge jdk
Nov 9, 2020
a89530d
Merge branch 'lworld' into type-restrictions_merge_lworld_16_23
MrSimms Nov 9, 2020
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
@@ -4,6 +4,9 @@ on:
push:
branches-ignore:
- master
- lworld
- type-restrictions
- jep390
workflow_dispatch:
inputs:
platforms:
@@ -362,8 +365,8 @@ jobs:
"$HOME/linux-x64${{ matrix.artifact }}_testsupport_${{ env.logsuffix }}.zip"
.
-i *.jtr
-i hs_err*
-i replay*
-i */hs_err*.log
-i */replay*.log
continue-on-error: true

- name: Persist test results
@@ -679,8 +682,8 @@ jobs:
"$HOME/windows-x64${{ matrix.artifact }}_testsupport_${{ env.logsuffix }}.zip"
.
-i *.jtr
-i hs_err*
-i replay*
-i */hs_err*.log
-i */replay*.log
continue-on-error: true

- name: Persist test results
@@ -961,8 +964,8 @@ jobs:
"$HOME/macos-x64${{ matrix.artifact }}_testsupport_${{ env.logsuffix }}.zip"
.
-i *.jtr
-i hs_err*
-i replay*
-i */hs_err*.log
-i */replay*.log
continue-on-error: true

- name: Persist test results
@@ -184,10 +184,6 @@ ifeq ($(call isTargetOs, windows), true)
java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk
endif

ifdef BUILD_HEADLESS_ONLY
java.desktop_EXCLUDES += sun/applet
endif

ifeq ($(call isTargetOs, windows macosx), false)
java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java
endif
@@ -389,11 +385,11 @@ endif

################################################################################

jdk.incubator.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst \
jdk.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst \
.postrm .postinst .list .sh .desktop .copyright .control .plist .template \
.icns .scpt .wxs .wxl .wxi .ico .bmp .tiff

jdk.incubator.jpackage_CLEAN += .properties
jdk.jpackage_CLEAN += .properties

################################################################################

@@ -338,7 +338,7 @@ $(eval $(call SetupTarget, test-image-demos-jdk, \

$(eval $(call SetupTarget, generate-summary, \
MAKEFILE := GenerateModuleSummary, \
DEPS := jmods buildtools-modules, \
DEPS := jmods buildtools-modules runnable-buildjdk, \
))

################################################################################
@@ -468,7 +468,7 @@ $(eval $(call SetupTarget, docs-jdk-api-javadoc, \
$(eval $(call SetupTarget, docs-jdk-api-modulegraph, \
MAKEFILE := Docs, \
TARGET := docs-jdk-api-modulegraph, \
DEPS := buildtools-modules, \
DEPS := buildtools-modules runnable-buildjdk, \
))

$(eval $(call SetupTarget, docs-javase-api-javadoc, \
@@ -479,7 +479,7 @@ $(eval $(call SetupTarget, docs-javase-api-javadoc, \
$(eval $(call SetupTarget, docs-javase-api-modulegraph, \
MAKEFILE := Docs, \
TARGET := docs-javase-api-modulegraph, \
DEPS := buildtools-modules, \
DEPS := buildtools-modules runnable-buildjdk, \
))

$(eval $(call SetupTarget, docs-reference-api-javadoc, \
@@ -490,7 +490,7 @@ $(eval $(call SetupTarget, docs-reference-api-javadoc, \
$(eval $(call SetupTarget, docs-reference-api-modulegraph, \
MAKEFILE := Docs, \
TARGET := docs-reference-api-modulegraph, \
DEPS := buildtools-modules, \
DEPS := buildtools-modules runnable-buildjdk, \
))

# The gensrc steps for jdk.jdi create html spec files.
@@ -1083,6 +1083,18 @@ ifneq ($(COMPILE_TYPE), cross)
exploded-image: exploded-image-optimize
endif

# The runnable-buildjdk target guarantees that the buildjdk is done
# building and ready to be used. The exact set of dependencies it needs
# depends on what kind of buildjdk is used for the current configuration.
runnable-buildjdk:
ifeq ($(CREATE_BUILDJDK), true)
ifneq ($(CREATING_BUILDJDK), true)
runnable-buildjdk: create-buildjdk
endif
else ifeq ($(EXTERNAL_BUILDJDK), false)
runnable-buildjdk: exploded-image
endif

create-buildjdk: create-buildjdk-interim-image

docs-jdk-api: docs-jdk-api-javadoc
@@ -1186,7 +1198,7 @@ all-bundles: product-bundles test-bundles docs-bundles static-libs-bundles
ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
copy java libs static-libs launchers jmods \
jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \
exploded-image-base exploded-image \
exploded-image-base exploded-image runnable-buildjdk \
create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \
docs-javase docs-reference docs-javadoc mac-bundles product-images legacy-images \
docs-image docs-javase-image docs-reference-image all-docs-images \
@@ -663,16 +663,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
$1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -DARCH='\"$FLAGS_CPU_LEGACY\"' \
-D$FLAGS_CPU_LEGACY"
if test "x$FLAGS_CPU_BITS" = x64; then
# -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
# unpack200.exe.
if test "x$FLAGS_OS" = xlinux || test "x$FLAGS_OS" = xmacosx; then
$1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_LP64=1"
fi
if test "x$FLAGS_OS" != xaix; then
# xlc on AIX defines _LP64=1 by default and issues a warning if we redefine it.
$1_DEFINES_CPU_JVM="${$1_DEFINES_CPU_JVM} -D_LP64=1"
fi
if test "x$FLAGS_CPU_BITS" = x64 && test "x$FLAGS_OS" != xaix; then
# xlc on AIX defines _LP64=1 by default and issues a warning if we redefine it.
$1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_LP64=1"
$1_DEFINES_CPU_JVM="${$1_DEFINES_CPU_JVM} -D_LP64=1"
fi
# toolchain dependend, per-cpu
@@ -306,7 +306,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_GRAAL],
# Graal is only available where JVMCI is available since it requires JVMCI.
if test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
AC_MSG_RESULT([yes])
elif test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-aarch64"; then
elif test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU])
@@ -340,7 +340,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_JVMCI],
AC_MSG_CHECKING([if platform is supported by JVMCI])
if test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
AC_MSG_RESULT([yes])
elif test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-aarch64"; then
elif test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU])
@@ -43,9 +43,11 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
# No X11 support on windows or macosx
NEEDS_LIB_X11=false
elif test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
# No X11 support needed when building headless only
NEEDS_LIB_X11=false
else
# All other instances need X11, even if building headless only, libawt still
# needs X11 headers.
# All other instances need X11
NEEDS_LIB_X11=true
fi
@@ -759,7 +759,6 @@ TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@

# Build setup
ENABLE_AOT:=@ENABLE_AOT@
ENABLE_INTREE_EC:=@ENABLE_INTREE_EC@
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
@@ -311,9 +311,11 @@ define SetupJavaCompilationBody
ifneq ($$($1_KEEP_DUPS), true)
# Remove duplicate source files by keeping the first found of each duplicate.
# This allows for automatic overrides with custom or platform specific versions
# source files.
# source files. Need to call DoubleDollar as we have java classes with '$' in
# their names.
$1_SRCS := $$(strip $$(foreach s, $$($1_SRCS), \
$$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), $$(s))) \
$$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), \
$$(call DoubleDollar, $$(s)))) \
$$(if $$($1_$$(relative_src)), \
, \
$$(eval $1_$$(relative_src) := 1) $$(s))))
@@ -77,8 +77,10 @@ ifeq ($(STATIC_LIBS), true)
FindStaticLib =
endif

# Returns the module specific java header dir if it exists.
# Param 1 - module name
GetJavaHeaderDir = \
$(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1))
$(if $(strip $1),$(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1)))

# Process a dir description such as "java.base:headers" into a set of proper absolute paths.
ProcessDir = \
@@ -123,15 +125,27 @@ JDK_RCFLAGS=$(RCFLAGS) \
SetupJdkLibrary = $(NamedParamsMacroTemplate)
define SetupJdkLibraryBody
ifeq ($$($1_OUTPUT_DIR), )
$1_OUTPUT_DIR := $$(call FindLibDirForModule, $$(MODULE))
ifneq ($$(MODULE), )
$1_OUTPUT_DIR := $$(call FindLibDirForModule, $$(MODULE))
else
$$(error Must specify OUTPUT_DIR in a MODULE free context)
endif
endif

ifeq ($$($1_OBJECT_DIR), )
$1_OBJECT_DIR := $$(SUPPORT_OUTPUTDIR)/native/$$(MODULE)/lib$$($1_NAME)
ifneq ($$(MODULE), )
$1_OBJECT_DIR := $$(SUPPORT_OUTPUTDIR)/native/$$(MODULE)/lib$$($1_NAME)
else
$$(error Must specify OBJECT_DIR in a MODULE free context)
endif
endif

ifeq ($$($1_SRC), )
$1_SRC := $$(call FindSrcDirsForLib, $$(MODULE), $$($1_NAME))
ifneq ($$(MODULE), )
$1_SRC := $$(call FindSrcDirsForLib, $$(MODULE), $$($1_NAME))
else
$$(error Must specify SRC in a MODULE free context)
endif
else
$1_SRC := $$(foreach dir, $$($1_SRC), $$(call ProcessDir, $$(dir)))
endif
@@ -165,7 +179,8 @@ define SetupJdkLibraryBody
ifneq ($$($1_HEADERS_FROM_SRC), false)
$1_SRC_HEADER_FLAGS := $$(addprefix -I, $$(wildcard $$($1_SRC)))
endif
# Always add the java header dir

# Add the module specific java header dir
$1_SRC_HEADER_FLAGS += $$(addprefix -I, $$(call GetJavaHeaderDir, $$(MODULE)))

ifneq ($$($1_EXTRA_HEADER_DIRS), )
@@ -203,11 +218,19 @@ define SetupJdkExecutableBody
$1_TYPE := EXECUTABLE

ifeq ($$($1_OUTPUT_DIR), )
$1_OUTPUT_DIR := $$(call FindExecutableDirForModule, $$(MODULE))
ifneq ($$(MODULE), )
$1_OUTPUT_DIR := $$(call FindExecutableDirForModule, $$(MODULE))
else
$$(error Must specify OUTPUT_DIR in a MODULE free context)
endif
endif

ifeq ($$($1_OBJECT_DIR), )
$1_OBJECT_DIR := $$(SUPPORT_OUTPUTDIR)/native/$$(MODULE)/$$($1_NAME)
ifneq ($$(MODULE), )
$1_OBJECT_DIR := $$(SUPPORT_OUTPUTDIR)/native/$$(MODULE)/$$($1_NAME)
else
$$(error Must specify OBJECT_DIR in a MODULE free context)
endif
endif

ifeq ($$($1_VERSIONINFO_RESOURCE), )
@@ -125,7 +125,7 @@ endif

JRE_TOOL_MODULES += \
jdk.jdwp.agent \
jdk.incubator.jpackage \
jdk.jpackage \
#

################################################################################
@@ -145,7 +145,7 @@ DOCS_MODULES += \
jdk.editpad \
jdk.hotspot.agent \
jdk.httpserver \
jdk.incubator.jpackage \
jdk.jpackage \
jdk.incubator.vector \
jdk.jartool \
jdk.javadoc \
@@ -228,7 +228,7 @@ endif
# jpackage is only on windows, macosx, and linux

ifeq ($(call isTargetOs, windows macosx linux), false)
MODULES_FILTER += jdk.incubator.jpackage
MODULES_FILTER += jdk.jpackage
endif

################################################################################
@@ -251,6 +251,8 @@ var getJibProfilesCommon = function (input, data) {
configure_args: concat("--enable-jtreg-failure-handler",
"--with-exclude-translations=de,es,fr,it,ko,pt_BR,sv,ca,tr,cs,sk,ja_JP_A,ja_JP_HA,ja_JP_HI,ja_JP_I,zh_TW,zh_HK",
"--disable-manpages",
"--disable-jvm-feature-aot",
"--disable-jvm-feature-graal",
"--disable-jvm-feature-shenandoahgc",
versionArgs(input, common))
};
@@ -404,9 +406,9 @@ var getJibProfilesProfiles = function (input, common, data) {
"linux-x64": {
target_os: "linux",
target_cpu: "x64",
dependencies: ["devkit", "gtest", "graphviz", "pandoc", "graalunit_lib"],
dependencies: ["devkit", "gtest", "graphviz", "pandoc"],
configure_args: concat(common.configure_args_64bit,
"--with-zlib=system",
"--with-zlib=system", "--disable-dtrace",
(isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu",
"--build=x86_64-unknown-linux-gnu" ] : [])),
},
@@ -423,7 +425,7 @@ var getJibProfilesProfiles = function (input, common, data) {
"macosx-x64": {
target_os: "macosx",
target_cpu: "x64",
dependencies: ["devkit", "gtest", "pandoc", "graalunit_lib"],
dependencies: ["devkit", "gtest", "pandoc"],
configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
"--with-macosx-version-max=10.9.0",
// Use system SetFile instead of the one in the devkit as the
@@ -434,7 +436,7 @@ var getJibProfilesProfiles = function (input, common, data) {
"windows-x64": {
target_os: "windows",
target_cpu: "x64",
dependencies: ["devkit", "gtest", "pandoc", "graalunit_lib"],
dependencies: ["devkit", "gtest", "pandoc"],
configure_args: concat(common.configure_args_64bit),
},

@@ -454,8 +456,6 @@ var getJibProfilesProfiles = function (input, common, data) {
configure_args: [
"--openjdk-target=aarch64-linux-gnu",
"--disable-jvm-feature-jvmci",
"--disable-jvm-feature-graal",
"--disable-jvm-feature-aot",
],
},

@@ -687,11 +687,12 @@ var getJibProfilesProfiles = function (input, common, data) {
dependencies: [
"boot_jdk", "devkit", "graphviz", "pandoc", buildJdkDep,
],
configure_args: [
configure_args: concat(
"--enable-full-docs",
versionArgs(input, common),
"--with-build-jdk=" + input.get(buildJdkDep, "home_path")
+ (input.build_os == "macosx" ? "/Contents/Home" : "")
],
),
default_make_targets: ["all-docs-bundles"],
artifacts: {
doc_api_spec: {
@@ -1151,15 +1152,6 @@ var getJibProfilesDependencies = function (input, common) {
configure_args: "",
},

graalunit_lib: {
organization: common.organization,
ext: "zip",
revision: "619_Apr_12_2018",
module: "graalunit-lib",
configure_args: "--with-graalunit-lib=" + input.get("graalunit_lib", "install_path"),
environment_name: "GRAALUNIT_LIB"
},

gtest: {
organization: common.organization,
ext: "tar.gz",