!90 update to 17.0.12

From: @DXwangg 
Reviewed-by: @kuenking111 
Signed-off-by: @kuenking111
This commit is contained in:
openeuler-ci-bot 2024-07-23 11:53:23 +00:00 committed by Gitee
commit 419d05f85e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 12 additions and 9 deletions

View File

@ -208,9 +208,9 @@ deleted file mode 100644
index f47331a6d..000000000 index f47331a6d..000000000
--- a/test/hotspot/jtreg/compiler/c2/aarch64/TestFarJump.java --- a/test/hotspot/jtreg/compiler/c2/aarch64/TestFarJump.java
+++ /dev/null +++ /dev/null
@@ -1,137 +0,0 @@ @@ -1,136 +0,0 @@
-/* -/*
- * Copyright (c) 2022, BELLSOFT. All rights reserved. - * Copyright (c) 2024, BELLSOFT. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * - *
- * This code is free software; you can redistribute it and/or modify it - * This code is free software; you can redistribute it and/or modify it
@ -300,10 +300,9 @@ index f47331a6d..000000000
- "-Xbatch", - "-Xbatch",
- "-XX:+TieredCompilation", - "-XX:+TieredCompilation",
- "-XX:+SegmentedCodeCache", - "-XX:+SegmentedCodeCache",
- "-XX:CompileOnly=" + className + "::main",
- "-XX:ReservedCodeCacheSize=" + (bigCodeHeap ? "256M" : "200M"), - "-XX:ReservedCodeCacheSize=" + (bigCodeHeap ? "256M" : "200M"),
- "-XX:+UnlockDiagnosticVMOptions", - "-XX:+UnlockDiagnosticVMOptions",
- "-XX:+PrintAssembly", - "-XX:CompileCommand=option," + className + "::main,bool,PrintAssembly,true",
- className}; - className};
- -
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(procArgs); - ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(procArgs);

View File

@ -13,7 +13,7 @@ index 000000000..b717bafbe
--- /dev/null --- /dev/null
+++ b/version.txt +++ b/version.txt
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+17.0.10.0.13 +17.0.12.0.13
-- --
2.19.0 2.19.0

View File

@ -161,7 +161,7 @@
# Used via new version scheme. JDK 17 was # Used via new version scheme. JDK 17 was
# GA'ed in March 2021 => 21.9 # GA'ed in March 2021 => 21.9
%global vendor_version_string 21.9 %global vendor_version_string 21.9
%global securityver 11 %global securityver 12
# buildjdkver is usually same as %%{majorver}, # buildjdkver is usually same as %%{majorver},
# but in time of bootstrap of next jdk, it is majorver-1, # but in time of bootstrap of next jdk, it is majorver-1,
# and this it is better to change it here, on single place # and this it is better to change it here, on single place
@ -187,7 +187,7 @@
%global origin_nice OpenJDK %global origin_nice OpenJDK
%global top_level_dir_name %{origin} %global top_level_dir_name %{origin}
%global minorver 0 %global minorver 0
%global buildver 9 %global buildver 7
# priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk %if %is_system_jdk
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@ -903,7 +903,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver} Version: %{newjavaver}.%{buildver}
Release: 4 Release: 0
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages # and this change was brought into RHEL-4. java-1.5.0-ibm packages
@ -1837,6 +1837,10 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
%changelog %changelog
* Thu Jul 18 2024 DXwangg <wangjiawei80@huawei.com> - 1:17.0.12.7-0
- modify 8280872-Reorder-code-cache-segments-to-improv.patch
- update to 17.0.12+7(ga)
* Tue Jul 16 2024 songliyang <songliyang@kylinos.cn> - 1:17.0.11.9-4 * Tue Jul 16 2024 songliyang <songliyang@kylinos.cn> - 1:17.0.11.9-4
- null the arg to solve openjdk-headless install error - null the arg to solve openjdk-headless install error