Skip to content

Commit 2ab179b

Browse files
author
René Schünemann
authored
Merge pull request #121 from SAP/pr-jdk-11+17
Merge to tag jdk-11+17
2 parents 39a399d + ab3010c commit 2ab179b

File tree

1,880 files changed

+182100
-26791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,880 files changed

+182100
-26791
lines changed

‎.hgtags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,3 +487,4 @@ e1e60f75cd39312a7f59d2a4f91d624e5aecc95e jdk-11+11
487487
758deedaae8406ae60147486107a54e9864aa7b0 jdk-11+13
488488
3595bd343b65f8c37818ebe6a4c343ddeb1a5f88 jdk-11+14
489489
a11c1cb542bbd1671d25b85efe7d09b983c48525 jdk-11+15
490+
02934b0d661b82b7fe1052a04998d2091352e08d jdk-11+16

‎make/BuildNashorn.gmk

Lines changed: 0 additions & 115 deletions
This file was deleted.

‎make/CompileJavaModules.gmk

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,10 @@ jdk.internal.le_COPY += .properties
325325

326326
################################################################################
327327

328+
jdk.internal.opt_COPY += .properties
329+
330+
################################################################################
331+
328332
jdk.jcmd_COPY += _options
329333

330334
################################################################################
@@ -341,6 +345,10 @@ jdk.jartool_ADD_JAVAC_FLAGS += -XDstringConcat=inline
341345

342346
################################################################################
343347

348+
jdk.scripting.nashorn_COPY := .properties .js
349+
350+
################################################################################
351+
344352
jdk.scripting.nashorn.shell_COPY += .js .properties
345353

346354
################################################################################
@@ -440,11 +448,13 @@ jdk.internal.vm.compiler_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
440448

441449
jdk.internal.vm.compiler_EXCLUDES += \
442450
jdk.internal.vm.compiler.collections.test \
451+
org.graalvm.compiler.processor \
443452
org.graalvm.compiler.core.match.processor \
444453
org.graalvm.compiler.nodeinfo.processor \
445454
org.graalvm.compiler.options.processor \
446455
org.graalvm.compiler.serviceprovider.processor \
447-
org.graalvm.compiler.replacements.verifier \
456+
org.graalvm.compiler.replacements.processor \
457+
org.graalvm.compiler.replacements.jdk9.test \
448458
org.graalvm.compiler.api.directives.test \
449459
org.graalvm.compiler.api.test \
450460
org.graalvm.compiler.asm.aarch64.test \
@@ -642,6 +652,12 @@ endif
642652

643653
################################################################################
644654

655+
ifeq ($(MODULE), jdk.scripting.nashorn)
656+
include CompileJavaModulesNashorn.gmk
657+
endif
658+
659+
################################################################################
660+
645661
$(eval $(call IncludeCustomExtension, CompileJavaModules-post.gmk))
646662

647663
################################################################################

‎make/CompileJavaModulesNashorn.gmk

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
#
2+
# Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
3+
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
#
5+
# This code is free software; you can redistribute it and/or modify it
6+
# under the terms of the GNU General Public License version 2 only, as
7+
# published by the Free Software Foundation. Oracle designates this
8+
# particular file as subject to the "Classpath" exception as provided
9+
# by Oracle in the LICENSE file that accompanied this code.
10+
#
11+
# This code is distributed in the hope that it will be useful, but WITHOUT
12+
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
# version 2 for more details (a copy is included in the LICENSE file that
15+
# accompanied this code).
16+
#
17+
# You should have received a copy of the GNU General Public License version
18+
# 2 along with this work; if not, write to the Free Software Foundation,
19+
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
#
21+
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
# or visit www.oracle.com if you need additional information or have any
23+
# questions.
24+
#
25+
26+
NASGEN_SRC := $(TOPDIR)/make/nashorn/buildtools/nasgen/src
27+
ASM_SRC := $(TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm
28+
29+
# Build nasgen
30+
$(eval $(call SetupJavaCompilation, BUILD_NASGEN, \
31+
SETUP := GENERATE_OLDBYTECODE, \
32+
SRC := $(NASGEN_SRC) $(ASM_SRC), \
33+
BIN := $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes, \
34+
))
35+
36+
NASHORN_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules/$(MODULE)
37+
NASGEN_RUN_FILE := $(NASHORN_CLASSES_DIR)/_the.nasgen.run
38+
39+
NASGEN_OPTIONS := \
40+
-cp $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
41+
--patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
42+
--add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \
43+
--add-exports java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED \
44+
#
45+
46+
# Run nasgen to modify classes in jdk.nashorn.internal.objects package
47+
$(NASGEN_RUN_FILE): $(BUILD_NASGEN) $($(MODULE))
48+
$(ECHO) Running nasgen
49+
$(JAVA_SMALL) $(NASGEN_OPTIONS) \
50+
jdk.nashorn.internal.tools.nasgen.Main $(@D) \
51+
jdk.nashorn.internal.objects $(@D)
52+
$(TOUCH) $@
53+
54+
TARGETS += $(NASGEN_RUN_FILE)

‎make/CompileToolsHotspot.gmk

Lines changed: 8 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -47,34 +47,8 @@ ifeq ($(INCLUDE_GRAAL), true)
4747
$(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_MATCH_PROCESSOR, \
4848
SETUP := GENERATE_OLDBYTECODE, \
4949
SRC := \
50-
$(SRC_DIR)/jdk.internal.vm.compiler.word/src \
51-
$(SRC_DIR)/jdk.internal.vm.compiler.collections/src \
52-
$(SRC_DIR)/org.graalvm.compiler.core/src \
53-
$(SRC_DIR)/org.graalvm.compiler.core.common/src \
50+
$(SRC_DIR)/org.graalvm.compiler.processor/src \
5451
$(SRC_DIR)/org.graalvm.compiler.core.match.processor/src \
55-
$(SRC_DIR)/org.graalvm.compiler.api.replacements/src \
56-
$(SRC_DIR)/org.graalvm.compiler.asm/src \
57-
$(SRC_DIR)/org.graalvm.compiler.bytecode/src \
58-
$(SRC_DIR)/org.graalvm.compiler.code/src \
59-
$(SRC_DIR)/org.graalvm.compiler.debug/src \
60-
$(SRC_DIR)/org.graalvm.compiler.graph/src \
61-
$(SRC_DIR)/org.graalvm.compiler.lir/src \
62-
$(SRC_DIR)/org.graalvm.compiler.loop/src \
63-
$(SRC_DIR)/org.graalvm.compiler.loop.phases/src \
64-
$(SRC_DIR)/org.graalvm.compiler.nodeinfo/src \
65-
$(SRC_DIR)/org.graalvm.compiler.nodes/src \
66-
$(SRC_DIR)/org.graalvm.compiler.options/src \
67-
$(SRC_DIR)/org.graalvm.compiler.phases/src \
68-
$(SRC_DIR)/org.graalvm.compiler.phases.common/src \
69-
$(SRC_DIR)/org.graalvm.compiler.serviceprovider/src \
70-
$(SRC_DIR)/org.graalvm.compiler.virtual/src \
71-
$(SRC_DIR)/org.graalvm.graphio/src \
72-
$(SRC_DIR)/org.graalvm.util/src \
73-
$(VM_CI_SRC_DIR)/jdk.vm.ci.code/src \
74-
$(VM_CI_SRC_DIR)/jdk.vm.ci.common/src \
75-
$(VM_CI_SRC_DIR)/jdk.vm.ci.meta/src \
76-
$(VM_CI_SRC_DIR)/jdk.vm.ci.runtime/src \
77-
$(VM_CI_SRC_DIR)/jdk.vm.ci.services/src \
7852
, \
7953
EXCLUDE_FILES := $(EXCLUDE_FILES), \
8054
BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.match.processor, \
@@ -88,7 +62,7 @@ ifeq ($(INCLUDE_GRAAL), true)
8862
$(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_NODEINFO_PROCESSOR, \
8963
SETUP := GENERATE_OLDBYTECODE, \
9064
SRC := \
91-
$(SRC_DIR)/org.graalvm.compiler.nodeinfo/src \
65+
$(SRC_DIR)/org.graalvm.compiler.processor/src \
9266
$(SRC_DIR)/org.graalvm.compiler.nodeinfo.processor/src \
9367
, \
9468
BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.nodeinfo.processor, \
@@ -102,10 +76,8 @@ ifeq ($(INCLUDE_GRAAL), true)
10276
$(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_OPTIONS_PROCESSOR, \
10377
SETUP := GENERATE_OLDBYTECODE, \
10478
SRC := \
105-
$(SRC_DIR)/jdk.internal.vm.compiler.collections/src \
106-
$(SRC_DIR)/org.graalvm.compiler.options/src \
79+
$(SRC_DIR)/org.graalvm.compiler.processor/src \
10780
$(SRC_DIR)/org.graalvm.compiler.options.processor/src \
108-
$(SRC_DIR)/org.graalvm.util/src \
10981
, \
11082
BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.options.processor, \
11183
JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.options.processor.jar, \
@@ -115,44 +87,26 @@ ifeq ($(INCLUDE_GRAAL), true)
11587

11688
##############################################################################
11789

118-
$(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_REPLACEMENTS_VERIFIER, \
90+
$(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_REPLACEMENTS_PROCESSOR, \
11991
SETUP := GENERATE_OLDBYTECODE, \
12092
SRC := \
121-
$(SRC_DIR)/jdk.internal.vm.compiler.word/src \
122-
$(SRC_DIR)/jdk.internal.vm.compiler.collections/src \
123-
$(SRC_DIR)/org.graalvm.compiler.bytecode/src \
124-
$(SRC_DIR)/org.graalvm.compiler.replacements.verifier/src \
125-
$(SRC_DIR)/org.graalvm.compiler.api.replacements/src \
126-
$(SRC_DIR)/org.graalvm.compiler.code/src \
127-
$(SRC_DIR)/org.graalvm.compiler.core.common/src \
128-
$(SRC_DIR)/org.graalvm.compiler.debug/src \
129-
$(SRC_DIR)/org.graalvm.compiler.graph/src \
130-
$(SRC_DIR)/org.graalvm.compiler.nodeinfo/src \
131-
$(SRC_DIR)/org.graalvm.compiler.options/src \
132-
$(SRC_DIR)/org.graalvm.compiler.serviceprovider/src \
133-
$(SRC_DIR)/org.graalvm.graphio/src \
134-
$(SRC_DIR)/org.graalvm.util/src \
135-
$(VM_CI_SRC_DIR)/jdk.vm.ci.code/src \
136-
$(VM_CI_SRC_DIR)/jdk.vm.ci.common/src \
137-
$(VM_CI_SRC_DIR)/jdk.vm.ci.meta/src \
138-
$(VM_CI_SRC_DIR)/jdk.vm.ci.runtime/src \
139-
$(VM_CI_SRC_DIR)/jdk.vm.ci.services/src \
93+
$(SRC_DIR)/org.graalvm.compiler.processor/src \
94+
$(SRC_DIR)/org.graalvm.compiler.replacements.processor/src \
14095
, \
14196
EXCLUDE_FILES := $(EXCLUDE_FILES), \
14297
BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier, \
14398
JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier.jar, \
14499
))
145100

146-
TARGETS += $(BUILD_VM_COMPILER_REPLACEMENTS_VERIFIER)
101+
TARGETS += $(BUILD_VM_COMPILER_REPLACEMENTS_PROCESSOR)
147102

148103
##############################################################################
149104

150105
$(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_SERVICEPROVIDER_PROCESSOR, \
151106
SETUP := GENERATE_OLDBYTECODE, \
152107
SRC := \
153-
$(SRC_DIR)/org.graalvm.compiler.serviceprovider/src \
108+
$(SRC_DIR)/org.graalvm.compiler.processor/src \
154109
$(SRC_DIR)/org.graalvm.compiler.serviceprovider.processor/src \
155-
$(VM_CI_SRC_DIR)/jdk.vm.ci.services/src \
156110
, \
157111
EXCLUDE_FILES := $(EXCLUDE_FILES), \
158112
BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.serviceprovider.processor, \

‎make/Main.gmk

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,10 @@ ALL_TARGETS += buildtools-langtools interim-langtools \
9898
################################################################################
9999
# Special targets for certain modules
100100

101-
unpack-sec:
102-
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UnpackSecurity.gmk)
103-
104101
generate-exported-symbols:
105102
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildStatic.gmk)
106103

107-
ALL_TARGETS += unpack-sec generate-exported-symbols
104+
ALL_TARGETS += generate-exported-symbols
108105

109106
################################################################################
110107
# Gensrc targets, generating source before java compilation can be done
@@ -189,7 +186,7 @@ $(foreach m, $(IMPORT_COPY_MODULES), $(eval $(call DeclareImportCopyRecipe,$m)))
189186
ALL_TARGETS += $(ALL_COPY_TARGETS)
190187

191188
################################################################################
192-
# Targets for compiling all java modules. Nashorn is treated separately.
189+
# Targets for compiling all java modules.
193190
JAVA_MODULES := $(ALL_MODULES)
194191
JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES))
195192

@@ -199,14 +196,7 @@ define DeclareCompileJavaRecipe
199196
-f CompileJavaModules.gmk MODULE=$1)
200197
endef
201198

202-
$(foreach m, $(filter-out jdk.scripting.nashorn, $(JAVA_MODULES)), \
203-
$(eval $(call DeclareCompileJavaRecipe,$m)))
204-
205-
# Build nashorn. Needs to be compiled separately from the rest of the modules
206-
# due to nasgen.
207-
jdk.scripting.nashorn-java:
208-
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
209-
-f BuildNashorn.gmk compile)
199+
$(foreach m, $(JAVA_MODULES), $(eval $(call DeclareCompileJavaRecipe,$m)))
210200

211201
ALL_TARGETS += $(JAVA_TARGETS)
212202

@@ -700,9 +690,6 @@ else
700690
# file to be processed by the gensrc-moduleinfo target.
701691
jdk.internal.vm.compiler-gensrc-moduleinfo: jdk.internal.vm.compiler-gensrc-src
702692

703-
# Explicitly add dependencies for special targets
704-
java.base-java: unpack-sec
705-
706693
jdk.jdeps-gendata: java rmic
707694

708695
# The ct.sym generation uses all the moduleinfos as input

0 commit comments

Comments
 (0)