Merge pull request ibmruntimes#348 from M-Davies/zlinux

Set default load address for launchers on s390x
a7ehuo · Nov 18, 2019 · 49d2632 · 49d2632
2 parents 57ba456 + b8c74ec
commit 49d2632
Showing 1 changed file with 10 additions and 0 deletions.
diff --git 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