Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 03 Dec 2001 12:20:54 -0500 (EST)
From:      "Alexander N. Kabaev" <ak03@gte.com>
To:        Fuyuhiko Maruyama <fuyuhik8@is.titech.ac.jp>
Cc:        freebsd-java@FreeBSD.ORG, huang wen hui <huanghwh@yahoo.com>
Subject:   Re: GC is not work in jdk1.3.1p5+OpenJIT1.1.16
Message-ID:  <XFMail.20011203122054.ak03@gte.com>
In-Reply-To: <55her8b8rx.wl@tripper.private>

index | next in thread | previous in thread | raw e-mail

[-- Attachment #1 --]
> The bug has fixed.  In fact, it was very long living, hiding one.
> Thank you, we really didn't know the bug, and it couldn't be fixed
> without your reports.
> 
> Attached patch should fix your problem.
> 
> --
> Fuyuhiko MARUYAMA <fuyuhik8@is.titech.ac.jp>
> Matsuoka laboratory,
> Department of Mathematical and Computing Sciences,
> Graduate School of Information Science and Engineering,
> Tokyo Institute of Technology.

I took time to upgrade OpenJIT port to the latest 1.1.16 release with
your patch included. The diff file is attached. I have tested it only
slightly, but so far it appears to work, even with --enable-jar option,
so I made it on by default.



[-- Attachment #2 --]
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/java/openjit/Makefile,v
retrieving revision 1.1
diff -u -u -r1.1 Makefile
--- Makefile	26 Sep 2000 13:04:29 -0000	1.1
+++ Makefile	3 Dec 2001 16:18:23 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openjit
-PORTVERSION=	1.1.15
+PORTVERSION=	1.1.16
 CATEGORIES=	java
 MASTER_SITES=	http://www.openjit.org/dist/
 DISTNAME=	OpenJIT-${PORTVERSION}
@@ -19,11 +19,11 @@
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-jdk=${JAVADIR}
+CONFIGURE_ARGS+=	--with-jdk=${JAVADIR} --enable-jar
 
 ALL_TARGET=	OpenJIT.jar
 
-JAVADIR=	${LOCALBASE}/jdk1.1.8
+JAVADIR=	${LOCALBASE}/jdk1.3.1
 JAVALIBDIR=	${PREFIX}/lib/OpenJIT
 DOCDIR=		${PREFIX}/share/OpenJIT
 
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/java/openjit/distinfo,v
retrieving revision 1.1
diff -u -u -r1.1 distinfo
--- distinfo	26 Sep 2000 13:04:30 -0000	1.1
+++ distinfo	3 Dec 2001 16:07:33 -0000
@@ -1 +1 @@
-MD5 (OpenJIT-1.1.15.tar.gz) = 249fda720491d62ac2c6188ad1caad55
+MD5 (OpenJIT-1.1.16.tar.gz) = a22b4144c2e56fa2ea4afd67c1196d30
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/java/openjit/files/patch-aa,v
retrieving revision 1.1
diff -u -u -r1.1 patch-aa
--- files/patch-aa	26 Sep 2000 13:04:30 -0000	1.1
+++ files/patch-aa	3 Dec 2001 16:12:29 -0000
@@ -1,27 +1,25 @@
---- Makefile.in.orig	Tue Sep 26 10:43:57 2000
-+++ Makefile.in	Tue Sep 26 15:34:34 2000
-@@ -112,12 +112,12 @@
+--- Makefile.in.orig	Mon Dec  3 11:09:30 2001
++++ Makefile.in	Mon Dec  3 11:12:03 2001
+@@ -112,11 +112,11 @@
  
  .PHONY: all optimized debug clean
  
--all: debug optimized
-+all: optimized
+-all: debug optimized OpenJIT.jar
++all: OpenJIT.jar
  
- library: debug optimized
+ library: debug optimized OpenJIT.jar
  
--OpenJIT.jar:	org/OpenJIT/*.class
--	jar cvf OpenJIT.jar org/OpenJIT/*.class
-+OpenJIT.jar:	all
-+	$(JAVA_HOME)/bin/jar cvf OpenJIT.jar org/OpenJIT/*.class
+-OpenJIT.jar:	debug optimized
++OpenJIT.jar: optimized
+ 	jar cvf OpenJIT.jar org/OpenJIT/*.class
  
  CC = @CC@
- 
 @@ -131,7 +131,7 @@
  OBJDIR          = obj$(SUFFIX)
  
  CFLAGS_COMMON	= -Wall @CFLAGS@
 -CFLAGS_OPT	= -O2
-+CFLAGS_OPT	= -Wall @CFLAGS@
++CFLAGS_OPT	= 
  CFLAGS_DBG	= -g
  CFLAGS		= $(CFLAGS_$(VARIANT)) $(CFLAGS_COMMON) $(OTHER_CFLAGS)
- INCLUDES	= -I@JDK_INCLUDE@ -I@JDK_INCLUDE@/$(PLATFORM) -I./CClassHeaders
+ INCLUDES	= -I@JDK_INCLUDE@ -I@JDK_INCLUDE@/$(PLATFORM) -I@JDK_INCLUDE_OLD@ -I@JDK_INCLUDE_OLD@/$(PLATFORM) -I./CClassHeaders
Index: files/patch-ab
===================================================================
RCS file: /home/ncvs/ports/java/openjit/files/patch-ab,v
retrieving revision 1.1
diff -u -u -r1.1 patch-ab
--- files/patch-ab	26 Sep 2000 13:04:30 -0000	1.1
+++ files/patch-ab	3 Dec 2001 16:13:54 -0000
@@ -1,6 +1,6 @@
---- configure	2000/09/26 12:09:19	1.1
-+++ configure	2000/09/26 12:09:47
-@@ -724,7 +724,7 @@
+--- configure.orig	Mon Dec  3 11:12:56 2001
++++ configure	Mon Dec  3 11:13:30 2001
+@@ -852,7 +852,7 @@
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
Index: files/patch-ac
===================================================================
RCS file: /home/ncvs/ports/java/openjit/files/patch-ac,v
retrieving revision 1.1
diff -u -u -r1.1 patch-ac
--- files/patch-ac	26 Sep 2000 13:04:30 -0000	1.1
+++ files/patch-ac	3 Dec 2001 16:15:58 -0000
@@ -1,20 +1,20 @@
---- INSTALL.orig	Tue Dec 21 05:10:46 1999
-+++ INSTALL	Tue Sep 26 15:58:13 2000
-@@ -2,39 +2,17 @@
+--- INSTALL.orig	Mon Dec  3 11:14:21 2001
++++ INSTALL	Mon Dec  3 11:15:35 2001
+@@ -2,46 +2,6 @@
  
  A Reflective JIT Compiler for Java
  
 -REQUIREMENTS
 -============
--OpenJIT requires a running port of the JDK 1.1.x or 1.2.x on Solaris,
--Linux or FreeBSD platform. Please download JDK 1.1.x or later and
--install it on your system. The current version of OpenJIT was tested
--on the following JDK packages:
+-OpenJIT requires a running port of the JDK 1.1.x or 1.2.x or 1.3.x
+-on Solaris, Linux or FreeBSD platform. Please download JDK 1.1.x or
+-later and install it on your system.  The current version of OpenJIT
+-was tested on the following JDK packages:
 -
 -  * Solaris (SPARC) JDK1.1.8 and JDK1.2.2
 -    downloaded from http://java.sun.com/jdk/
--  * Linux (x86) JDK1.1.7 and JDK1.2.2
--    downloaded from http://www.blackdown.org/
+-  * Linux (x86) JDK1.1.7 and JDK1.2.2 and J2SDK1.3.1
+-    downloaded from http://www.blackdown.org
 -  * FreeBSD (x86) JDK1.1.8
 -    downloaded from http://www.freebsd.org/java/
 -
@@ -31,18 +31,19 @@
 -    $ make
 -    $ make install
 -
+-If you would like to use OpenJIT.jar for OpenJIT package instead of
+-individual classes are placed at /path/to/jdk/jre/classes, you can
+-specify --enable-jar as an option for configure script.  This is
+-experimental, and only work with JDK 1.2.x or later.
+-
+-    $ ./configure --with-jdk=/path/to/jdk --enable-jar
+-    $ make
+-    $ make install
+-
+-On JDK 1.1.x, OpenJIT.jar can be used well if you add path to
+-OpenJIT.jar into your CLASSPATH or java -classpath.
+-
 -
  HOW TO RUN
  ==========
  You may either specify the compiler to the JVM on the command line, or
- you may set an environment variable that will let the JVM find the
- compiler.
-+
-+In both cases first you should set LD_LIBRARY_PATH and CLASSPATH enviropment
-+variables as follows:
-+
-+    $ export LD_LIBRARY_PATH=%%PREFIX%%/lib/OpenJIT
-+    $ export CLASSPATH=%%PREFIX%%/lib/OpenJIT/OpenJIT.jar
- 
- For the command line option, run Java using option "-Djava.compiler=",
- like this example: 
Index: files/patch::rt-X86.c
===================================================================
RCS file: files/patch::rt-X86.c
diff -N files/patch::rt-X86.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch::rt-X86.c	3 Dec 2001 16:17:59 -0000
@@ -0,0 +1,11 @@
+--- rt-X86.c.orig	Fri Sep  7 05:34:36 2001
++++ rt-X86.c	Tue Dec  4 00:41:56 2001
+@@ -1974,7 +1974,7 @@
+     ASM("leave; jmp OpenJIT_invokeinterface_quick");
+ }
+ 
+-static JHandle *
++static JHandle * ATTRIBUTE((stdcall))
+ OpenJIT_newarray(int type, int size)
+ {
+     JHandle *ret;
help

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?XFMail.20011203122054.ak03>