- enter 1.3.1 on sparc. due to the small datasize ulimit on sparc -Xmx60

is about as high as you can go. tomcat v4 and demos work but a bit slowly.
This commit is contained in:
kurt 2006-03-20 14:40:24 +00:00
parent 8ffa4e00e1
commit 107e7546a3
15 changed files with 188 additions and 35 deletions

View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.18 2006/02/01 01:04:29 kurt Exp $
# $OpenBSD: Makefile,v 1.19 2006/03/20 14:40:24 kurt Exp $
# $FreeBSD: ports/java/jdk12/Makefile,v 1.11 2002/08/19 20:47:04 glewis Exp $
ONLY_FOR_ARCHS= arm i386 powerpc
ONLY_FOR_ARCHS= arm i386 powerpc sparc
COMMENT= "Java2(TM) Standard Edition Dev Kit v${V}"
COMMENT-jre= "Java2(TM) Standard Edition Runtime Environment v${V}"
V= 1.3.1
DISTNAME= j2sdk-1_3_1-src
PKGNAME= jdk-${V}p6
PKGNAME-jre= jre-${V}p6
PKGNAME= jdk-${V}p7
PKGNAME-jre= jre-${V}p7
CATEGORIES= devel/jdk java
@ -81,7 +81,10 @@ EXTRACT_CASES+= *.bin) \
${WRKDIR}/$$archive.zip && \
unzip -j ${WRKDIR}/$$archive ${LINUXFILES} ;;
. if ${MACHINE_ARCH} == "powerpc"
PATCH_LIST= patch-* pack-patch-*
PATCH_LIST= patch-* powerpc-patch-*
. endif
. if ${MACHINE_ARCH} == "sparc"
PATCH_LIST= patch-* sparc-patch-*
. endif
.endif

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-j2sdk1_3_1_make_com_sun_javah_Makefile,v 1.1 2005/06/03 17:27:54 kurt Exp $
--- j2sdk1.3.1/make/com/sun/javah/Makefile.orig Fri May 27 17:33:35 2005
+++ j2sdk1.3.1/make/com/sun/javah/Makefile Fri May 27 17:34:02 2005
$OpenBSD: patch-j2sdk1_3_1_make_com_sun_javah_Makefile,v 1.2 2006/03/20 14:40:24 kurt Exp $
--- j2sdk1.3.1/make/com/sun/javah/Makefile.orig Fri Mar 17 12:49:36 2006
+++ j2sdk1.3.1/make/com/sun/javah/Makefile Fri Mar 17 13:06:22 2006
@@ -58,7 +58,7 @@ ifeq ($(TRUE_PLATFORM), NetBSD)
OTHER_PROPERTIES = NetBSD_i386.properties
endif
ifeq ($(TRUE_PLATFORM), OpenBSD)
-OTHER_PROPERTIES = OpenBSD_i386.properties
+OTHER_PROPERTIES = OpenBSD_i386.properties OpenBSD_powerpc.properties OpenBSD_arm.properties
+OTHER_PROPERTIES = OpenBSD_i386.properties OpenBSD_powerpc.properties OpenBSD_arm.properties OpenBSD_sparc.properties
endif
endif

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-j2sdk1_3_1_make_common_Defs-bsd_gmk,v 1.2 2005/06/03 17:27:54 kurt Exp $
--- j2sdk1.3.1/make/common/Defs-bsd.gmk.orig Fri Apr 22 12:24:07 2005
+++ j2sdk1.3.1/make/common/Defs-bsd.gmk Fri Apr 22 12:26:53 2005
$OpenBSD: patch-j2sdk1_3_1_make_common_Defs-bsd_gmk,v 1.3 2006/03/20 14:40:25 kurt Exp $
--- j2sdk1.3.1/make/common/Defs-bsd.gmk.orig Fri Mar 17 13:49:44 2006
+++ j2sdk1.3.1/make/common/Defs-bsd.gmk Sat Mar 18 00:14:03 2006
@@ -32,9 +32,9 @@
AR = $(USRBIN_PATH)ar
AS = $(USRBIN_PATH)as
@ -23,6 +23,15 @@ $OpenBSD: patch-j2sdk1_3_1_make_common_Defs-bsd_gmk,v 1.2 2005/06/03 17:27:54 ku
else
archExpr = $(UNAME) -p
endif
@@ -301,7 +301,7 @@ LDFLAGS_OPT =
LDFLAGS_DBG =
# javac Boot Flags
-JAVAC_BOOT_FLAGS = -J-Xmx64m
+JAVAC_BOOT_FLAGS = -J-Xmx60m
#
# Use: ld $(LD_MAPFILE_FLAG) mapfile *.o
@@ -413,7 +413,6 @@ ifeq ($(TRUE_PLATFORM), NetBSD)
else
ifeq ($(TRUE_PLATFORM), OpenBSD)

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-j2sdk1_3_1_make_common_Defs_gmk,v 1.1 2006/03/20 14:40:25 kurt Exp $
--- j2sdk1.3.1/make/common/Defs.gmk.orig Fri Mar 17 21:17:04 2006
+++ j2sdk1.3.1/make/common/Defs.gmk Sat Mar 18 08:27:00 2006
@@ -397,7 +397,11 @@ endif
# passed to javac.
# -- Use JAVAC_CMD if you want to take the defaults given to you.
#
+ifeq ($(ARCH), sparc)
+JAVAC_VMFLAGS = -Xms16m -Xmx60m $(JIT_OPTION)
+else
JAVAC_VMFLAGS = -Xms16m -Xmx256m $(JIT_OPTION)
+endif
JAVAC_VMFLAGS_J = $(patsubst %,-J%,$(JAVAC_VMFLAGS))
JAVAC_SRC_FLAG = -sourcepath "$(SOURCEPATH)"
JAVAC_DST_FLAG = -d $(CLASSDESTDIR)

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-j2sdk1_3_1_make_common_SwingBeans_gmk,v 1.1 2006/03/20 14:40:25 kurt Exp $
--- j2sdk1.3.1/make/common/SwingBeans.gmk.orig Fri Mar 17 21:17:12 2006
+++ j2sdk1.3.1/make/common/SwingBeans.gmk Sat Mar 18 08:27:17 2006
@@ -27,7 +27,11 @@ LOCAL_JAVAC = $(JAVAC)
LOCAL_JAR = $(shell $(CD) $(BINDIR); $(PWD))/jar$(EXE_SUFFIX)
LOCAL_CLASSPATH = "$(CLASSBINDIR)$(CLASSPATH_SEPARATOR)."
PREFIX = 1.2
+ifeq ($(ARCH), sparc)
+JAVADOCFLAGS = -J-ms60m -J-mx60m $(DASHJ_JIT_OPTION)
+else
JAVADOCFLAGS = -J-ms64m -J-mx256m $(DASHJ_JIT_OPTION)
+endif
SWINGPKG = javax/swing
LOCAL_JAVAC_FLAGS =
ABS_TMPDIR = $(shell $(CD) $(TMPDIR); $(PWD))

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-j2sdk1_3_1_make_java_jvm_Makefile,v 1.1 2005/06/03 17:27:54 kurt Exp $
--- j2sdk1.3.1/make/java/jvm/Makefile.orig Mon Nov 22 18:24:20 2004
+++ j2sdk1.3.1/make/java/jvm/Makefile Mon Nov 22 18:29:26 2004
@@ -51,6 +51,15 @@ ifeq ($(TRUE_PLATFORM),OpenBSD)
$OpenBSD: patch-j2sdk1_3_1_make_java_jvm_Makefile,v 1.2 2006/03/20 14:40:25 kurt Exp $
--- j2sdk1.3.1/make/java/jvm/Makefile.orig Fri Mar 17 13:49:45 2006
+++ j2sdk1.3.1/make/java/jvm/Makefile Fri Mar 17 14:07:59 2006
@@ -51,6 +51,18 @@ ifeq ($(TRUE_PLATFORM),OpenBSD)
ifeq ($(ARCH),i386)
USE_C_INTERPRETER = true
endif
@ -11,13 +11,28 @@ $OpenBSD: patch-j2sdk1_3_1_make_java_jvm_Makefile,v 1.1 2005/06/03 17:27:54 kurt
+ ifeq ($(ARCH),powerpc)
+ USE_C_INTERPRETER = true
+ endif
+ ifeq ($(ARCH),sparc)
+ USE_C_INTERPRETER = true
+ endif
+ ifeq ($(ARCH),sparc64)
+ USE_C_INTERPRETER = true
+ endif
endif
ifeq ($(TRUE_PLATFORM),NetBSD)
@@ -125,6 +134,16 @@ ifeq ($(ARCH),i386)
@@ -103,7 +115,11 @@ FILES_c += \
ifeq ($(ARCH),sparc)
ARCHNAME = sparc
+ifeq ($(PLATFORM),solaris)
FILES_s += $(TARGDIR)machgc_$(ARCHNAME).s
+else
+FILES_c += $(TARGDIR)machgc_nonsparc.c
+endif
FILES_s += $(TARGDIR)invokeNative_sparc.s
endif
ifeq ($(ARCH),powerpc)
@@ -125,6 +141,16 @@ ifeq ($(ARCH),i386)
ARCHNAME = p5
FILES_c += $(TARGDIR)machgc_nonsparc.c
FILES_s += $(TARGDIR)invokeNative_x86.s

View File

@ -0,0 +1,7 @@
$OpenBSD: patch-j2sdk1_3_1_src_share_classes_com_sun_tools_javah_resources_OpenBSD_sparc_properties,v 1.1 2006/03/20 14:40:25 kurt Exp $
--- j2sdk1.3.1/src/share/classes/com/sun/tools/javah/resources/OpenBSD_sparc.properties.orig Fri Mar 17 12:48:42 2006
+++ j2sdk1.3.1/src/share/classes/com/sun/tools/javah/resources/OpenBSD_sparc.properties Fri Mar 17 13:03:11 2006
@@ -0,0 +1,3 @@
+# OpenBSD sparc specific properties
+pack.pragma.start=\#pragma pack(4)\n
+pack.pragma.end=\#pragma pack()\n

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_include_context_md_bsd_h,v 1.2 2005/07/14 17:29:09 kurt Exp $
--- j2sdk1.3.1/src/solaris/hpi/green_threads/include/context_md_bsd.h.orig Thu Jul 7 15:44:51 2005
+++ j2sdk1.3.1/src/solaris/hpi/green_threads/include/context_md_bsd.h Sat Jul 9 18:09:22 2005
$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_include_context_md_bsd_h,v 1.3 2006/03/20 14:40:25 kurt Exp $
--- j2sdk1.3.1/src/solaris/hpi/green_threads/include/context_md_bsd.h.orig Thu Mar 16 16:42:43 2006
+++ j2sdk1.3.1/src/solaris/hpi/green_threads/include/context_md_bsd.h Fri Mar 17 12:39:53 2006
@@ -26,6 +26,9 @@ typedef struct lj_ucontext {
context_jmpbuf_t jmpbuf;
#if defined(i386)
char floatbuf[108];
+#elif defined(__arm__)
+#elif defined(__arm__) || defined(__sparc__)
+ unsigned int pc; /* args for death func are stored here */
+ unsigned int arg; /* args for death func are stored here */
#elif defined(__powerpc__)
@ -25,7 +25,21 @@ $OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_include_context_md_bsd_
#elif defined(__powerpc__)
/* jmpbuf contains sigmask, then r8-31 where r11 is the LR
@@ -90,7 +100,7 @@ typedef lj_ucontext_t inner_ucontext_t;
@@ -78,6 +88,13 @@ typedef struct lj_ucontext {
#define BSD_STACK_POINTER 3 /* index in sigjmp_buf of SP (r10) */
#define BSD_LINK_REGISTER 4 /* index in sigjmp_buf of LR (r11) */
+#elif defined(__sparc__)
+
+#define BSD_SIGNAL_MASK 1
+#define BSD_STACK_POINTER 2
+#define BSD_PC 3
+#define BSD_nPC 4
+
#else
#error architecture unsupported
#endif
@@ -90,7 +107,7 @@ typedef lj_ucontext_t inner_ucontext_t;
typedef struct {
unsigned int unix_errno;
@ -34,12 +48,12 @@ $OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_include_context_md_bsd_
void *current_sp;
#endif
inner_ucontext_t lj_ucontext;
@@ -200,6 +210,21 @@ extern int netbsd_siglongjmp(sigjmp_buf
@@ -200,6 +217,21 @@ extern int netbsd_siglongjmp(sigjmp_buf
(contextp)->unix_errno = errno; \
reschedule(); \
} \
+}
+#elif defined(__arm__)
+#elif defined(__arm__) || defined(__sparc__)
+#define getcontext(lj_ucontextp) { \
+ sigsetjmp((lj_ucontextp)->jmpbuf, -1); \
+}

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_context_c,v 1.2 2005/07/14 17:29:09 kurt Exp $
--- j2sdk1.3.1/src/solaris/hpi/green_threads/src/context.c.orig Thu Jul 7 15:44:51 2005
+++ j2sdk1.3.1/src/solaris/hpi/green_threads/src/context.c Sat Jul 9 18:17:31 2005
$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_context_c,v 1.3 2006/03/20 14:40:25 kurt Exp $
--- j2sdk1.3.1/src/solaris/hpi/green_threads/src/context.c.orig Fri Mar 17 13:49:52 2006
+++ j2sdk1.3.1/src/solaris/hpi/green_threads/src/context.c Fri Mar 17 15:06:04 2006
@@ -183,7 +183,7 @@ currentStackPointer(sys_thread_t *tp)
#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
context_t *context = &tp->mdcontext;
@ -10,7 +10,7 @@ $OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_context_c,v 1.2 200
return (void *)CONTEXT(tp)->current_sp;
#elif defined(__NetBSD__) || defined(__OpenBSD__)
return (void *)(uc->jmpbuf[BSD_STACK_POINTER]);
@@ -579,7 +579,35 @@ initContext(lj_ucontext_t *uc, gstack_t
@@ -579,7 +579,60 @@ initContext(lj_ucontext_t *uc, gstack_t
uc->jmpbuf->_sjb[35] = (long)0xACEDBADD; /* magic number for longjmp */
}
@ -43,6 +43,31 @@ $OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_context_c,v 1.2 200
+ *p-- = (int ) 0;
+}
+
+#elif defined(__OpenBSD__) && defined(__sparc__)
+
+void
+initContext(lj_ucontext_t *uc, gstack_t *stack, unsigned int pc,
+ void (*death_func)(void), unsigned int arg)
+{
+ unsigned char *sp;
+ int *p;
+
+ getcontext(uc);
+
+ sp = (unsigned char *)stack->base;
+ sp -= (sizeof(sys_thread_t *) + WINDOWSIZE + SA(MINFRAME));
+ /* Force sp to be double aligned! */
+ sp = (unsigned char *)((unsigned long)(sp) & ~7L);
+
+ uc->pc = pc;
+ uc->arg = arg;
+
+ uc->jmpbuf[BSD_STACK_POINTER] = (unsigned int)sp;
+ uc->jmpbuf[BSD_PC] = (unsigned int)death_func;
+ uc->jmpbuf[BSD_nPC] = (unsigned int)death_func+4;
+
+}
+
+#elif (defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__powerpc__)
/* NetBSD/powerpc version */

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_threads_md_c,v 1.2 2005/07/14 17:29:09 kurt Exp $
--- j2sdk1.3.1/src/solaris/hpi/green_threads/src/threads_md.c.orig Thu Jul 7 15:44:51 2005
+++ j2sdk1.3.1/src/solaris/hpi/green_threads/src/threads_md.c Sat Jul 9 18:18:55 2005
$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_threads_md_c,v 1.3 2006/03/20 14:40:25 kurt Exp $
--- j2sdk1.3.1/src/solaris/hpi/green_threads/src/threads_md.c.orig Fri Mar 17 13:49:52 2006
+++ j2sdk1.3.1/src/solaris/hpi/green_threads/src/threads_md.c Fri Mar 17 15:07:37 2006
@@ -80,8 +80,11 @@ sysThreadCheckStack()
{
sys_thread_t *tid = greenThreadSelf();
@ -19,7 +19,7 @@ $OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_threads_md_c,v 1.2
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
static void
-#if defined(__NetBSD__) && defined(__powerpc__)
+#if defined(__powerpc__) || defined(__arm__)
+#if defined(__powerpc__) || defined(__arm__) || defined(__sparc__)
start_func(lj_ucontext_t *uc)
#else
start_func(void (*func)(int), start_args *args)
@ -31,7 +31,7 @@ $OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_threads_md_c,v 1.2
void (*func)() = (void (*)())uc->pc;
int arg = args->arg;
CONTEXT(args->tid)->current_sp = &func;
+#elif defined(__arm__)
+#elif defined(__arm__) || defined(__sparc__)
+ start_args *args = (start_args *)uc->arg;
+ void (*func)() = (void (*)())uc->pc;
+ int arg = args->arg;

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-j2sdk1_3_1_src_solaris_javavm_runtime_invokeNative_sparc_s,v 1.1 2006/03/20 14:40:25 kurt Exp $
--- j2sdk1.3.1/src/solaris/javavm/runtime/invokeNative_sparc.s.orig Fri Mar 17 14:10:52 2006
+++ j2sdk1.3.1/src/solaris/javavm/runtime/invokeNative_sparc.s Fri Mar 17 14:11:19 2006
@@ -288,7 +288,7 @@ arg_jumps:
.word args_done /* for void - remind: shouldn't happen */
.word args_done /* end-of-args */
-#ifdef __linux__
+#if defined(__linux__) || defined(__OpenBSD__)
.type sysInvokeNative,#function
#else
.type sysInvokeNative,2

View File

@ -1,4 +1,4 @@
$OpenBSD: pack-patch-j2sdk1_3_1_build_bsd-powerpc_tmp_java_java_lang_jvm_CClassHeaders_java_lang_Thread_h,v 1.1 2005/06/03 17:27:54 kurt Exp $
$OpenBSD: powerpc-patch-j2sdk1_3_1_build_bsd-powerpc.1,v 1.1 2006/03/20 14:40:25 kurt Exp $
--- j2sdk1.3.1/build/bsd-powerpc/tmp/java/java.lang/jvm/CClassHeaders/java_lang_Thread.h.orig Fri May 27 18:34:31 2005
+++ j2sdk1.3.1/build/bsd-powerpc/tmp/java/java.lang/jvm/CClassHeaders/java_lang_Thread.h Fri May 27 18:34:57 2005
@@ -11,6 +11,7 @@ struct Hjava_lang_ClassLoader;

View File

@ -1,4 +1,4 @@
$OpenBSD: pack-patch-toolong.1,v 1.1 2005/06/16 14:47:48 kurt Exp $
$OpenBSD: powerpc-patch-j2sdk1_3_1_build_bsd-powerpc.2,v 1.1 2006/03/20 14:40:25 kurt Exp $
--- j2sdk1.3.1/build/bsd-powerpc/tmp/java/java.lang/jvm/CClassHeaders/java_lang_ref_SoftReference.h.orig Fri May 27 18:35:16 2005
+++ j2sdk1.3.1/build/bsd-powerpc/tmp/java/java.lang/jvm/CClassHeaders/java_lang_ref_SoftReference.h Fri May 27 18:35:35 2005
@@ -8,6 +8,7 @@ struct Hjava_lang_Object;

View File

@ -0,0 +1,19 @@
$OpenBSD: sparc-patch-j2sdk1_3_1_build_bsd-sparc.1,v 1.1 2006/03/20 14:40:25 kurt Exp $
--- j2sdk1.3.1/build/bsd-sparc/tmp/java/java.lang/jvm/CClassHeaders/java_lang_Thread.h.orig Wed Nov 3 12:50:27 2004
+++ j2sdk1.3.1/build/bsd-sparc/tmp/java/java.lang/jvm/CClassHeaders/java_lang_Thread.h Fri Mar 17 12:54:59 2006
@@ -11,6 +11,7 @@ struct Hjava_lang_ClassLoader;
struct Hjava_security_AccessControlContext;
struct Hjava_util_Map;
+#pragma pack(4)
typedef struct Classjava_lang_Thread {
struct HArrayOfChar *name;
int32_t priority;
@@ -34,6 +35,7 @@ typedef struct Classjava_lang_Thread {
#undef java_lang_Thread_MAX_PRIORITY
#define java_lang_Thread_MAX_PRIORITY 10L
} Classjava_lang_Thread;
+#pragma pack()
HandleTo(java_lang_Thread);
#ifdef __cplusplus

View File

@ -0,0 +1,19 @@
$OpenBSD: sparc-patch-j2sdk1_3_1_build_bsd-sparc.2,v 1.1 2006/03/20 14:40:25 kurt Exp $
--- j2sdk1.3.1/build/bsd-sparc/tmp/java/java.lang/jvm/CClassHeaders/java_lang_ref_SoftReference.h.orig Wed Nov 3 12:50:27 2004
+++ j2sdk1.3.1/build/bsd-sparc/tmp/java/java.lang/jvm/CClassHeaders/java_lang_ref_SoftReference.h Fri Mar 17 12:55:03 2006
@@ -8,6 +8,7 @@ struct Hjava_lang_Object;
struct Hjava_lang_ref_ReferenceQueue;
struct Hjava_lang_ref_Reference;
+#pragma pack(4)
typedef struct Classjava_lang_ref_SoftReference {
struct Hjava_lang_Object *referent;
struct Hjava_lang_ref_ReferenceQueue *queue;
@@ -17,6 +18,7 @@ typedef struct Classjava_lang_ref_SoftRe
/* Inaccessible static: clock */
int64_t timestamp;
} Classjava_lang_ref_SoftReference;
+#pragma pack()
HandleTo(java_lang_ref_SoftReference);
#ifdef __cplusplus