From a00a936dea418ad9c43d7a6b04ef27343060568c7af1c1ee8174c8f9758d4cc9 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 15 Jul 2015 18:46:35 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=105

---
 1ad2c1aa7aac.tar.bz2    | 3 ---
 70d4f640f931.tar.bz2    | 3 +++
 java-1_8_0-openjdk.spec | 9 ++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 1ad2c1aa7aac.tar.bz2
 create mode 100644 70d4f640f931.tar.bz2

diff --git a/1ad2c1aa7aac.tar.bz2 b/1ad2c1aa7aac.tar.bz2
deleted file mode 100644
index 89e3008..0000000
--- a/1ad2c1aa7aac.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef5284fd83cfd843fb657443385dabe0cf2eb6939f785f93e4c90a801da06fb9
-size 8094510
diff --git a/70d4f640f931.tar.bz2 b/70d4f640f931.tar.bz2
new file mode 100644
index 0000000..b737733
--- /dev/null
+++ b/70d4f640f931.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7f2729c0fb1d90951defdfd36376da8838f5a4e18d3952fd8a192b0a5f9cb7f8
+size 8054662
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 3822c61..5ac75b7 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -230,8 +230,10 @@ Patch16:        zero-dummy.patch
 # July 2015 security fixes backported to aarch64 hotspot
 # 8071731: Better scaling for C1
 Patch20:        aarch64-8071731.patch
+# 8035938: Memory leak in JvmtiEnv::GetConstantPool
+Patch21:        aarch64-8035938.patch
 # 8075838: Method for typing MethodTypes
-Patch21:        aarch64-8075838.patch
+Patch22:        aarch64-8075838.patch
 #
 # OpenJDK specific patches
 #
@@ -531,13 +533,12 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 %patch16 -p1
 %endif
 
-%ifnarch %aarch64
 %patch15 -p1
-%endif
 
 %ifarch %aarch64
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 %endif
 
 %patch99 -p1
@@ -549,9 +550,7 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 %patch101 -p1
 %endif
 
-%ifnarch %aarch64
 %patch102 -p1
-%endif
 
 %ifarch ppc ppc64 ppc64le
 # PPC fixes