Skip to content

Commit dd43bdd

Browse files
committedNov 8, 2023
8319405: [s390] [jdk8] Increase javac default stack size for s390x zero
Reviewed-by: phh, sgehwolf
1 parent 8de4819 commit dd43bdd

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed
 

‎jdk/make/CompileLaunchers.gmk

+8-1
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,17 @@ $(eval $(call SetupLauncher,jar, \
281281
$(eval $(call SetupLauncher,jarsigner, \
282282
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.jarsigner.Main"$(COMMA) }'))
283283

284+
# On s390 zero, run javac with larger stack
285+
ifeq ($(OPENJDK_TARGET_CPU), s390x)
286+
JAVAC_ARGS := '{ "-J-ms8m"$(COMMA) "-J-Xss3m"$(COMMA) "com.sun.tools.javac.Main"$(COMMA) }'
287+
else
288+
JAVAC_ARGS := '{ "-J-ms8m"$(COMMA) "com.sun.tools.javac.Main"$(COMMA) }'
289+
endif
290+
284291
$(eval $(call SetupLauncher,javac, \
285292
-DEXPAND_CLASSPATH_WILDCARDS \
286293
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
287-
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javac.Main"$(COMMA) }'))
294+
-DJAVA_ARGS=$(JAVAC_ARGS)))
288295

289296
ifeq ($(ENABLE_SJAVAC), yes)
290297
$(eval $(call SetupLauncher,sjavac, \

0 commit comments

Comments
 (0)
Please sign in to comment.