Skip to content

Commit

Permalink
Set default load address for launchers on s390x
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
Morgan Davies authored and Morgan Davies committed Nov 15, 2019
1 parent 3cc03bc commit 7d417b0
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions make/launcher/LauncherCommon.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
# questions.
#

# ===========================================================================
# (c) Copyright IBM Corp. 2019, 2019 All Rights Reserved
# ===========================================================================
#

include JdkNativeCompilation.gmk

ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,/../lib/jli)
Expand Down Expand Up @@ -93,6 +98,16 @@ JAVA_MANIFEST := $(TOPDIR)/src/java.base/windows/native/launcher/java.manifest
SetupBuildLauncher = $(NamedParamsMacroTemplate)
define SetupBuildLauncherBody
# Setup default values (unless overridden)

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

ifeq ($$($1_OPTIMIZATION), )
$1_OPTIMIZATION := LOW
endif
Expand Down

0 comments on commit 7d417b0

Please sign in to comment.