diff options
Diffstat (limited to 'java/jdk16/files')
-rw-r--r-- | java/jdk16/files/patch-PlainDatagramSocketImpl.c | 13 | ||||
-rw-r--r-- | java/jdk16/files/patch-common::Defs-bsd.gmk | 23 | ||||
-rw-r--r-- | java/jdk16/files/patch-common::Defs.gmk | 15 | ||||
-rw-r--r-- | java/jdk16/files/patch-threads_md.c | 11 | ||||
-rw-r--r-- | java/jdk16/files/testos.c | 81 |
5 files changed, 0 insertions, 143 deletions
diff --git a/java/jdk16/files/patch-PlainDatagramSocketImpl.c b/java/jdk16/files/patch-PlainDatagramSocketImpl.c deleted file mode 100644 index c67cba9b612c..000000000000 --- a/java/jdk16/files/patch-PlainDatagramSocketImpl.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ../../j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig Tue Mar 11 10:43:29 2003 -+++ ../../j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c Tue Mar 11 10:43:24 2003 -@@ -2034,9 +2034,7 @@ - /* - * Join the multicast group. - */ --// XXXBSD: fix for BSD (re-implement with KAME ?) --// if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? IP_ADD_MEMBERSHIP:IP_DROP_MEMBERSHIP), -- if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? 1 : 0), -+ if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? IP_ADD_MEMBERSHIP:IP_DROP_MEMBERSHIP), - (char *) &mname, mname_len) < 0) { - - /* diff --git a/java/jdk16/files/patch-common::Defs-bsd.gmk b/java/jdk16/files/patch-common::Defs-bsd.gmk deleted file mode 100644 index 3a0209795bfd..000000000000 --- a/java/jdk16/files/patch-common::Defs-bsd.gmk +++ /dev/null @@ -1,23 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/common/Defs-bsd.gmk.orig Fri Mar 7 01:38:41 2003 -+++ ../../j2se/make/common/Defs-bsd.gmk Fri Mar 7 01:38:01 2003 -@@ -155,7 +155,7 @@ - - # DEVTOOLS_PATH is for other tools required for building (such as - # zip, etc.) --DEVTOOLS_PATH = /usr/local/bin/ -+DEVTOOLS_PATH = ${LOCALBASE}/bin/ - # Allow the user to override the default value... - ifdef ALT_DEVTOOLS_PATH - DEVTOOLS_PATH = $(subst //,/,$(ALT_DEVTOOLS_PATH)/) -@@ -194,7 +194,8 @@ - endif # PLATFORM_SRC - - # platform specific include files --PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM) -+TRUE_PLATFORM_INCLUDE := $(shell $(ECHO) $(TRUE_PLATFORM) | $(TR) "[:upper:]" "[:lower:]") -+PLATFORM_INCLUDE = $(INCLUDEDIR)/$(TRUE_PLATFORM_INCLUDE) - - # - # Default BOOTDIR diff --git a/java/jdk16/files/patch-common::Defs.gmk b/java/jdk16/files/patch-common::Defs.gmk deleted file mode 100644 index 97e5d53cb796..000000000000 --- a/java/jdk16/files/patch-common::Defs.gmk +++ /dev/null @@ -1,15 +0,0 @@ ---- ../../j2se/make/common/Defs.gmk.orig Tue Mar 11 11:27:27 2003 -+++ ../../j2se/make/common/Defs.gmk Tue Mar 11 11:27:06 2003 -@@ -456,6 +456,12 @@ - JAVAH_CMD = $(BINDIR)/javah - endif - endif -+ # XXXBSD: Debug binaries are causing problems on early K6 processors -+ # and SMP machines. Don't use javah_g, until above problems resolved. -+ # --phantom -+ ifeq ($(PLATFORM), bsd) -+ JAVAH_CMD = $(BINDIR)/javah -+ endif - RMIC = $(BINDIR)/rmic$(SUFFIX) - endif - diff --git a/java/jdk16/files/patch-threads_md.c b/java/jdk16/files/patch-threads_md.c deleted file mode 100644 index c94a0a21e6b6..000000000000 --- a/java/jdk16/files/patch-threads_md.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ../../j2se/src/solaris/hpi/native_threads/src/threads_md.c.orig Thu Mar 13 11:46:02 2003 -+++ ../../j2se/src/solaris/hpi/native_threads/src/threads_md.c Thu Mar 13 11:46:12 2003 -@@ -19,7 +19,7 @@ - #include <assert.h> - #include <setjmp.h> - #include <signal.h> --#include <time.h> -+#include <sys/time.h> - #include <sys/types.h> - #include <sys/signal.h> - #include <sys/resource.h> diff --git a/java/jdk16/files/testos.c b/java/jdk16/files/testos.c deleted file mode 100644 index e5c24160901d..000000000000 --- a/java/jdk16/files/testos.c +++ /dev/null @@ -1,81 +0,0 @@ -/*- - * Copyright (c) 2003 Alexey Zelkin <phantom@FreeBSD.org> - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * Test pthreads primitives for required functionality in order to run - * native FreeBSD JDK1.4.1 port. - * - * Returns: - * 0 - test passed - * 1 - general failure - * 200 - tests failed - * - * $FreeBSD$ - */ - -#include <stdio.h> -#include <pthread.h> -#include <pthread_np.h> - -#define TRY(call) { \ - if ((call) != 0) { \ - printf("LIBC_R TEST: Unexpected error. Report to MAINTAINER\n"); \ - exit(200); \ - } \ -} - -void * -doit(void *data) -{ - pthread_attr_t attr; - void *mystack = NULL; - - TRY(pthread_attr_init(&attr)); - TRY(pthread_attr_get_np(pthread_self(), &attr)); - TRY(pthread_attr_getstackaddr(&attr, &mystack)); - - if (mystack == NULL) { - printf("LIBC_R TEST FAILED: libc_r update required\n"); - exit(1); - } - - printf("LIBC_R TEST PASSED: All Ok\n"); - return(NULL); -} - -int -main() -{ - pthread_t tid; - pthread_attr_t attr; - - int sz = 128*1024; - - TRY(pthread_attr_init(&attr)); - TRY(pthread_attr_setstacksize(&attr, sz)); - TRY(pthread_create(&tid, &attr, doit, NULL)); - TRY(pthread_join(tid, NULL)); - - exit(0); -} |