drop upstreamed s390 patches

java-1.8.0-openjdk-bitmap.patch

@@ -1,47 +0,0 @@
-diff -up jdk8/hotspot/src/share/vm/utilities/bitMap.inline.hpp.s390 openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp
---- jdk8/hotspot/src/share/vm/utilities/bitMap.inline.hpp.s390	2012-02-10 08:30:46.378435291 -0500
-+++ jdk8/hotspot/src/share/vm/utilities/bitMap.inline.hpp	2012-02-10 08:47:27.478427892 -0500
-@@ -52,16 +52,16 @@ inline void BitMap::clear_bit(idx_t bit)
- 
- inline bool BitMap::par_set_bit(idx_t bit) {
-   verify_index(bit);
--  volatile idx_t* const addr = word_addr(bit);
--  const idx_t mask = bit_mask(bit);
--  idx_t old_val = *addr;
-+  volatile bm_word_t* const addr = word_addr(bit);
-+  const bm_word_t mask = bit_mask(bit);
-+  bm_word_t old_val = *addr;
- 
-   do {
--    const idx_t new_val = old_val | mask;
-+    const bm_word_t new_val = old_val | mask;
-     if (new_val == old_val) {
-       return false;     // Someone else beat us to it.
-     }
--    const idx_t cur_val = (idx_t) Atomic::cmpxchg_ptr((void*) new_val,
-+    const bm_word_t cur_val = (bm_word_t) Atomic::cmpxchg_ptr((void*) new_val,
-                                                       (volatile void*) addr,
-                                                       (void*) old_val);
-     if (cur_val == old_val) {
-@@ -73,16 +73,16 @@ inline bool BitMap::par_set_bit(idx_t bi
- 
- inline bool BitMap::par_clear_bit(idx_t bit) {
-   verify_index(bit);
--  volatile idx_t* const addr = word_addr(bit);
--  const idx_t mask = ~bit_mask(bit);
--  idx_t old_val = *addr;
-+  volatile bm_word_t* const addr = word_addr(bit);
-+  const bm_word_t mask = ~bit_mask(bit);
-+  bm_word_t old_val = *addr;
- 
-   do {
--    const idx_t new_val = old_val & mask;
-+    const bm_word_t new_val = old_val & mask;
-     if (new_val == old_val) {
-       return false;     // Someone else beat us to it.
-     }
--    const idx_t cur_val = (idx_t) Atomic::cmpxchg_ptr((void*) new_val,
-+    const bm_word_t cur_val = (bm_word_t) Atomic::cmpxchg_ptr((void*) new_val,
-                                                       (volatile void*) addr,
-                                                       (void*) old_val);
-     if (cur_val == old_val) {

java-1.8.0-openjdk-s390.patch

@@ -1,22 +0,0 @@
-diff -up jdk8/common/autoconf/platform.m4.s390 jdk8/common/autoconf/platform.m4
---- jdk8/common/autoconf/platform.m4.s390	2013-04-30 07:30:55.368691627 -0400
-+++ jdk8/common/autoconf/platform.m4	2013-04-30 07:31:51.168692356 -0400
-@@ -60,6 +60,18 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU
-       VAR_CPU_BITS=64
-       VAR_CPU_ENDIAN=big
-        ;;
-+    s390)
-+      VAR_CPU=s390
-+      VAR_CPU_ARCH=s390
-+      VAR_CPU_BITS=32
-+      VAR_CPU_ENDIAN=big
-+       ;;
-+    s390x)
-+      VAR_CPU=s390x
-+      VAR_CPU_ARCH=s390x
-+      VAR_CPU_BITS=64
-+      VAR_CPU_ENDIAN=big
-+       ;;
-     sparc)
-       VAR_CPU=sparc
-       VAR_CPU_ARCH=sparc

java-1.8.0-openjdk.spec

@@ -209,10 +209,7 @@ Patch6: disable-doclint-by-default.patch
 # Allow icedtea-web to build
 Patch99: applet-hole.patch
 
-# Recognize s390/s390x
-Patch100: %{name}-s390.patch
 # Type fixing for s390
-Patch101: %{name}-bitmap.patch
 Patch102: %{name}-size_t.patch
 
 # Patch for PPC/PPC64
@@ -438,8 +435,6 @@ sh %{SOURCE12}
 
 # Type fixes for s390
 %ifarch s390 s390x
-%patch100
-%patch101
 %patch102
 %endif