From 3147b8086af15810cb4e6434641d8dfb08e385b6 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 24 Apr 2016 16:27:32 +0000
Subject: [PATCH] extra/java8-openjdk: drop zero patch

---
 extra/java8-openjdk/PKGBUILD                       | 10 ++--------
 .../rhbz1206656_fix_current_stack_pointer.patch    | 14 --------------
 2 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 extra/java8-openjdk/rhbz1206656_fix_current_stack_pointer.patch

diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD
index 08e24a672..9413ec461 100644
--- a/extra/java8-openjdk/PKGBUILD
+++ b/extra/java8-openjdk/PKGBUILD
@@ -11,7 +11,6 @@
 #  - add arm to _JARCH and _DOC_ARCH
 #  - configure with --with-jvm-variants=zero
 #  - adjust doc package to use linux-${_DOC_ARCH}-normal-zero-release instead of normal-server-release
-#  - patch for zero
 
 buildarch=22
 
@@ -39,8 +38,7 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
         jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz
         jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
         langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
-        nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz
-        rhbz1206656_fix_current_stack_pointer.patch)
+        nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz)
 sha256sums=('19bc6028c18dd1993f734dc49991c181138e2e85ead42354d7236fb3c6169e16'
             '287edac284f4b97f48a14fea331455c3807bcffd51612278decb0ac265303069'
             '653821c6d3e542b4922aeedea6e25efb6d3c6ea2aaa0f5b038e6af972accf814'
@@ -48,8 +46,7 @@ sha256sums=('19bc6028c18dd1993f734dc49991c181138e2e85ead42354d7236fb3c6169e16'
             '77aea5c781d6614b4be391befc59e3017d2d9c9303b6bc2ca9d316cb35954a89'
             '63eff7fe1f6a0dd7ec0c450724a403dcff986e026b5b9ae9ac46edc7222f798c'
             '374d12d1434172c775f0ecd944d0a903cd56264a4c9d5ef0be038715e47e67fd'
-            '76a18e240a8498c8d2a3a261b7845c8062dbf85941425adcd96f9e879141b3e6'
-            '85d396e1663514390e73b0b072a5f93c51ca6e324ee0a08aa2ace599e3df83bf')
+            '76a18e240a8498c8d2a3a261b7845c8062dbf85941425adcd96f9e879141b3e6')
 
 case "${CARCH}" in
   'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -73,9 +70,6 @@ prepare() {
   do
     ln -s ../${subrepo}-${_repo_ver} ${subrepo}
   done
-
-  cd "${srcdir}/hotspot-${_repo_ver}"
-  patch -p2 -i ../rhbz1206656_fix_current_stack_pointer.patch
 }
 
 build() {
diff --git a/extra/java8-openjdk/rhbz1206656_fix_current_stack_pointer.patch b/extra/java8-openjdk/rhbz1206656_fix_current_stack_pointer.patch
deleted file mode 100644
index dbefaefc4..000000000
--- a/extra/java8-openjdk/rhbz1206656_fix_current_stack_pointer.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-+++ jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -55,8 +55,8 @@
- #include "utilities/vmError.hpp"
- 
- address os::current_stack_pointer() {
--  address dummy = (address) &dummy;
--  return dummy;
-+  // return the address of the current function
-+  return (address)__builtin_frame_address(0);
- }
- 
- frame os::get_sender_for_C_frame(frame* fr) {