Skip to content

Commit

Permalink
8330524: Linux ppc64le compile warning with clang in os_linux_ppc.cpp
Browse files Browse the repository at this point in the history 
Backport-of: 252c62a66dd955a5d22f307544f38cc0dd4f2550
  • Loading branch information
@MBaesken
MBaesken committed May 10, 2024
1 parent c12dfc3 commit e3a9226
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2021 SAP SE. All rights reserved.
* Copyright (c) 2012, 2024 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -255,7 +255,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
stub = SharedRuntime::get_handle_wrong_method_stub();
}

else if ((sig == USE_POLL_BIT_ONLY ? SIGTRAP : SIGSEGV) &&
else if ((sig == (USE_POLL_BIT_ONLY ? SIGTRAP : SIGSEGV)) &&
// A linux-ppc64 kernel before 2.6.6 doesn't set si_addr on some segfaults
// in 64bit mode (cf. http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.6),
// especially when we try to read from the safepoint polling page. So the check
Expand Down

3 comments on commit e3a9226

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on e3a9226 Jun 17, 2024

Choose a reason for hiding this comment

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

@MBaesken Could not automatically backport e3a9226e to openjdk/jdk17u-dev due to conflicts in the following files:

  • src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-MBaesken-e3a9226e-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk21u-dev.git e3a9226e0d481ea1ad9747ec9d40f40bbcb650f3

# Backport the commit
$ git cherry-pick --no-commit e3a9226e0d481ea1ad9747ec9d40f40bbcb650f3
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport e3a9226e0d481ea1ad9747ec9d40f40bbcb650f3'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport e3a9226e0d481ea1ad9747ec9d40f40bbcb650f3.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit e3a9226e from the openjdk/jdk21u-dev repository.

The commit being backported was authored by Matthias Baesken on 10 May 2024 and had no reviewers.

Thanks!

Please sign in to comment.