1 files changed, 0 insertions, 116 deletions
diff --git a/user/openjdk7/icedtea-jdk-musl.patch b/user/openjdk7/icedtea-jdk-musl.patch
deleted file mode 100644
index 49c16d73a..000000000
--- a/user/openjdk7/icedtea-jdk-musl.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -ru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	2014-06-12 20:14:44.000000000 +0000
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	2014-07-15 07:19:52.186682096 +0000
-@@ -46,6 +46,8 @@
- 
- #include "zip.h"
- 
-+#define uchar unsigned char
-+
- #ifdef NO_ZLIB
- 
- inline bool jar::deflate_bytes(bytes& head, bytes& tail) {
-diff -ru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h	2014-06-12 20:14:44.000000000 +0000
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h	2014-07-15 07:19:52.186682096 +0000
-@@ -23,9 +23,7 @@
-  * questions.
-  */
- 
--#define ushort unsigned short
--#define uint   unsigned int
--#define uchar  unsigned char
-+#include <sys/types.h>
- 
- struct unpacker;
- 
-diff -ru openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h
---- openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h	2014-06-12 20:14:44.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h	2014-07-15 07:19:52.186682096 +0000
-@@ -27,6 +27,7 @@
- #ifndef MLIB_TYPES_H
- #define MLIB_TYPES_H
- 
-+#include <stddef.h>			/* for NULL */
- #include <limits.h>
- #if defined(_MSC_VER)
- #include <float.h>                      /* for FLT_MAX and DBL_MAX */
-diff -ru openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
---- openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c	2014-06-12 20:14:44.000000000 +0000
-+++ openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c	2014-07-15 07:19:52.186682096 +0000
-@@ -47,7 +47,7 @@
- 
- #include "java_net_Inet4AddressImpl.h"
- 
--#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104))
-+#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104))
- #define HAS_GLIBC_GETHOSTBY_R   1
- #endif
- 
-diff -ru openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c
---- openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c	2014-06-12 20:14:44.000000000 +0000
-+++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c	2014-07-15 07:19:52.186682096 +0000
-@@ -47,7 +47,6 @@
- 
- #ifdef __linux__
- #include <sys/ioctl.h>
--#include <bits/ioctls.h>
- #include <sys/utsname.h>
- #include <stdio.h>
- #endif
-diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
---- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2014-06-12 20:14:44.000000000 +0000
-+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2014-07-15 07:19:52.190015524 +0000
-@@ -35,7 +35,6 @@
- #endif
- #ifdef __linux__
- #include <unistd.h>
--#include <sys/sysctl.h>
- #include <sys/utsname.h>
- #include <netinet/ip.h>
- 
-diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
---- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2014-06-12 20:14:44.000000000 +0000
-+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2014-07-15 07:19:52.190015524 +0000
-@@ -43,7 +43,6 @@
- #endif
- #ifdef __linux__
- #include <unistd.h>
--#include <sys/sysctl.h>
- #endif
- 
- #include "jvm.h"
-diff -ru openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/src/solaris/native/java/net/linux_close.c
---- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c	2014-06-12 20:14:44.000000000 +0000
-+++ openjdk/jdk/src/solaris/native/java/net/linux_close.c	2014-07-15 07:22:17.609355950 +0000
-@@ -75,7 +75,7 @@
- #ifdef _AIX
- static int sigWakeup = (SIGRTMAX - 1);
- #else
--static int sigWakeup = (__SIGRTMAX - 2);
-+static int sigWakeup;
- #endif
- 
- /*
-@@ -148,6 +148,9 @@
-     /*
-      * Setup the signal handler
-      */
-+#ifndef __AIX
-+    sigWakeup = SIGRTMAX - 2;
-+#endif
-     sa.sa_handler = sig_wakeup;
-     sa.sa_flags   = 0;
-     sigemptyset(&sa.sa_mask);
-diff -ru openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
---- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c	2014-06-12 20:14:44.000000000 +0000
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c	2014-07-15 07:19:52.190015524 +0000
-@@ -38,7 +38,7 @@
- #include <sys/signal.h>
- 
- /* Also defined in src/solaris/native/java/net/linux_close.c */
--#define INTERRUPT_SIGNAL (__SIGRTMAX - 2)
-+#define INTERRUPT_SIGNAL (SIGRTMAX - 2)
- 
- static void
- nullHandler(int sig)