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.

Sign up for GitHub

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

Set default load address for launchers on s390x #232

Merged
merged 1 commit into from
Nov 18, 2019
+15 −0
Merged

Set default load address for launchers on s390x #232

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions make/launcher/LauncherCommon.gmk
View file
Open in desktop
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