dev-java/openj9-openjdk*: update to 0.48.0

10 files changed, 32 insertions, 39 deletions

diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest
index 32ba4cd..11859c4 100644
--- a/dev-java/openj9-openjdk-bin/Manifest
+++ b/dev-java/openj9-openjdk-bin/Manifest
@@ -1,12 +1,12 @@
-DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.24_8_openj9-0.46.1.tar.gz 367934601 SHA256 63759b5585bad4efb2c8c1fb08ce2314fd3088cf04553e41d93189ab0b6a535d
-DIST ibm-semeru-open-debugimage_aarch64_linux_21.0.4_7_openj9-0.46.1.tar.gz 372505511 SHA256 8047594e2ad2be450afbe7b5a41f11d8e97b9cac8cf6fc396f26ffb06a277ddb
-DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.24_8_openj9-0.46.1.tar.gz 381199901 SHA256 234676459ae3478fefbf331b8a23c6796521818f2f88c3e8d9818c7651417f3a
-DIST ibm-semeru-open-debugimage_ppc64le_linux_21.0.4_7_openj9-0.46.1.tar.gz 386180001 SHA256 833ef025ee96a347a0212c1ea8b56d23f77705958e4c44df28d944485832198e
-DIST ibm-semeru-open-debugimage_x64_linux_11.0.24_8_openj9-0.46.1.tar.gz 396010165 SHA256 15f03471ab4e40ea3339a2e2a9b210bdb2ae734ab894dd1819e2c3b87a57f939
-DIST ibm-semeru-open-debugimage_x64_linux_21.0.4_7_openj9-0.46.1.tar.gz 400879617 SHA256 1e96899ba9801e45a22409f31d246a15389f58f0bd44883d6d1948b7187b4aef
-DIST ibm-semeru-open-jdk_aarch64_linux_11.0.24_8_openj9-0.46.1.tar.gz 204241111 SHA256 14f982221bb61f8ea5d11f2cb9a3470639004b825dcbb5640ffd27ed479a38c4
-DIST ibm-semeru-open-jdk_aarch64_linux_21.0.4_7_openj9-0.46.1.tar.gz 220846043 SHA256 0a8a8abf61da58ee0db5ce5ea0b786838a19827df6e3446cfd094f0fb01823cd
-DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.24_8_openj9-0.46.1.tar.gz 214830663 SHA256 34a59f13ee3070dcc64408331bb838c1286b7b7ea1ad71c693395aa3ef16c07b
-DIST ibm-semeru-open-jdk_ppc64le_linux_21.0.4_7_openj9-0.46.1.tar.gz 232343710 SHA256 279b7384ab301385d01c15cbb590b88b4aa9e613e57ec2f672353b970cf65e4b
-DIST ibm-semeru-open-jdk_x64_linux_11.0.24_8_openj9-0.46.1.tar.gz 211769346 SHA256 37b6e363eb06c27bcfa9c8c1396839ce4a0e03eb58e0b79312fbc470eb968b63
-DIST ibm-semeru-open-jdk_x64_linux_21.0.4_7_openj9-0.46.1.tar.gz 228961114 SHA256 eaf8a35c50167da06f1e103602df40aac2a74a1fd170f4701b2076152e104e5c
+DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.25_9_openj9-0.48.0.tar.gz 383706192 SHA256 30ab9afca6cb4d5e230523b45fb5fec079022eeda1151364657cb0ed7b70dd6d
+DIST ibm-semeru-open-debugimage_aarch64_linux_21.0.5_11_openj9-0.48.0.tar.gz 382943324 SHA256 9322736ddabb07788275244c0651ae493ed444d583b497a0a29840a7edeef436
+DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.25_9_openj9-0.48.0.tar.gz 397138199 SHA256 b19c94b912f91eb52fb0051af96d18e8318a370882c1471cc816a825ceee5baf
+DIST ibm-semeru-open-debugimage_ppc64le_linux_21.0.5_11_openj9-0.48.0.tar.gz 396887409 SHA256 f4195616afc9c9aed0ef36cbae455da9f9fde3714a34c1d05185df57e308e110
+DIST ibm-semeru-open-debugimage_x64_linux_11.0.25_9_openj9-0.48.0.tar.gz 412974779 SHA256 c963798c09e2386dc9449fdf4dbce625cc9c44f3507a0d6e360ef937169aab99
+DIST ibm-semeru-open-debugimage_x64_linux_21.0.5_11_openj9-0.48.0.tar.gz 412622963 SHA256 00b9fbb638d0cda789c2ff00bedb506d41c8d4a3666896c239184b958fa85705
+DIST ibm-semeru-open-jdk_aarch64_linux_11.0.25_9_openj9-0.48.0.tar.gz 204214582 SHA256 73eac0441938990a87d188d8ae3f9de6a0cdb89c3b75e1647411ec0a093ca414
+DIST ibm-semeru-open-jdk_aarch64_linux_21.0.5_11_openj9-0.48.0.tar.gz 220073837 SHA256 f57f9966c1b116fb0d414aba7f5621c855b11f1b042a336552820c408921917b
+DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.25_9_openj9-0.48.0.tar.gz 214805245 SHA256 8bdeed45af4087352e969f1206fe697473b1fa2ee2e75e671bc32c54c38fa420
+DIST ibm-semeru-open-jdk_ppc64le_linux_21.0.5_11_openj9-0.48.0.tar.gz 231453891 SHA256 4f3072299cc1cbe24f4a68e4a2453e50686c262a62aed7498dc7a95e47469e1b
+DIST ibm-semeru-open-jdk_x64_linux_11.0.25_9_openj9-0.48.0.tar.gz 213075663 SHA256 1dc99080a9e1b3b19f0c9c7063d920d9a0ced8b35e5f7c1fc9f6769c5a9c6a37
+DIST ibm-semeru-open-jdk_x64_linux_21.0.5_11_openj9-0.48.0.tar.gz 230442979 SHA256 ccca1486fd445a7500881e3e43eda58a6b26e4c2efa2926b7a67aeff6d114514
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.24_p8.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.25_p9.ebuild
index 1f16cfb..80dd11c 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.24_p8.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.25_p9.ebuild
@@ -15,7 +15,7 @@ abi_uri() {
 }
 
 JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.46.1
+DL_PV=${JDK_PV}_openj9-0.48.0
 SLOT=$(ver_cut 1)
 
 SRC_URI="
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.4_p7.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.5_p11.ebuild
index 1f16cfb..80dd11c 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.4_p7.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.5_p11.ebuild
@@ -15,7 +15,7 @@ abi_uri() {
 }
 
 JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.46.1
+DL_PV=${JDK_PV}_openj9-0.48.0
 SLOT=$(ver_cut 1)
 
 SRC_URI="
diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest
index f124234..b5f1556 100644
--- a/dev-java/openj9-openjdk-jre-bin/Manifest
+++ b/dev-java/openj9-openjdk-jre-bin/Manifest
@@ -1,6 +1,6 @@
-DIST ibm-semeru-open-jre_aarch64_linux_11.0.24_8_openj9-0.46.1.tar.gz 47341592 SHA256 010e099a8e6ff4f4ed1de40dfb536b59a5a3aaddeeaae38c1f4715e6a31ae462
-DIST ibm-semeru-open-jre_aarch64_linux_21.0.4_7_openj9-0.46.1.tar.gz 51323125 SHA256 155a5f8d88f1b7bb018ffec077b430a90027172b6215cec90344a9b48180bfaf
-DIST ibm-semeru-open-jre_ppc64le_linux_11.0.24_8_openj9-0.46.1.tar.gz 52495014 SHA256 31151d3e19e58a1a2ac332e4b940009c997d6cb3cb6cb36ae80250ade6ef4e32
-DIST ibm-semeru-open-jre_ppc64le_linux_21.0.4_7_openj9-0.46.1.tar.gz 56561820 SHA256 c45f1c0c6e12d1961979b362124fa59acb76a85c576e1cf9f2815500e429ef4e
-DIST ibm-semeru-open-jre_x64_linux_11.0.24_8_openj9-0.46.1.tar.gz 50967149 SHA256 34ebbf10575043cc0c00b56115f2f5b58d3b05ec662e9a7a6ce5fa55d56d290a
-DIST ibm-semeru-open-jre_x64_linux_21.0.4_7_openj9-0.46.1.tar.gz 54963626 SHA256 19b64c4270450bdfc3c73af7a228defd2c326179dd2df8a0d419667515af86c7
+DIST ibm-semeru-open-jre_aarch64_linux_11.0.25_9_openj9-0.48.0.tar.gz 47322074 SHA256 3ebe7dc3fc6d7a0145d8834d01ca5adda19c1812af9a4f63655bc4de463377b6
+DIST ibm-semeru-open-jre_aarch64_linux_21.0.5_11_openj9-0.48.0.tar.gz 50933676 SHA256 27fb02bb8e409c5330bbed15f6dce74c3f8255c1f2ef937a697c1b903ca9477a
+DIST ibm-semeru-open-jre_ppc64le_linux_11.0.25_9_openj9-0.48.0.tar.gz 52469157 SHA256 451c6da5d286af654d857c2383698c19e9f05070b8e018f73f82ab1df1c51ba3
+DIST ibm-semeru-open-jre_ppc64le_linux_21.0.5_11_openj9-0.48.0.tar.gz 56106709 SHA256 ab533e7d609382cda4e5abee38102f8a467f24db77886fa0f4c680d681cdf87f
+DIST ibm-semeru-open-jre_x64_linux_11.0.25_9_openj9-0.48.0.tar.gz 51220370 SHA256 7d8407bbc68303e84615d1981abbdda690236edfcff5535789dc7915a3c4f629
+DIST ibm-semeru-open-jre_x64_linux_21.0.5_11_openj9-0.48.0.tar.gz 55086666 SHA256 3cd0ac0e28ad83fe9097569c6ba0c84772d697c1a34fa5b93c9fcbe0493d43c8
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.24_p8.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.25_p9.ebuild
index 5891e46..8e9a88f 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.24_p8.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.25_p9.ebuild
@@ -12,7 +12,7 @@ abi_uri() {
 }
 
 JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.46.1
+DL_PV=${JDK_PV}_openj9-0.48.0
 SLOT=$(ver_cut 1)
 
 SRC_URI="
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.4_p7.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.5_p11.ebuild
index 5891e46..8e9a88f 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.4_p7.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.5_p11.ebuild
@@ -12,7 +12,7 @@ abi_uri() {
 }
 
 JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.46.1
+DL_PV=${JDK_PV}_openj9-0.48.0
 SLOT=$(ver_cut 1)
 
 SRC_URI="
diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest
index ca28a90..533a846 100644
--- a/dev-java/openj9-openjdk/Manifest
+++ b/dev-java/openj9-openjdk/Manifest
@@ -1,4 +1,4 @@
-DIST openj9-0.46.1.tar.gz 18342761 BLAKE2B 63f73666ec2bf6d0f8d37ed17f6ae43a2732b413260d340c896000f8b2a025285cd425a9c8e25da2e46863109c73cbd2767112ad86c9f97a68236774e98658fb SHA512 a243ca6f6c8a762079d9884e40d509204a589e970b316cd9d574db4f02e24175187b36400caf79b9c306b76fa22a679ff81f1678daa2cb6589ca324302e875a4
-DIST openj9-omr-0.46.1.tar.gz 8110029 BLAKE2B e36edd58026d8a14eccfd6dca8b1bfc3f98d1b4873d0835e6f5ced14c2a3bf8dcbf152c88197ac9f1788d60444582f32fce7d324673b395a9ccf04d81d1b2fdb SHA512 7dc44aec1655a8add2dd5a91b05c164fc9182aadd1bfe961d2734f59dfd082e489365e5b33ac6a59e9838cef0db0f69f5cf66bbc326761ed583540cd099fcaba
-DIST openj9-openjdk-jdk11-openj9-0.46.1.tar.gz 102673195 BLAKE2B 05e6b41693ba23cb9b0ed809f20b5c0e9d1f512dc205013dc9a8fa3be07fa23c20a5d50b7edcf6ab8de5315faef2ac997b4224119d54ed42a7e2eb9ab32f5add SHA512 7976e5319466ae829397a639e8ac03753777cb61503acb03d98c8ad5b61de639244be2dbaa9e2def78127b639fbd2a7e4b5d6ae6ce862c6dbeadc96c77e28a63
-DIST openj9-openjdk-jdk21-openj9-0.46.1.tar.gz 100343564 BLAKE2B 24638cd0a351d2a333df100acd72b1ddb5088e15fd9415b66e67d236ee670ee305dba53c4b520cefc89b43838b8a0d36a6341ecb5053663fde70f4e2c8e2792e SHA512 942542139e8cd61cce0e64e229f56e808608e1a2432b53cfa774f5afa163ccf1c06356e693d8aedf7de7849fbeca5c357f5e2359c7f96d49c2ed9804d24a94a1
+DIST openj9-0.48.0.tar.gz 18480709 BLAKE2B 4d3d593ce295c0ba40ef32cc79f0e00b4864d2bc5d36e26c0bd0e2c3aa3406888e8a764472c212ff45ab59d092055e9e9775231fd8d979643d91d022911bd147 SHA512 28247eb763056becf881f1a3f431a073f4605d062e26bfc30a8cad86cab7b7a9a114a44faff40743957315d808a42ff7636554ff794dac640578ec75e9328749
+DIST openj9-omr-0.48.0.tar.gz 8126272 BLAKE2B d343b0129d639cd2887c98fe64b92c66ff2932537520158faa2dbaa465cfb32d6ff0c5c7bf0a5591a8f57e25f85cfc1a85f34c7f6bd9f07e04a35d5b50eb09f7 SHA512 090aee202bb7dd46fcc93f94a7168d22f3b2546d86456d40ba12aba7d76699345502aafc25ca5b675ba7683cfa2414564113c91ba31ad720d1f6867d63f70aab
+DIST openj9-openjdk-jdk11-openj9-0.48.0.tar.gz 102800187 BLAKE2B 82a04892e389a5e24c59a17d2efa95a37e092480dfbbf89f47da965179aaead0b56c1cbe26efcd905bfeb018667880faf077e410bf0d689a1b99178acf398fb4 SHA512 9288f83706aeb945a479b4478b365911408a92ac703f43418f3f98fc1beaefb008c8d0b46dd055200122a9d549da89cd727a2eef8598b7ba069cf36055d1207d
+DIST openj9-openjdk-jdk21-openj9-0.48.0.tar.gz 100484633 BLAKE2B c23d1325c8db43a7076cc589ea0a485cae2d0d26668f8da5cb2a2db2cc6b43052a7e848d04e7c66f03f7696a19690a0812f9aff92deedf7c426ede03b9aa36c7 SHA512 5b4a390c53643ee10affd5b0c6277f5ac6be873f34035c28fb7b75fca04f9e08e91b66ed505e8a5c0eb114f0cf00d6af2bb8c42f2495e3b6913cc253a7969836
diff --git a/dev-java/openj9-openjdk/files/openj9.patch b/dev-java/openj9-openjdk/files/openj9.patch
deleted file mode 100644
index 0233be5..0000000
--- a/dev-java/openj9-openjdk/files/openj9.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/runtime/oti/xhelpers.m4 b/runtime/oti/xhelpers.m4
-index 9d9fe46aba..793bb06901 100644
---- a/runtime/oti/xhelpers.m4
-+++ b/runtime/oti/xhelpers.m4
-@@ -93,7 +93,6 @@ define({SHORT_JMP},{short})
- 
- define({FILE_START},{
- 	.intel_syntax noprefix
--	.arch pentium4
- 	.text
- })
- 
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.46.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild
index 4e7eb58..4e7eb58 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.46.1.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-21.0.46.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild
index b3076d5..6bf8ca9 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-21.0.46.1.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild
@@ -168,7 +168,6 @@ src_prepare() {
 	eapply -- "${FILESDIR}/openj9-openjdk-override-version.patch"
 	eapply -d openj9 -- "${FILESDIR}/openj9-no-o3.patch"
 	eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
-	eapply -d openj9 -- "${FILESDIR}/openj9.patch"
 
 	find openj9/ omr/ -name CMakeLists.txt -exec sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' {} + || die
 	sed -i -e '/^  OPENJ9_CONFIGURE_NUMA$/d' closed/autoconf/custom-hook.m4 || die
@@ -194,6 +193,12 @@ src_configure() {
 	# Work around stack alignment issue, bug #647954. in case we ever have x86
 	use x86 && append-flags -mincoming-stack-boundary=2
 
+	# /tmp/portage/dev-java/openj9-openjdk-21.0.48.0/work/openj9-openjdk-jdk21-openj9-0.48.0/openj9/runtime/codert_vm/thunkcrt.c:95: error: function 'icallVMprJavaSendVirtualL' redeclared as variable
+	#    95 | extern void * icallVMprJavaSendVirtualL;
+	# /tmp/portage/dev-java/openj9-openjdk-21.0.48.0/work/openj9-openjdk-jdk21-openj9-0.48.0/openj9/runtime/compiler/runtime/Runtime.cpp:341:1: note: previously declared here
+	#   341 | JIT_HELPER(icallVMprJavaSendVirtualL);
+	filter-lto
+
 	# Enabling full docs appears to break doc building. If not
 	# explicitly disabled, the flag will get auto-enabled if pandoc and
 	# graphviz are detected. pandoc has loads of dependencies anyway.