update, drop patches

6 files changed, 37 insertions, 218 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75eb58c3f1f5..ddfbcccaa387 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = java-openj9
-	pkgver = 14.0.2.b12_openj9_0.21.0
+	pkgver = 15.0.1.b9_openj9_0.23.0
 	pkgrel = 1
 	url = http://www.eclipse.org/openj9/
 	arch = x86_64
@@ -27,27 +27,27 @@ pkgbase = java-openj9
 	makedepends = libnet
 	makedepends = bash
 	makedepends = freemarker
-	source = openj9-openjdk-jdk-0.21.0.tar.gz::https://github.com/ibmruntimes/openj9-openjdk-jdk14/archive/openj9-0.21.0.tar.gz
-	source = https://github.com/eclipse/openj9/archive/openj9-0.21.0.tar.gz
-	source = openj9-omr-0.21.0.tar.gz::https://github.com/eclipse/openj9-omr/archive/openj9-0.21.0.tar.gz
+	makedepends = numactl
+	makedepends = nasm
+	source = openj9-openjdk-jdk-0.23.0.tar.gz::https://github.com/ibmruntimes/openj9-openjdk-jdk15/archive/openj9-0.23.0.tar.gz
+	source = https://github.com/eclipse/openj9/archive/openj9-0.23.0.tar.gz
+	source = openj9-omr-0.23.0.tar.gz::https://github.com/eclipse/openj9-omr/archive/openj9-0.23.0.tar.gz
 	source = freedesktop-java.desktop
 	source = freedesktop-jconsole.desktop
 	source = freedesktop-jshell.desktop
-	source = openj9-make-jvmti-test-variables-static.patch
 	source = omr-omrstr-iconv-failure-overflow.patch
 	source = omr-fam.patch
-	sha256sums = f68213a6ecfe608eab4f16e50704912375e22d83b90e30d0aa150d1190f8e901
-	sha256sums = 84eac0ff622847d34704aef92d34d0d83e7ccf91fb9e21f7e9146e0f96d72c3f
-	sha256sums = a7d771a89b734d8f86d17cf5793d7e81e2d915f207739ebafc5208e2efcc2ca8
+	sha256sums = ed6b29fb098f7325298f70e6b07b283ee8aee95308c535a9979a55e1e0760a3a
+	sha256sums = e1962d17a45caef4b76f3c8120610d9192b43bd128a8b24dae5d5d6ccd298f1c
+	sha256sums = c58186d193c41e3c740ccbc29c320e18d7084b63d878bb7cc7ba90d3ebc4be5e
 	sha256sums = 7cb89746dbbcf498dd43b53fee59b124f42e3ea0d8b7134ab803cc2bd6b50230
 	sha256sums = bf76024528d050fd912f72d73e18a814a930df3478b132a99a887fbbdc0c9dfd
 	sha256sums = bd2d4da78a65eec20dc32e21fd4fe134a2483b0bbe2dfb940d66755acc237975
-	sha256sums = 5b65c0819be140e90ef11c9d7c3011d39aaa304e3fd9af0f8d61c6de618f93bf
 	sha256sums = f37290530dcb8eb5acb4f70609c55b7e2be134f1052ebf20f117c2996a749858
 	sha256sums = c288b0a1a2424967d9c00e4d07d16f5d703f6b9b1195839753480fcd9810faf5
 
 pkgname = jre-openj9-headless
-	pkgdesc = OpenJDK Java 14 headless runtime environment
+	pkgdesc = OpenJDK Java 15 headless runtime environment
 	install = install_jre-openj9-headless.sh
 	depends = java-runtime-common>=3
 	depends = ca-certificates-utils
@@ -57,9 +57,9 @@ pkgname = jre-openj9-headless
 	depends = libnet
 	depends = freetype2
 	optdepends = java-rhino: for some JavaScript support
-	provides = java-runtime-headless=14
-	provides = java-runtime-headless-openj9=14
-	provides = jre14-openj9-headless=14.0.2.b12_openj9_0.21.0-1
+	provides = java-runtime-headless=15
+	provides = java-runtime-headless-openj9=15
+	provides = jre15-openj9-headless=15.0.1.b9_openj9_0.23.0-1
 	backup = etc/java-openj9/logging.properties
 	backup = etc/java-openj9/management/jmxremote.access
 	backup = etc/java-openj9/management/jmxremote.password.template
@@ -76,35 +76,35 @@ pkgname = jre-openj9-headless
 	backup = etc/java-openj9/sound.properties
 
 pkgname = jre-openj9
-	pkgdesc = OpenJDK Java 14 full runtime environment
+	pkgdesc = OpenJDK Java 15 full runtime environment
 	install = install_jre-openj9.sh
-	depends = jre14-openj9-headless=14.0.2.b12_openj9_0.21.0-1
+	depends = jre15-openj9-headless=15.0.1.b9_openj9_0.23.0-1
 	depends = giflib
 	optdepends = alsa-lib: for basic sound support
 	optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
-	provides = java-runtime=14
-	provides = java-runtime-openj9=14
-	provides = jre14-openj9=14.0.2.b12_openj9_0.21.0-1
+	provides = java-runtime=15
+	provides = java-runtime-openj9=15
+	provides = jre15-openj9=15.0.1.b9_openj9_0.23.0-1
 
 pkgname = jdk-openj9
-	pkgdesc = OpenJDK Java 14 development kit
+	pkgdesc = OpenJDK Java 15 development kit
 	install = install_jdk-openj9.sh
-	depends = jre14-openj9=14.0.2.b12_openj9_0.21.0-1
+	depends = jre15-openj9=15.0.1.b9_openj9_0.23.0-1
 	depends = java-environment-common=3
 	depends = hicolor-icon-theme
 	depends = libelf
-	provides = java-environment=14
-	provides = java-environment-openj9=14
-	provides = jdk14-openj9=14.0.2.b12_openj9_0.21.0-1
+	provides = java-environment=15
+	provides = java-environment-openj9=15
+	provides = jdk15-openj9=15.0.1.b9_openj9_0.23.0-1
 
 pkgname = openj9-src
-	pkgdesc = OpenJDK Java 14 sources
-	depends = jdk14-openj9=14.0.2.b12_openj9_0.21.0-1
-	provides = openj914-src=14.0.2.b12_openj9_0.21.0-1
+	pkgdesc = OpenJDK Java 15 sources
+	depends = jdk15-openj9=15.0.1.b9_openj9_0.23.0-1
+	provides = openj915-src=15.0.1.b9_openj9_0.23.0-1
 
 pkgname = openj9-doc
-	pkgdesc = OpenJDK Java 14 documentation
-	depends = jdk14-openj9=14.0.2.b12_openj9_0.21.0-1
-	provides = openj914-doc=14.0.2.b12_openj9_0.21.0-1
+	pkgdesc = OpenJDK Java 15 documentation
+	depends = jdk15-openj9=15.0.1.b9_openj9_0.23.0-1
+	provides = openj915-doc=15.0.1.b9_openj9_0.23.0-1
 
diff --git a/PKGBUILD b/PKGBUILD
index 38fe1530e953..a416ceba171d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,11 +6,11 @@
 
 pkgbase=java-openj9
 pkgname=('jre-openj9-headless' 'jre-openj9' 'jdk-openj9' 'openj9-src' 'openj9-doc')
-_majorver=14
+_majorver=15
 _minorver=0
-_securityver=2
-_updatever=12
-_openj9ver=0.21.0
+_securityver=1
+_updatever=9
+_openj9ver=0.23.0
 pkgrel=1
 pkgver=${_majorver}.${_minorver}.${_securityver}.b${_updatever}_openj9_${_openj9ver}
 arch=('x86_64')
@@ -19,23 +19,21 @@ license=('custom')
 makedepends=('java-environment>=11' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11'
              'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc'
              'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2'
-             'libnet' 'bash' 'freemarker')
+             'libnet' 'bash' 'freemarker' 'numactl' 'nasm')
 source=(openj9-openjdk-jdk-${_openj9ver}.tar.gz::https://github.com/ibmruntimes/openj9-openjdk-jdk${_majorver}/archive/openj9-${_openj9ver}.tar.gz
         https://github.com/eclipse/openj9/archive/openj9-${_openj9ver}.tar.gz
         openj9-omr-${_openj9ver}.tar.gz::https://github.com/eclipse/openj9-omr/archive/openj9-${_openj9ver}.tar.gz
         freedesktop-java.desktop
         freedesktop-jconsole.desktop
         freedesktop-jshell.desktop
-        openj9-make-jvmti-test-variables-static.patch
         omr-omrstr-iconv-failure-overflow.patch
         omr-fam.patch)
-sha256sums=('f68213a6ecfe608eab4f16e50704912375e22d83b90e30d0aa150d1190f8e901'
-            '84eac0ff622847d34704aef92d34d0d83e7ccf91fb9e21f7e9146e0f96d72c3f'
-            'a7d771a89b734d8f86d17cf5793d7e81e2d915f207739ebafc5208e2efcc2ca8'
+sha256sums=('ed6b29fb098f7325298f70e6b07b283ee8aee95308c535a9979a55e1e0760a3a'
+            'e1962d17a45caef4b76f3c8120610d9192b43bd128a8b24dae5d5d6ccd298f1c'
+            'c58186d193c41e3c740ccbc29c320e18d7084b63d878bb7cc7ba90d3ebc4be5e'
             '7cb89746dbbcf498dd43b53fee59b124f42e3ea0d8b7134ab803cc2bd6b50230'
             'bf76024528d050fd912f72d73e18a814a930df3478b132a99a887fbbdc0c9dfd'
             'bd2d4da78a65eec20dc32e21fd4fe134a2483b0bbe2dfb940d66755acc237975'
-            '5b65c0819be140e90ef11c9d7c3011d39aaa304e3fd9af0f8d61c6de618f93bf'
             'f37290530dcb8eb5acb4f70609c55b7e2be134f1052ebf20f117c2996a749858'
             'c288b0a1a2424967d9c00e4d07d16f5d703f6b9b1195839753480fcd9810faf5')
 
@@ -59,7 +57,6 @@ prepare() {
   ln -s ../openj9-openj9-${_openj9ver} openj9
   ln -s ../openj9-omr-openj9-${_openj9ver} omr
 
-  patch -d openj9 -p1 -i $srcdir/openj9-make-jvmti-test-variables-static.patch
   patch -d omr -p1 -i $srcdir/omr-omrstr-iconv-failure-overflow.patch
   patch -d omr -p1 -i $srcdir/omr-fam.patch
 
diff --git a/openj9-j9utf8-fam.patch b/openj9-j9utf8-fam.patch
deleted file mode 100644
index f45a5394ddf0..000000000000
--- a/openj9-j9utf8-fam.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/runtime/cfdumper/romdump.c b/runtime/cfdumper/romdump.c
-index 5040c2c25..1cfcd36c7 100644
---- a/runtime/cfdumper/romdump.c
-+++ b/runtime/cfdumper/romdump.c
-@@ -154,7 +154,7 @@ addRegion(J9Pool *regionPool, UDATA offset, UDATA length, UDATA type, const char
- static UDATA
- getUTF8Length(J9UTF8 *utf8)
- {
--	UDATA length = sizeof(J9UTF8) + J9UTF8_LENGTH(utf8) - sizeof(J9UTF8_DATA(utf8));
-+	UDATA length = sizeof(J9UTF8) + J9UTF8_LENGTH(utf8);
- 	if (length & 1) {
- 		length++;
- 	}
-diff --git a/runtime/oti/j9nonbuilder.h b/runtime/oti/j9nonbuilder.h
-index c5705188d..e9babe227 100644
---- a/runtime/oti/j9nonbuilder.h
-+++ b/runtime/oti/j9nonbuilder.h
-@@ -3219,7 +3219,7 @@ typedef struct J9ClassLoader {
- 
- typedef struct J9UTF8 {
- 	U_16 length;
--	U_8 data[2];
-+	U_8 data[];
- } J9UTF8;
- 
- typedef struct J9ROMClass {
diff --git a/openj9-make-jvmti-test-variables-static.patch b/openj9-make-jvmti-test-variables-static.patch
deleted file mode 100644
index 5d5b8a7fed61..000000000000
--- a/openj9-make-jvmti-test-variables-static.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From b91f42fc90179585c3e2a9866e93a3168b1ada9d Mon Sep 17 00:00:00 2001
-From: Graham Chapman <graham_chapman@ca.ibm.com>
-Date: Sat, 25 Jul 2020 16:13:13 -0400
-Subject: [PATCH] Make JVMTI test variables static
-
-Two tests declare the same named global non-statically which breaks some
-newer compilers.
-
-Fixes: #10252
-
-[ci skip]
-
-Signed-off-by: Graham Chapman <graham_chapman@ca.ibm.com>
----
- .../src/com/ibm/jvmti/tests/traceSubscription/ts001.c     | 4 ++--
- .../jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.c
-index 97843fc7c7..2c1e1ae67f 100644
---- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.c
-+++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.c
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2001, 2018 IBM Corp. and others
-+ * Copyright (c) 2001, 2020 IBM Corp. and others
-  *
-  * This program and the accompanying materials are made available under
-  * the terms of the Eclipse Public License 2.0 which accompanies this
-@@ -35,7 +35,7 @@ static jvmtiExtensionFunction subscribe  = NULL;
- static jvmtiExtensionFunction unsubscribe  = NULL;
- static jvmtiExtensionFunction flush  = NULL;
- static jvmtiExtensionFunction metadata = NULL;
--void *subscriptionID;
-+static void *subscriptionID;
- volatile static jint bufferCount = 0;
- volatile static jint bufferCountFinal = 0;
- volatile static int completed = 0;
-diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c
-index 2fda9e8bd7..f1601298af 100644
---- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c
-+++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2001, 2018 IBM Corp. and others
-+ * Copyright (c) 2001, 2020 IBM Corp. and others
-  *
-  * This program and the accompanying materials are made available under
-  * the terms of the Eclipse Public License 2.0 which accompanies this
-@@ -31,15 +31,15 @@ static agentEnv * env;
- static jvmtiExtensionFunction subscribe  = NULL;
- static jvmtiExtensionFunction unsubscribe  = NULL;
- 
--void *subscriptionID;
-+static void *subscriptionID;
- volatile static jint bufferCount = 0;
- volatile static int alarmed = 0;
- 
--void *subscriptionID2;
-+static void *subscriptionID2;
- volatile static jint bufferCount2 = 0;
- volatile static int alarmed2 = 0;
- 
--void *subscriptionID3;
-+static void *subscriptionID3;
- volatile static jint bufferCount3 = 0;
- volatile static int alarmed3 = 0;
- 
diff --git a/openj9-subscriptionID.patch b/openj9-subscriptionID.patch
deleted file mode 100644
index e754e055f16f..000000000000
--- a/openj9-subscriptionID.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.c
-index 97843fc7c..a2cc3ffe6 100644
---- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.c
-+++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.c
-@@ -35,7 +35,7 @@ static jvmtiExtensionFunction subscribe  = NULL;
- static jvmtiExtensionFunction unsubscribe  = NULL;
- static jvmtiExtensionFunction flush  = NULL;
- static jvmtiExtensionFunction metadata = NULL;
--void *subscriptionID;
-+static void *subscriptionID;
- volatile static jint bufferCount = 0;
- volatile static jint bufferCountFinal = 0;
- volatile static int completed = 0;
-diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c
-index 2fda9e8bd..d11047e44 100644
---- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c
-+++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c
-@@ -31,15 +31,15 @@ static agentEnv * env;
- static jvmtiExtensionFunction subscribe  = NULL;
- static jvmtiExtensionFunction unsubscribe  = NULL;
- 
--void *subscriptionID;
-+static void *subscriptionID;
- volatile static jint bufferCount = 0;
- volatile static int alarmed = 0;
- 
--void *subscriptionID2;
-+static void *subscriptionID2;
- volatile static jint bufferCount2 = 0;
- volatile static int alarmed2 = 0;
- 
--void *subscriptionID3;
-+static void *subscriptionID3;
- volatile static jint bufferCount3 = 0;
- volatile static int alarmed3 = 0;
- 
diff --git a/openjdk-8238380-childproc-fcommon.patch b/openjdk-8238380-childproc-fcommon.patch
deleted file mode 100644
index a972bc66c96b..000000000000
--- a/openjdk-8238380-childproc-fcommon.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-
-# HG changeset patch
-# User qpzhang
-# Date 1580822830 -28800
-# Node ID 6925fca959590dd0f747a9cffa5f0664ec02c7b1
-# Parent  8f6ffa575f63db3f07f96e52c97883fbaff459b4
-8238380: java.base/unix/native/libjava/childproc.c "multiple definition" link errors with GCC10
-Reviewed-by: stuefe, clanger, rriggs
-Contributed-by: patrick@os.amperecomputing.com
-
-diff -r 8f6ffa575f63 -r 6925fca95959 src/java.base/unix/native/libjava/childproc.c
---- a/src/java.base/unix/native/libjava/childproc.c	Tue Feb 11 11:17:37 2020 +0800
-+++ b/src/java.base/unix/native/libjava/childproc.c	Tue Feb 04 21:27:10 2020 +0800
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. 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
-@@ -34,6 +34,7 @@
- 
- #include "childproc.h"
- 
-+const char * const *parentPathv;
- 
- ssize_t
- restartableWrite(int fd, const void *buf, size_t count)
-diff -r 8f6ffa575f63 -r 6925fca95959 src/java.base/unix/native/libjava/childproc.h
---- a/src/java.base/unix/native/libjava/childproc.h	Tue Feb 11 11:17:37 2020 +0800
-+++ b/src/java.base/unix/native/libjava/childproc.h	Tue Feb 04 21:27:10 2020 +0800
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. 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
-@@ -126,7 +126,7 @@
-  * The cached and split version of the JDK's effective PATH.
-  * (We don't support putenv("PATH=...") in native code)
-  */
--const char * const *parentPathv;
-+extern const char * const *parentPathv;
- 
- ssize_t restartableWrite(int fd, const void *buf, size_t count);
- int restartableDup2(int fd_from, int fd_to);
-