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

4 files changed, 10 insertions, 17 deletions

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.