Skip to content

Commit 337b73a

Browse files
QuaffelTheRealMDoerr
authored andcommitted
8274851: [PPC64] Port zgc to linux on ppc64le
Reviewed-by: ihse, pliden, mdoerr, eosterlund
1 parent cf82867 commit 337b73a

File tree

11 files changed

+1273
-8
lines changed

11 files changed

+1273
-8
lines changed

make/autoconf/jvm-features.m4

+7
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,13 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_ZGC],
357357
AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
358358
AVAILABLE=false
359359
fi
360+
elif test "x$OPENJDK_TARGET_CPU" = "xppc64le"; then
361+
if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
362+
AC_MSG_RESULT([yes])
363+
else
364+
AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
365+
AVAILABLE=false
366+
fi
360367
else
361368
AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
362369
AVAILABLE=false

make/hotspot/gensrc/GensrcAdlc.gmk

+1
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ ifeq ($(call check-jvm-feature, compiler2), true)
155155
ifeq ($(call check-jvm-feature, zgc), true)
156156
AD_SRC_FILES += $(call uniq, $(wildcard $(foreach d, $(AD_SRC_ROOTS), \
157157
$d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/z/z_$(HOTSPOT_TARGET_CPU).ad \
158+
$d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/z/z_$(HOTSPOT_TARGET_CPU_ARCH).ad \
158159
)))
159160
endif
160161

src/hotspot/cpu/ppc/assembler_ppc.hpp

+3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ class Address {
4747
Address(Register b, address d = 0)
4848
: _base(b), _index(noreg), _disp((intptr_t)d) {}
4949

50+
Address(Register b, ByteSize d)
51+
: _base(b), _index(noreg), _disp((intptr_t)d) {}
52+
5053
Address(Register b, intptr_t d)
5154
: _base(b), _index(noreg), _disp(d) {}
5255

0 commit comments

Comments
 (0)