$ git diff --patch-with-stat --summary b30671193823c7898b6657bd20bcd88a3ad9c934..2b7b7c672f204691141e45998df3ff0e686c100d

 java-16-openjdk.spec    |  6 ++++--
 openjdk-16-llvm13.patch | 11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 openjdk-16-llvm13.patch

diff --git a/java-16-openjdk.spec b/java-16-openjdk.spec
index 78c83d5..cdfe3b9 100644
--- a/java-16-openjdk.spec
+++ b/java-16-openjdk.spec
@@ -1,6 +1,6 @@
 # Use gcc instead of clang
 %bcond_with gcc
-%bcond_without system_jdk
+%bcond_with system_jdk
 # Without bootstrap, the package BuildRequires
 # rpm-javamacros (which in turn requires this package)
 # so jmod(*) and java(*) Provides: can be generated correctly.
@@ -29,7 +29,7 @@
 
 Name:		java-16-openjdk
 Version:	16.0.2
-Release:	1
+Release:	2
 Summary:	Java Runtime Environment (JRE) %{major}
 Group:		Development/Languages
 License:	GPLv2, ASL 1.1, ASL 2.0, LGPLv2.1
@@ -49,6 +49,8 @@ Patch1002:	java-12-compile.patch
 Patch1003:	openjdk-15-nss-3.57.patch
 Patch1004:	openjdk-16-glibc-2.34.patch
 #Patch1005:	openjdk-13-fix-build.patch
+Patch1006:	openjdk-16-llvm13.patch
+
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	binutils
diff --git a/openjdk-16-llvm13.patch b/openjdk-16-llvm13.patch
new file mode 100644
index 0000000..f982220
--- /dev/null
+++ b/openjdk-16-llvm13.patch
@@ -0,0 +1,11 @@
+--- jdk16u-jdk-16.0.2-ga/src/hotspot/cpu/aarch64/assembler_aarch64.cpp.orig	2021-09-01 11:23:30.418036222 +0100
++++ jdk16u-jdk-16.0.2-ga/src/hotspot/cpu/aarch64/assembler_aarch64.cpp	2021-09-01 11:23:38.057794707 +0100
+@@ -291,7 +291,7 @@
+ }
+ 
+ bool Assembler::operand_valid_for_logical_immediate(bool is32, uint64_t imm) {
+-  return encode_logical_immediate(is32, imm) != 0xffffffff;
++  return asm_util::encode_logical_immediate(is32, imm) != 0xffffffff;
+ }
+ 
+ static uint64_t doubleTo64Bits(jdouble d) {