Skip to content

Commit 807f6f7

Browse files
committedDec 27, 2024
8346847: [s390x] minimal build failure
Reviewed-by: stuefe
1 parent 6c59185 commit 807f6f7

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed
 

‎src/hotspot/cpu/s390/vm_version_s390.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,12 @@ void VM_Version::initialize() {
308308
if (FLAG_IS_DEFAULT(UseMontgomerySquareIntrinsic)) {
309309
FLAG_SET_DEFAULT(UseMontgomerySquareIntrinsic, true);
310310
}
311+
312+
// The OptoScheduling information is not maintained in s390.ad.
313+
if (OptoScheduling) {
314+
warning("OptoScheduling is not supported on this CPU.");
315+
FLAG_SET_DEFAULT(OptoScheduling, false);
316+
}
311317
#endif
312318
if (FLAG_IS_DEFAULT(UsePopCountInstruction)) {
313319
FLAG_SET_DEFAULT(UsePopCountInstruction, true);
@@ -323,12 +329,6 @@ void VM_Version::initialize() {
323329
if (FLAG_IS_DEFAULT(UseUnalignedAccesses)) {
324330
FLAG_SET_DEFAULT(UseUnalignedAccesses, true);
325331
}
326-
327-
// The OptoScheduling information is not maintained in s390.ad.
328-
if (OptoScheduling) {
329-
warning("OptoScheduling is not supported on this CPU.");
330-
FLAG_SET_DEFAULT(OptoScheduling, false);
331-
}
332332
}
333333

334334

7 commit comments

Comments
 (7)

offamitkumar commented on Dec 27, 2024

@offamitkumar
MemberAuthor

/backport jdk21u-dev

openjdk[bot] commented on Dec 27, 2024

@openjdk[bot]

@offamitkumar the backport was successfully created on the branch backport-offamitkumar-807f6f7f-master in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev: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 807f6f7f from the openjdk/jdk repository.

The commit being backported was authored by Amit Kumar on 27 Dec 2024 and was reviewed by Thomas Stuefe.

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/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-offamitkumar-807f6f7f-master:backport-offamitkumar-807f6f7f-master
$ git checkout backport-offamitkumar-807f6f7f-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-offamitkumar-807f6f7f-master

openjdk-notifier[bot] commented on Dec 27, 2024

@openjdk-notifier[bot]

offamitkumar commented on Dec 30, 2024

@offamitkumar
MemberAuthor

/backport jdk24u

openjdk[bot] commented on Dec 30, 2024

@openjdk[bot]

@offamitkumar the backport was successfully created on the branch backport-offamitkumar-807f6f7f-master in my personal fork of openjdk/jdk24u. To create a pull request with this backport targeting openjdk/jdk24u: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 807f6f7f from the openjdk/jdk repository.

The commit being backported was authored by Amit Kumar on 27 Dec 2024 and was reviewed by Thomas Stuefe.

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/jdk24u:

$ git fetch https://github.com/openjdk-bots/jdk24u.git backport-offamitkumar-807f6f7f-master:backport-offamitkumar-807f6f7f-master
$ git checkout backport-offamitkumar-807f6f7f-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk24u.git backport-offamitkumar-807f6f7f-master

⚠️ @offamitkumar You are not yet a collaborator in my fork openjdk-bots/jdk24u. An invite will be sent out and you need to accept it before you can proceed.

offamitkumar commented on Dec 30, 2024

@offamitkumar
MemberAuthor

/backport :jdk24

openjdk[bot] commented on Dec 30, 2024

@openjdk[bot]

@offamitkumar the backport was successfully created on the branch backport-offamitkumar-807f6f7f-jdk24 in my personal fork of openjdk/jdk. To create a pull request with this backport targeting openjdk/jdk:jdk24, 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 807f6f7f from the openjdk/jdk repository.

The commit being backported was authored by Amit Kumar on 27 Dec 2024 and was reviewed by Thomas Stuefe.

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/jdk:

$ git fetch https://github.com/openjdk-bots/jdk.git backport-offamitkumar-807f6f7f-jdk24:backport-offamitkumar-807f6f7f-jdk24
$ git checkout backport-offamitkumar-807f6f7f-jdk24
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk.git backport-offamitkumar-807f6f7f-jdk24

⚠️ @offamitkumar You are not yet a collaborator in my fork openjdk-bots/jdk. An invite will be sent out and you need to accept it before you can proceed.

Please sign in to comment.