Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8274851: [PPC64] Port zgc to linux on ppc64le
Reviewed-by: ihse, pliden, mdoerr, eosterlund
  • Loading branch information
Quaffel authored and TheRealMDoerr committed Oct 13, 2021
1 parent cf82867 commit 337b73a
Show file tree
Hide file tree
Showing 11 changed files with 1,273 additions and 8 deletions.
7 changes: 7 additions & 0 deletions make/autoconf/jvm-features.m4
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions make/hotspot/gensrc/GensrcAdlc.gmk
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions src/hotspot/cpu/ppc/assembler_ppc.hpp
Expand Up @@ -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) {}

Expand Down

3 comments on commit 337b73a

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheRealMDoerr
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u

@openjdk
Copy link

@openjdk openjdk bot commented on 337b73a Oct 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheRealMDoerr @TheRealMDoerr the backport was successfully created on the branch TheRealMDoerr-backport-337b73a4 in my personal fork of openjdk/jdk17u. To create a pull request with this backport targeting openjdk/jdk17u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

this pull request contains a backport of commit 337b73a4 from the openjdk/jdk repository.

The commit being backported was authored by Niklas Radomski on 13 Oct 2021 and was reviewed by Magnus Ihse Bursie, Per Liden, Martin Doerr and Erik Österlund.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u:

$ git fetch https://github.com/openjdk-bots/jdk17u TheRealMDoerr-backport-337b73a4:TheRealMDoerr-backport-337b73a4
$ git checkout TheRealMDoerr-backport-337b73a4
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u TheRealMDoerr-backport-337b73a4

Please sign in to comment.