8274851: [ppc64] Port zgc to linux on ppc64le

Backport-of: 337b73a459ba24aa529b7b097617434be1d0030e
openjdk · Oct 19, 2021 · 0edff7e · 0edff7e · openjdk-notifier · Oct 19, 2021
1 parent ee02c64
commit 0edff7e
Show file tree

Hide file tree

Showing 11 changed files with 1,273 additions and 8 deletions.
diff --git a/make/autoconf/jvm-features.m4 b/make/autoconf/jvm-features.m4
@@ -357,6 +357,13 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_ZGC],
         AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
         AVAILABLE=false
       fi
+    elif test "x$OPENJDK_TARGET_CPU" = "xppc64le"; then
+      if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
+        AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
+        AVAILABLE=false
+      fi
     else
       AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
       AVAILABLE=false

diff --git a/make/hotspot/gensrc/GensrcAdlc.gmk b/make/hotspot/gensrc/GensrcAdlc.gmk
@@ -155,6 +155,7 @@ ifeq ($(call check-jvm-feature, compiler2), true)
   ifeq ($(call check-jvm-feature, zgc), true)
     AD_SRC_FILES += $(call uniq, $(wildcard $(foreach d, $(AD_SRC_ROOTS), \
         $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/z/z_$(HOTSPOT_TARGET_CPU).ad \
+        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/z/z_$(HOTSPOT_TARGET_CPU_ARCH).ad \
       )))
   endif
 

diff --git a/src/hotspot/cpu/ppc/assembler_ppc.hpp b/src/hotspot/cpu/ppc/assembler_ppc.hpp
@@ -47,6 +47,9 @@ class Address {
   Address(Register b, address d = 0)
     : _base(b), _index(noreg), _disp((intptr_t)d) {}
 
+  Address(Register b, ByteSize d)
+    : _base(b), _index(noreg), _disp((intptr_t)d) {}
+
   Address(Register b, intptr_t d)
     : _base(b), _index(noreg), _disp(d) {}