From b8c74ecc74acd19f6cd23301f4ff4546c62076db Mon Sep 17 00:00:00 2001 From: Morgan Davies Date: Fri, 15 Nov 2019 15:02:09 +0000 Subject: [PATCH] Set default load address for launchers on s390x Sets the load address of the launchers to 0x60000 on zlinux 64 systems. This enables compressed references with shift 0 for big heap sizes between 2040m and 4000m Signed-off-by: Morgan Davies --- jdk/make/CompileLaunchers.gmk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jdk/make/CompileLaunchers.gmk b/jdk/make/CompileLaunchers.gmk index 156446ac386..9847c94f8cd 100644 --- a/jdk/make/CompileLaunchers.gmk +++ b/jdk/make/CompileLaunchers.gmk @@ -93,6 +93,16 @@ define SetupLauncher endif $1_LDFLAGS := $3 + + ifeq ($(OPENJDK_TARGET_OS), linux) + # Set the image base address for zLinux 64 to 0x60000 for launchers, + # allows compressedRefsShift to be 0 when -Xmx is set to 2040m or more. + # / RTC PR 100052 + ifeq ($(OPENJDK_TARGET_CPU), s390x) + $1_LDFLAGS += -Wl,-Ttext-segment=0x60000 + endif + endif + $1_LDFLAGS_SUFFIX := ifeq ($(OPENJDK_TARGET_OS), macosx) $1_PLIST_FILE := Info-cmdline.plist