[kaffe] CVS kaffe (dalibor): Fixed parisc-hpux build again

Kaffe CVS cvs-commits at kaffe.org
Sat Oct 4 11:55:03 PDT 2003


PatchSet 4086 
Date: 2003/10/04 18:52:47
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixed parisc-hpux build again

Helmer added the SIGNAL_ARGS and friends for parisc linux and hp-ux.
Removed the mprotect functionality in the gc as it was causing
crashes on hp-ux. Removed unused md.c files. Fixed problem where
a check for a builtin preprocessor define for hp-ux failed.

Members: 
	ChangeLog:1.1681->1.1682 
	configure:1.260->1.261 
	configure.in:1.226->1.227 
	config/Makefile.am:1.26->1.27 
	config/Makefile.in:1.88->1.89 
	config/config.h.in:1.81->1.82 
	config/parisc/hpux/md.c:1.2->1.3(DEAD) 
	config/parisc/hpux/md.h:1.2->1.3 
	config/parisc/linux/md.c:1.2->1.3(DEAD) 
	config/parisc/linux/md.h:1.1->1.2 
	kaffe/kaffevm/mem/gc-mem.c:1.48->1.49 
	kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.100->1.101 
	libraries/javalib/Makefile.am:1.136->1.137 
	libraries/javalib/Makefile.in:1.184->1.185 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1681 kaffe/ChangeLog:1.1682
--- kaffe/ChangeLog:1.1681	Thu Oct  2 20:12:16 2003
+++ kaffe/ChangeLog	Sat Oct  4 18:52:47 2003
@@ -1,3 +1,48 @@
+2003-10-04  Dalibor Topic <robilad at kaffe.org>
+
+	* configure.in:
+	Don't check for mprotect.
+
+	* configure, config/config.h.in:
+	Regenerated. 
+
+	* config/Makefile.am:
+	(EXTRA_DIST) Removed unused files parisc/hpux/md.c and
+	parisc/linux/md.c
+
+	* config/Makefile.in:
+	Regenerated.
+
+	* kaffe/kaffevm/mem/gc-mem.c:
+	Don't include <sys/mman.h> as we no longer use mprotect.
+	[PROT_NONE, HAVE_MPROTECT] Sections removed.
+	(gc_block_add,  gc_block_rm, gc_block_alloc) Don't use mprotect
+	on memory allocated by sbrk. It breaks on HP-UX.
+	
+	* kaffe/kaffevm/systems/unix-jthreads/jthread.c:
+	(jthreadedFileDescriptor) check if either hpux or __hpux__ is 
+	defined. Gcc automatically defines one or the other depending 
+	on some internals of hp-ux that don't matter in this case.
+
+	* libraries/javalib/Makefile.am, libraries/javalib/Makefile.in:
+	Regenerated.
+
+2003-10-04  Helmer Kraemer <hkraemer at kaffe.org>
+
+	* config/parisc/hpux/md.h:
+	Include siginfo.h and ucontext.h.
+	(SIGNAL_ARGS, SIGNAL_CONTEXT_POINTER, 
+	GET_SIGNAL_CONTEXT_POINTER, SIGNAL_PC) New macros.
+
+	* config/parisc/linux/md.h:
+	Include signal.h and ucontext.h.
+	(SIGNAL_ARGS, SIGNAL_CONTEXT_POINTER, 
+	GET_SIGNAL_CONTEXT_POINTER, SIGNAL_PC) New macros.
+
+	* config/parisc/hpux/md.c,
+	config/parisc/linux/md.c:
+	Removed.
+
 2003-10-02  Dalibor Topic  <robilad at kaffe.org>
 
 	* config/arm/jit.h, config/arm/riscos/md.h:
Index: kaffe/configure
diff -u kaffe/configure:1.260 kaffe/configure:1.261
--- kaffe/configure:1.260	Thu Sep 25 13:16:33 2003
+++ kaffe/configure	Sat Oct  4 18:52:49 2003
@@ -40565,8 +40565,7 @@
 done
 
 
-
-for ac_func in mprotect madvise
+for ac_func in madvise
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
Index: kaffe/configure.in
diff -u kaffe/configure.in:1.226 kaffe/configure.in:1.227
--- kaffe/configure.in:1.226	Thu Sep 25 13:16:37 2003
+++ kaffe/configure.in	Sat Oct  4 18:52:51 2003
@@ -1126,7 +1126,7 @@
 AC_CHECK_FUNCS([alarm setitimer])
 AC_CHECK_FUNCS([sigprocmask sigsetmask sigemptyset sigaddset signal sigaction])
 AC_CHECK_FUNCS([sbrk valloc memalign mallopt])
-AC_CHECK_FUNCS([mprotect madvise])
+AC_CHECK_FUNCS([madvise])
 AC_CHECK_FUNCS([waitpid kill fork execve execvp])
 AC_CHECK_FUNCS([sync fsync ftruncate])
 AC_CHECK_FUNCS([atexit on_exit vsnprintf snprintf])
Index: kaffe/config/Makefile.am
diff -u kaffe/config/Makefile.am:1.26 kaffe/config/Makefile.am:1.27
--- kaffe/config/Makefile.am:1.26	Mon Jun  2 04:34:02 2003
+++ kaffe/config/Makefile.am	Sat Oct  4 18:52:52 2003
@@ -234,10 +234,8 @@
 	mips/ultrix4/md.h \
 	parisc/common.h \
 	parisc/hpux/config.frag \
-	parisc/hpux/md.c \
 	parisc/hpux/md.h \
 	parisc/linux/config.frag \
-	parisc/linux/md.c \
 	parisc/linux/md.h \
 	parisc/threads.h \
 	powerpc/aix/config.frag \
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.88 kaffe/config/Makefile.in:1.89
--- kaffe/config/Makefile.in:1.88	Sun Sep 14 20:09:35 2003
+++ kaffe/config/Makefile.in	Sat Oct  4 18:52:52 2003
@@ -470,10 +470,8 @@
 	mips/ultrix4/md.h \
 	parisc/common.h \
 	parisc/hpux/config.frag \
-	parisc/hpux/md.c \
 	parisc/hpux/md.h \
 	parisc/linux/config.frag \
-	parisc/linux/md.c \
 	parisc/linux/md.h \
 	parisc/threads.h \
 	powerpc/aix/config.frag \
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.81 kaffe/config/config.h.in:1.82
--- kaffe/config/config.h.in:1.81	Thu Sep 25 13:16:38 2003
+++ kaffe/config/config.h.in	Sat Oct  4 18:52:52 2003
@@ -301,9 +301,6 @@
 /* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
-/* Define to 1 if you have the `mprotect' function. */
-#undef HAVE_MPROTECT
-
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 
===================================================================
Checking out kaffe/config/parisc/hpux/md.c
RCS:  /home/cvs/kaffe/kaffe/config/parisc/hpux/Attic/md.c,v
VERS: 1.2
***************
--- kaffe/config/parisc/hpux/md.c	Sat Oct  4 18:54:52 2003
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,88 +0,0 @@
-/*
- * parisc/hpux/md.c
- * HP-UX PArisc specific functions.
- *
- * Copyright (c) 1996, 1997
- *	Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution 
- * of this file. 
- */
-
-   asm(".text \n"
-"        .align 4 \n"
-"        .EXPORT parisc_threadswitch,ENTRY,PRIV_LEV=3,RTNVAL=GR \n"
-"parisc_threadswitch \n"
-"        .PROC \n"
-"        .CALLINFO FRAME=192 \n"
-"        .ENTRY \n"
-"        ldo 192(%r30),%r30 \n"
-"        stw %r2,-180(0,%r30) \n"
-"        stw %r2,-176(0,%r30) \n"
-"        stw %r3,-172(0,%r30) \n"
-"        stw %r4,-168(0,%r30) \n"
-"        stw %r5,-164(0,%r30) \n"
-"        stw %r6,-160(0,%r30) \n"
-"        stw %r7,-156(0,%r30) \n"
-"        stw %r8,-152(0,%r30) \n"
-"        stw %r9,-148(0,%r30) \n"
-"        stw %r10,-144(0,%r30) \n"
-"        stw %r11,-140(0,%r30) \n"
-"        stw %r12,-136(0,%r30) \n"
-"        stw %r13,-132(0,%r30) \n"
-"        stw %r14,-128(0,%r30) \n"
-"        stw %r15,-124(0,%r30) \n"
-"        stw %r16,-120(0,%r30) \n"
-"        stw %r17,-116(0,%r30) \n"
-"        stw %r18,-112(0,%r30) \n"
-"        ldo -104(%r30),%r1 \n"
-"        fstds,ma %fr12,8(0,%r1) \n"
-"        fstds,ma %fr13,8(0,%r1) \n"
-"        fstds,ma %fr14,8(0,%r1) \n"
-"        fstds,ma %fr15,8(0,%r1) \n"
-"        fstds,ma %fr16,8(0,%r1) \n"
-"        fstds,ma %fr17,8(0,%r1) \n"
-"        fstds,ma %fr18,8(0,%r1) \n"
-"        fstds,ma %fr19,8(0,%r1) \n"
-"        fstds,ma %fr20,8(0,%r1) \n"
-"        fstds,ma %fr21,8(0,%r1) \n"
-"        stw %r30,0(0,%r26) \n"
-"        ldw 0(0,%r25),%r30 \n"
-"        ldw -172(0,%r30),%r3 \n"
-"        ldw -168(0,%r30),%r4 \n"
-"        ldw -164(0,%r30),%r5 \n"
-"        ldw -160(0,%r30),%r6 \n"
-"        ldw -156(0,%r30),%r7 \n"
-"        ldw -152(0,%r30),%r8 \n"
-"        ldw -148(0,%r30),%r9 \n"
-"        ldw -144(0,%r30),%r10 \n"
-"        ldw -140(0,%r30),%r11 \n"
-"        ldw -136(0,%r30),%r12 \n"
-"        ldw -132(0,%r30),%r13 \n"
-"        ldw -128(0,%r30),%r14 \n"
-"        ldw -124(0,%r30),%r15 \n"
-"        ldw -120(0,%r30),%r16 \n"
-"        ldw -116(0,%r30),%r17 \n"
-"        ldw -112(0,%r30),%r18 \n"
-"        ldo -104(%r30),%r1 \n"
-"        fldds,ma 8(0,%r1),%fr12 \n"
-"        fldds,ma 8(0,%r1),%fr13 \n"
-"        fldds,ma 8(0,%r1),%fr14 \n"
-"        fldds,ma 8(0,%r1),%fr15 \n"
-"        fldds,ma 8(0,%r1),%fr16 \n"
-"        fldds,ma 8(0,%r1),%fr17 \n"
-"        fldds,ma 8(0,%r1),%fr18 \n"
-"        fldds,ma 8(0,%r1),%fr19 \n"
-"        fldds,ma 8(0,%r1),%fr20 \n"
-"        fldds,ma 8(0,%r1),%fr21 \n"
-"        ldw -180(0,%r30),%r2 \n"
-"	comib,<> 0,%r2,__nodyncall \n"
-"        nop \n"
-"        ldw -176(0,%r30),%r22 \n"
-"        ldo -192(%r30),%r30 \n"
-"        b,n $$dyncall \n"
-"__nodyncall: \n"
-"        bv 0(%r2) \n"
-"        ldo -192(%r30),%r30 \n"
-"        .EXIT \n"
-"        .PROCEND \n");
Index: kaffe/config/parisc/hpux/md.h
diff -u kaffe/config/parisc/hpux/md.h:1.2 kaffe/config/parisc/hpux/md.h:1.3
--- kaffe/config/parisc/hpux/md.h:1.2	Tue Aug 25 07:05:00 1998
+++ kaffe/config/parisc/hpux/md.h	Sat Oct  4 18:52:55 2003
@@ -16,5 +16,12 @@
 #include "parisc/threads.h"
 
 #define	LIBRARYPATH	"SHLIB_PATH"
- 
+
+#include <siginfo.h>
+#include <ucontext.h>
+#define SIGNAL_ARGS(sig, sc) int sig, siginfo_t* sip, ucontext_t* sc
+#define SIGNAL_CONTEXT_POINTER(scp) ucontext_t *scp
+#define GET_SIGNAL_CONTEXT_POINTER(sc) (sc)
+#define SIGNAL_PC(scp) ((scp)->uc_mcontext.gregs[EIP]) 
+
 #endif
===================================================================
Checking out kaffe/config/parisc/linux/md.c
RCS:  /home/cvs/kaffe/kaffe/config/parisc/linux/Attic/md.c,v
VERS: 1.2
***************
--- kaffe/config/parisc/linux/md.c	Sat Oct  4 18:54:53 2003
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,88 +0,0 @@
-/*
- * parisc/linux/md.c
- * Linux PArisc specific functions.
- *
- * Copyright (c) 1996, 1997
- *     Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution 
- * of this file. 
- */
-
-   asm(".text \n"
-"        .align 4 \n"
-"        .EXPORT parisc_threadswitch,ENTRY,PRIV_LEV=3,RTNVAL=GR \n"
-"parisc_threadswitch: \n"
-"        .PROC \n"
-"        .CALLINFO FRAME=192 \n"
-"        .ENTRY \n"
-"        ldo 192(%r30),%r30 \n"
-"        stw %r2,-180(0,%r30) \n"
-"        stw %r2,-176(0,%r30) \n"
-"        stw %r3,-172(0,%r30) \n"
-"        stw %r4,-168(0,%r30) \n"
-"        stw %r5,-164(0,%r30) \n"
-"        stw %r6,-160(0,%r30) \n"
-"        stw %r7,-156(0,%r30) \n"
-"        stw %r8,-152(0,%r30) \n"
-"        stw %r9,-148(0,%r30) \n"
-"        stw %r10,-144(0,%r30) \n"
-"        stw %r11,-140(0,%r30) \n"
-"        stw %r12,-136(0,%r30) \n"
-"        stw %r13,-132(0,%r30) \n"
-"        stw %r14,-128(0,%r30) \n"
-"        stw %r15,-124(0,%r30) \n"
-"        stw %r16,-120(0,%r30) \n"
-"        stw %r17,-116(0,%r30) \n"
-"        stw %r18,-112(0,%r30) \n"
-"        ldo -104(%r30),%r1 \n"
-"        fstds,ma %fr12,8(0,%r1) \n"
-"        fstds,ma %fr13,8(0,%r1) \n"
-"        fstds,ma %fr14,8(0,%r1) \n"
-"        fstds,ma %fr15,8(0,%r1) \n"
-"        fstds,ma %fr16,8(0,%r1) \n"
-"        fstds,ma %fr17,8(0,%r1) \n"
-"        fstds,ma %fr18,8(0,%r1) \n"
-"        fstds,ma %fr19,8(0,%r1) \n"
-"        fstds,ma %fr20,8(0,%r1) \n"
-"        fstds,ma %fr21,8(0,%r1) \n"
-"        stw %r30,0(0,%r26) \n"
-"        ldw 0(0,%r25),%r30 \n"
-"        ldw -172(0,%r30),%r3 \n"
-"        ldw -168(0,%r30),%r4 \n"
-"        ldw -164(0,%r30),%r5 \n"
-"        ldw -160(0,%r30),%r6 \n"
-"        ldw -156(0,%r30),%r7 \n"
-"        ldw -152(0,%r30),%r8 \n"
-"        ldw -148(0,%r30),%r9 \n"
-"        ldw -144(0,%r30),%r10 \n"
-"        ldw -140(0,%r30),%r11 \n"
-"        ldw -136(0,%r30),%r12 \n"
-"        ldw -132(0,%r30),%r13 \n"
-"        ldw -128(0,%r30),%r14 \n"
-"        ldw -124(0,%r30),%r15 \n"
-"        ldw -120(0,%r30),%r16 \n"
-"        ldw -116(0,%r30),%r17 \n"
-"        ldw -112(0,%r30),%r18 \n"
-"        ldo -104(%r30),%r1 \n"
-"        fldds,ma 8(0,%r1),%fr12 \n"
-"        fldds,ma 8(0,%r1),%fr13 \n"
-"        fldds,ma 8(0,%r1),%fr14 \n"
-"        fldds,ma 8(0,%r1),%fr15 \n"
-"        fldds,ma 8(0,%r1),%fr16 \n"
-"        fldds,ma 8(0,%r1),%fr17 \n"
-"        fldds,ma 8(0,%r1),%fr18 \n"
-"        fldds,ma 8(0,%r1),%fr19 \n"
-"        fldds,ma 8(0,%r1),%fr20 \n"
-"        fldds,ma 8(0,%r1),%fr21 \n"
-"        ldw -180(0,%r30),%r2 \n"
-"       comib,<> 0,%r2,__nodyncall \n"
-"        nop \n"
-"        ldw -176(0,%r30),%r22 \n"
-"        ldo -192(%r30),%r30 \n"
-"        b,n $$dyncall \n"
-"__nodyncall: \n"
-"        bv 0(%r2) \n"
-"        ldo -192(%r30),%r30 \n"
-"        .EXIT \n"
-"        .PROCEND \n");
Index: kaffe/config/parisc/linux/md.h
diff -u kaffe/config/parisc/linux/md.h:1.1 kaffe/config/parisc/linux/md.h:1.2
--- kaffe/config/parisc/linux/md.h:1.1	Fri Apr 26 07:49:13 2002
+++ kaffe/config/parisc/linux/md.h	Sat Oct  4 18:52:55 2003
@@ -5,6 +5,9 @@
  * Copyright (c) 1996, 1997
  *     Transvirtual Technologies, Inc.  All rights reserved.
  *
+ * Copyright (c) 2003
+ *     Helmer Kraemer <hkraemer at kaffe.org>. All rights reserved.
+ *
  * See the file "license.terms" for information on usage and redistribution 
  * of this file. 
  */
@@ -19,5 +22,12 @@
 #undef SP_OFFSET
 #define SP_OFFSET       19
 
+#include <signal.h>
+#include <ucontext.h>
+
+#define SIGNAL_ARGS(sig, sc) int sig, siginfo_t *parisc_info, ucontext_t *sc
+#define SIGNAL_CONTEXT_POINTER(scp) ucontext_t *scp
+#define GET_SIGNAL_CONTEXT_POINTER(sc) (sc)
+#define SIGNAL_PC(scp) (scp->uc_mcontext.sc_iaoq[0])
         
 #endif
Index: kaffe/kaffe/kaffevm/mem/gc-mem.c
diff -u kaffe/kaffe/kaffevm/mem/gc-mem.c:1.48 kaffe/kaffe/kaffevm/mem/gc-mem.c:1.49
--- kaffe/kaffe/kaffevm/mem/gc-mem.c:1.48	Mon Sep 29 10:01:59 2003
+++ kaffe/kaffe/kaffevm/mem/gc-mem.c	Sat Oct  4 18:52:55 2003
@@ -27,9 +27,6 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#if defined(HAVE_MPROTECT) && defined(KAFFE_VMDEBUG)
-#include <sys/mman.h>
-#endif
 
 static iStaticLock	gc_heap_lock;
 
@@ -590,35 +587,18 @@
 static gc_block *gc_last_block;
 static gc_block *gc_prim_freelist[GC_PRIM_LIST_COUNT+1];
 
-
-#ifndef PROT_NONE
-#define PROT_NONE 0
-#endif
-
-#if !defined(HAVE_MPROTECT) || !defined(KAFFE_VMDEBUG)
-#define mprotect(A,L,P)
-#define ALL_PROT
-#define NO_PROT
-#else
-/* In a sense, this is backwards. */
-#define ALL_PROT PROT_READ|PROT_WRITE|PROT_EXEC
-#define NO_PROT  PROT_NONE
-#endif
-
 /* Mark a primitive block as used */
 static inline void 
 gc_block_add(gc_block *b)
 {
-	b->nr = 1;
-	mprotect(GCBLOCK2BASE(b), b->size, ALL_PROT);
+  b->nr = 1;
 }
 
 /* Mark a primitive block as unused */
 static inline void 
 gc_block_rm(gc_block *b)
 {
-	b->nr = 0;
-	mprotect(GCBLOCK2BASE(b), b->size, NO_PROT);
+  b->nr = 0;
 }
 
 /* return the prim list blk belongs to */
@@ -1038,7 +1018,6 @@
 	gc_heap_range = last_addr - gc_heap_base;
 	DBG(GCSYSALLOC, dprintf("%ld unused bytes in heap addr range\n",
 				(long) (gc_heap_range - gc_heap_total)));
-	mprotect((void *) heap_addr, size, NO_PROT);
 	return GCMEM2BLOCK(heap_addr);
 }
 
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.100 kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.101
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.100	Sat Aug 30 23:57:12 2003
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c	Sat Oct  4 18:52:56 2003
@@ -2326,11 +2326,11 @@
 jthreadedFileDescriptor(int fd)
 {
 	int r;
-#if (defined(FIOSSAIOSTAT) && !(defined(hpux) && defined(FIOASYNC))) || \
+#if (defined(FIOSSAIOSTAT) && !((defined(hpux) || defined (__hpux__)) && defined(FIOASYNC))) || \
     (defined(FIOASYNC) && !defined(linux))
 	int on = 1;
 #endif
-#if (defined(FIOSSAIOOWN) && !(defined(hpux) && defined(F_SETOWN))) || \
+#if (defined(FIOSSAIOOWN) && !((defined(hpux) || defined (__hpux__)) && defined(F_SETOWN))) || \
     defined(F_SETOWN)
 	/* cache pid to accommodate antique C libraries */
 	static int pid = -1;
@@ -2367,7 +2367,7 @@
 #endif
 		);
 
-#if defined(FIOSSAIOSTAT) && !(defined(hpux) && defined(FIOASYNC))
+#if defined(FIOSSAIOSTAT) && !((defined(hpux) || defined (__hpux__)) && defined(FIOASYNC))
 	r = ioctl(fd, FIOSSAIOSTAT, &on);
 	if (r < 0 && errno != ENOTTY) {
 		/* Defines ENOTTY to be an acceptable error */
@@ -2397,7 +2397,7 @@
 
 
 	/* Allow socket to signal this process when new data is available */
-#if defined(FIOSSAIOOWN) && !(defined(hpux) && defined(F_SETOWN))
+#if defined(FIOSSAIOOWN) && !((defined(hpux) || defined (__hpux__)) && defined(F_SETOWN))
 	r = ioctl(fd, FIOSSAIOOWN, &pid);
         if (r == -1 && errno != ENOTTY) {
 		perror("Error doing FIOSSAIOWN");
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.136 kaffe/libraries/javalib/Makefile.am:1.137
--- kaffe/libraries/javalib/Makefile.am:1.136	Sun Sep 28 19:53:57 2003
+++ kaffe/libraries/javalib/Makefile.am	Sat Oct  4 18:52:57 2003
@@ -227,10 +227,11 @@
 gnu_java_lang_reflect_SRCS = \
 	gnu/java/lang/reflect/TypeSignature.java
 gnu_java_locale_SRCS = \
+	gnu/java/locale/Calendar.java \
 	gnu/java/locale/Calendar_de.java \
 	gnu/java/locale/Calendar_en.java \
-	gnu/java/locale/Calendar.java \
 	gnu/java/locale/Calendar_nl.java \
+	gnu/java/locale/LocaleInformation.java \
 	gnu/java/locale/LocaleInformation_af_ZA.java \
 	gnu/java/locale/LocaleInformation_ar_AE.java \
 	gnu/java/locale/LocaleInformation_ar_BH.java \
@@ -257,13 +258,14 @@
 	gnu/java/locale/LocaleInformation_cs_CZ.java \
 	gnu/java/locale/LocaleInformation_cy_GB.java \
 	gnu/java/locale/LocaleInformation_da_DK.java \
+	gnu/java/locale/LocaleInformation_de.java \
 	gnu/java/locale/LocaleInformation_de_AT.java \
 	gnu/java/locale/LocaleInformation_de_BE.java \
 	gnu/java/locale/LocaleInformation_de_CH.java \
 	gnu/java/locale/LocaleInformation_de_DE.java \
-	gnu/java/locale/LocaleInformation_de.java \
 	gnu/java/locale/LocaleInformation_de_LU.java \
 	gnu/java/locale/LocaleInformation_el_GR.java \
+	gnu/java/locale/LocaleInformation_en.java \
 	gnu/java/locale/LocaleInformation_en_AU.java \
 	gnu/java/locale/LocaleInformation_en_BW.java \
 	gnu/java/locale/LocaleInformation_en_CA.java \
@@ -272,7 +274,6 @@
 	gnu/java/locale/LocaleInformation_en_HK.java \
 	gnu/java/locale/LocaleInformation_en_IE.java \
 	gnu/java/locale/LocaleInformation_en_IN.java \
-	gnu/java/locale/LocaleInformation_en.java \
 	gnu/java/locale/LocaleInformation_en_NZ.java \
 	gnu/java/locale/LocaleInformation_en_PH.java \
 	gnu/java/locale/LocaleInformation_en_SG.java \
@@ -322,7 +323,6 @@
 	gnu/java/locale/LocaleInformation_it_IT.java \
 	gnu/java/locale/LocaleInformation_iw_IL.java \
 	gnu/java/locale/LocaleInformation_ja_JP.java \
-	gnu/java/locale/LocaleInformation.java \
 	gnu/java/locale/LocaleInformation_ka_GE.java \
 	gnu/java/locale/LocaleInformation_kl_GL.java \
 	gnu/java/locale/LocaleInformation_ko_KR.java \
@@ -333,8 +333,8 @@
 	gnu/java/locale/LocaleInformation_mk_MK.java \
 	gnu/java/locale/LocaleInformation_mr_IN.java \
 	gnu/java/locale/LocaleInformation_mt_MT.java \
-	gnu/java/locale/LocaleInformation_nl_BE.java \
 	gnu/java/locale/LocaleInformation_nl.java \
+	gnu/java/locale/LocaleInformation_nl_BE.java \
 	gnu/java/locale/LocaleInformation_nl_NL.java \
 	gnu/java/locale/LocaleInformation_nn_NO.java \
 	gnu/java/locale/LocaleInformation_no_NO.java \
@@ -389,10 +389,10 @@
 	gnu/java/nio/charset/ISO_8859_1.java \
 	gnu/java/nio/charset/Provider.java \
 	gnu/java/nio/charset/US_ASCII.java \
+	gnu/java/nio/charset/UTF_16.java \
 	gnu/java/nio/charset/UTF_16BE.java \
 	gnu/java/nio/charset/UTF_16Decoder.java \
 	gnu/java/nio/charset/UTF_16Encoder.java \
-	gnu/java/nio/charset/UTF_16.java \
 	gnu/java/nio/charset/UTF_16LE.java \
 	gnu/java/nio/charset/UTF_8.java
 gnu_java_rmi_SRCS = \
@@ -412,8 +412,8 @@
 	gnu/java/rmi/rmic/Compile_kjc.java \
 	gnu/java/rmi/rmic/Compiler.java \
 	gnu/java/rmi/rmic/CompilerProcess.java \
-	gnu/java/rmi/rmic/RMICException.java \
 	gnu/java/rmi/rmic/RMIC.java \
+	gnu/java/rmi/rmic/RMICException.java \
 	gnu/java/rmi/rmic/TabbedWriter.java
 gnu_java_rmi_server_SRCS = \
 	gnu/java/rmi/server/ConnectionRunnerPool.java \
@@ -435,8 +435,8 @@
 	gnu/java/security/OID.java
 gnu_java_security_der_SRCS = \
 	gnu/java/security/der/BitString.java \
-	gnu/java/security/der/DEREncodingException.java \
 	gnu/java/security/der/DER.java \
+	gnu/java/security/der/DEREncodingException.java \
 	gnu/java/security/der/DERReader.java \
 	gnu/java/security/der/DERValue.java \
 	gnu/java/security/der/DERWriter.java
@@ -468,25 +468,25 @@
 	gnu/javax/rmi/CORBA/UtilDelegateImpl.java \
 	gnu/javax/rmi/CORBA/ValueHandlerImpl.java
 gnu_regexp_SRCS = \
+	gnu/regexp/CharIndexed.java \
 	gnu/regexp/CharIndexedCharArray.java \
 	gnu/regexp/CharIndexedInputStream.java \
-	gnu/regexp/CharIndexed.java \
 	gnu/regexp/CharIndexedReader.java \
-	gnu/regexp/CharIndexedStringBuffer.java \
 	gnu/regexp/CharIndexedString.java \
+	gnu/regexp/CharIndexedStringBuffer.java \
+	gnu/regexp/RE.java \
 	gnu/regexp/REException.java \
 	gnu/regexp/REFilterInputStream.java \
 	gnu/regexp/REFilterReader.java \
-	gnu/regexp/RE.java \
-	gnu/regexp/REMatchEnumeration.java \
 	gnu/regexp/REMatch.java \
+	gnu/regexp/REMatchEnumeration.java \
 	gnu/regexp/RESyntax.java \
+	gnu/regexp/REToken.java \
 	gnu/regexp/RETokenAny.java \
 	gnu/regexp/RETokenBackRef.java \
 	gnu/regexp/RETokenChar.java \
 	gnu/regexp/RETokenEnd.java \
 	gnu/regexp/RETokenEndSub.java \
-	gnu/regexp/REToken.java \
 	gnu/regexp/RETokenLookAhead.java \
 	gnu/regexp/RETokenOneOf.java \
 	gnu/regexp/RETokenPOSIX.java \
@@ -539,30 +539,30 @@
 	gnu/xml/pipeline/XIncludeFilter.java \
 	gnu/xml/pipeline/XsltFilter.java
 gnu_xml_util_SRCS = \
-	gnu/xml/util/DomParser.java \
 	gnu/xml/util/DoParse.java \
+	gnu/xml/util/DomParser.java \
 	gnu/xml/util/Resolver.java \
 	gnu/xml/util/SAXNullTransformerFactory.java \
 	gnu/xml/util/XCat.java \
 	gnu/xml/util/XHTMLWriter.java \
 	gnu/xml/util/XMLWriter.java
 java_applet_SRCS = \
-	java/applet/AppletContext.java \
 	java/applet/Applet.java \
+	java/applet/AppletContext.java \
 	java/applet/AppletStub.java \
 	java/applet/AudioClip.java
 java_awt_SRCS = \
+	java/awt/AWTError.java \
+	java/awt/AWTEvent.java \
+	java/awt/AWTEventMulticaster.java \
+	java/awt/AWTException.java \
+	java/awt/AWTPermission.java \
 	java/awt/ActionEvt.java \
 	java/awt/ActiveEvent.java \
 	java/awt/Adjustable.java \
 	java/awt/AdjustmentEvt.java \
 	java/awt/AlphaComposite.java \
 	java/awt/AttributeValue.java \
-	java/awt/AWTError.java \
-	java/awt/AWTEvent.java \
-	java/awt/AWTEventMulticaster.java \
-	java/awt/AWTException.java \
-	java/awt/AWTPermission.java \
 	java/awt/BarMenu.java \
 	java/awt/BasicStroke.java \
 	java/awt/BorderLayout.java \
@@ -570,55 +570,55 @@
 	java/awt/Button.java \
 	java/awt/Canvas.java \
 	java/awt/CardLayout.java \
-	java/awt/CheckboxGroup.java \
 	java/awt/Checkbox.java \
+	java/awt/CheckboxGroup.java \
 	java/awt/CheckboxMenuItem.java \
 	java/awt/Choice.java \
 	java/awt/ClassAnalyzer.java \
 	java/awt/ClassProperties.java \
 	java/awt/Color.java \
 	java/awt/ColorPaintContext.java \
-	java/awt/ComponentEvt.java \
 	java/awt/Component.java \
+	java/awt/ComponentEvt.java \
 	java/awt/ComponentOrientation.java \
-	java/awt/CompositeContext.java \
 	java/awt/Composite.java \
-	java/awt/ContainerEvt.java \
+	java/awt/CompositeContext.java \
 	java/awt/Container.java \
+	java/awt/ContainerEvt.java \
 	java/awt/Cursor.java \
-	java/awt/Defaults.java \
 	java/awt/DefKeyFilter.java \
+	java/awt/Defaults.java \
 	java/awt/Dialog.java \
 	java/awt/Dimension.java \
 	java/awt/DisplayMode.java \
-	java/awt/EventDispatchThread.java \
 	java/awt/Event.java \
+	java/awt/EventDispatchThread.java \
 	java/awt/EventQueue.java \
 	java/awt/FileDialog.java \
 	java/awt/FlowLayout.java \
 	java/awt/FocusEvt.java \
 	java/awt/FocusTraversalPolicy.java \
-	java/awt/FontFormatException.java \
 	java/awt/Font.java \
+	java/awt/FontFormatException.java \
 	java/awt/FontMetrics.java \
 	java/awt/Frame.java \
 	java/awt/GradientPaint.java \
+	java/awt/Graphics.java \
 	java/awt/Graphics2D.java \
 	java/awt/GraphicsConfigTemplate.java \
 	java/awt/GraphicsConfiguration.java \
 	java/awt/GraphicsDevice.java \
 	java/awt/GraphicsEnvironment.java \
-	java/awt/Graphics.java \
 	java/awt/GraphicsLink.java \
 	java/awt/GridBagConstraints.java \
-	java/awt/GridBagLayoutInfo.java \
 	java/awt/GridBagLayout.java \
+	java/awt/GridBagLayoutInfo.java \
 	java/awt/GridLayout.java \
 	java/awt/HeadlessException.java \
 	java/awt/IllegalComponentStateException.java \
+	java/awt/Image.java \
 	java/awt/ImageCapabilities.java \
 	java/awt/ImageFrameLoader.java \
-	java/awt/Image.java \
 	java/awt/ImageLoader.java \
 	java/awt/ImageNativeProducer.java \
 	java/awt/Insets.java \
@@ -629,25 +629,27 @@
 	java/awt/KeyEventPostProcessor.java \
 	java/awt/KeyEvt.java \
 	java/awt/Label.java \
-	java/awt/LayoutManager2.java \
 	java/awt/LayoutManager.java \
+	java/awt/LayoutManager2.java \
 	java/awt/List.java \
 	java/awt/MediaTracker.java \
+	java/awt/Menu.java \
 	java/awt/MenuBar.java \
 	java/awt/MenuComponent.java \
 	java/awt/MenuContainer.java \
 	java/awt/MenuItem.java \
-	java/awt/Menu.java \
 	java/awt/MenuShortcut.java \
 	java/awt/MouseEvt.java \
 	java/awt/NativeClipboard.java \
 	java/awt/NativeGraphics.java \
 	java/awt/NativeSelection.java \
 	java/awt/OpaqueComponent.java \
+	java/awt/PSGraphics.java \
+	java/awt/PSPrintJob.java \
 	java/awt/PageAttributes.java \
+	java/awt/Paint.java \
 	java/awt/PaintContext.java \
 	java/awt/PaintEvt.java \
-	java/awt/Paint.java \
 	java/awt/Panel.java \
 	java/awt/Point.java \
 	java/awt/Polygon.java \
@@ -655,16 +657,14 @@
 	java/awt/PopupWindow.java \
 	java/awt/PrintGraphics.java \
 	java/awt/PrintJob.java \
-	java/awt/PSGraphics.java \
-	java/awt/PSPrintJob.java \
 	java/awt/Rectangle.java \
 	java/awt/RenderingHints.java \
 	java/awt/Robot.java \
 	java/awt/RootWindow.java \
 	java/awt/RowCanvas.java \
-	java/awt/Scrollbar.java \
-	java/awt/ScrollPaneAdjustable.java \
 	java/awt/ScrollPane.java \
+	java/awt/ScrollPaneAdjustable.java \
+	java/awt/Scrollbar.java \
 	java/awt/Shape.java \
 	java/awt/ShortcutConsumer.java \
 	java/awt/ShortcutHandler.java \
@@ -679,15 +679,15 @@
 	java/awt/TexturePaint.java \
 	java/awt/Toolkit.java \
 	java/awt/Transparency.java \
-	java/awt/WindowEvt.java \
+	java/awt/WMEvent.java \
 	java/awt/Window.java \
-	java/awt/WMEvent.java
+	java/awt/WindowEvt.java
 java_awt_color_SRCS = \
 	java/awt/color/CMMException.java \
 	java/awt/color/ColorSpace.java \
 	java/awt/color/ICC_ColorSpace.java \
-	java/awt/color/ICC_ProfileGray.java \
 	java/awt/color/ICC_Profile.java \
+	java/awt/color/ICC_ProfileGray.java \
 	java/awt/color/ICC_ProfileRGB.java \
 	java/awt/color/ProfileDataException.java
 java_awt_datatransfer_SRCS = \
@@ -708,20 +708,20 @@
 	java/awt/dnd/DragGestureEvent.java \
 	java/awt/dnd/DragGestureListener.java \
 	java/awt/dnd/DragGestureRecognizer.java \
+	java/awt/dnd/DragSource.java \
 	java/awt/dnd/DragSourceAdapter.java \
 	java/awt/dnd/DragSourceContext.java \
 	java/awt/dnd/DragSourceDragEvent.java \
 	java/awt/dnd/DragSourceDropEvent.java \
 	java/awt/dnd/DragSourceEvent.java \
-	java/awt/dnd/DragSource.java \
 	java/awt/dnd/DragSourceListener.java \
 	java/awt/dnd/DragSourceMotionListener.java \
+	java/awt/dnd/DropTarget.java \
 	java/awt/dnd/DropTargetAdapter.java \
 	java/awt/dnd/DropTargetContext.java \
 	java/awt/dnd/DropTargetDragEvent.java \
 	java/awt/dnd/DropTargetDropEvent.java \
 	java/awt/dnd/DropTargetEvent.java \
-	java/awt/dnd/DropTarget.java \
 	java/awt/dnd/DropTargetListener.java \
 	java/awt/dnd/InvalidDnDOperationException.java \
 	java/awt/dnd/MouseDragGestureRecognizer.java
@@ -730,11 +730,11 @@
 	java/awt/dnd/peer/DropTargetContextPeer.java \
 	java/awt/dnd/peer/DropTargetPeer.java
 java_awt_event_SRCS = \
+	java/awt/event/AWTEventListener.java \
 	java/awt/event/ActionEvent.java \
 	java/awt/event/ActionListener.java \
 	java/awt/event/AdjustmentEvent.java \
 	java/awt/event/AdjustmentListener.java \
-	java/awt/event/AWTEventListener.java \
 	java/awt/event/ComponentAdapter.java \
 	java/awt/event/ComponentEvent.java \
 	java/awt/event/ComponentListener.java \
@@ -814,16 +814,16 @@
 	java/awt/im/InputSubset.java
 java_awt_image_SRCS = \
 	java/awt/image/AreaAveragingScaleFilter.java \
+	java/awt/image/BufferStrategy.java \
 	java/awt/image/BufferedImage.java \
 	java/awt/image/BufferedImageOp.java \
-	java/awt/image/BufferStrategy.java \
 	java/awt/image/ColorModel.java \
 	java/awt/image/ComponentColorModel.java \
 	java/awt/image/ComponentSampleModel.java \
 	java/awt/image/CropImageFilter.java \
+	java/awt/image/DataBuffer.java \
 	java/awt/image/DataBufferByte.java \
 	java/awt/image/DataBufferInt.java \
-	java/awt/image/DataBuffer.java \
 	java/awt/image/DataBufferUShort.java \
 	java/awt/image/DirectColorModel.java \
 	java/awt/image/FilteredImageSource.java \
@@ -836,12 +836,12 @@
 	java/awt/image/MemoryImageSource.java \
 	java/awt/image/PackedColorModel.java \
 	java/awt/image/PixelGrabber.java \
-	java/awt/image/RasterFormatException.java \
+	java/awt/image/RGBImageFilter.java \
 	java/awt/image/Raster.java \
+	java/awt/image/RasterFormatException.java \
 	java/awt/image/RasterOp.java \
 	java/awt/image/RenderedImage.java \
 	java/awt/image/ReplicateScaleFilter.java \
-	java/awt/image/RGBImageFilter.java \
 	java/awt/image/SampleModel.java \
 	java/awt/image/SinglePixelPackedSampleModel.java \
 	java/awt/image/TileObserver.java \
@@ -851,10 +851,10 @@
 java_awt_image_renderable_SRCS = \
 	java/awt/image/renderable/ContextualRenderedImageFactory.java \
 	java/awt/image/renderable/ParameterBlock.java \
+	java/awt/image/renderable/RenderContext.java \
 	java/awt/image/renderable/RenderableImage.java \
 	java/awt/image/renderable/RenderableImageOp.java \
 	java/awt/image/renderable/RenderableImageProducer.java \
-	java/awt/image/renderable/RenderContext.java \
 	java/awt/image/renderable/RenderedImageFactory.java
 java_awt_peer_SRCS = \
 	java/awt/peer/ActiveEvent.java \
@@ -879,16 +879,16 @@
 	java/awt/peer/PanelPeer.java \
 	java/awt/peer/PopupMenuPeer.java \
 	java/awt/peer/RobotPeer.java \
-	java/awt/peer/ScrollbarPeer.java \
 	java/awt/peer/ScrollPanePeer.java \
+	java/awt/peer/ScrollbarPeer.java \
 	java/awt/peer/TextAreaPeer.java \
 	java/awt/peer/TextComponentPeer.java \
 	java/awt/peer/TextFieldPeer.java \
 	java/awt/peer/WindowPeer.java
 java_awt_print_SRCS = \
 	java/awt/print/Book.java \
-	java/awt/print/Pageable.java \
 	java/awt/print/PageFormat.java \
+	java/awt/print/Pageable.java \
 	java/awt/print/Paper.java \
 	java/awt/print/Printable.java \
 	java/awt/print/PrinterAbortException.java \
@@ -927,18 +927,18 @@
 	java/beans/VetoableChangeSupport.java \
 	java/beans/Visibility.java
 java_beans_beancontext_SRCS = \
-	java/beans/beancontext/BeanContextChildComponentProxy.java \
+	java/beans/beancontext/BeanContext.java \
 	java/beans/beancontext/BeanContextChild.java \
+	java/beans/beancontext/BeanContextChildComponentProxy.java \
 	java/beans/beancontext/BeanContextChildSupport.java \
 	java/beans/beancontext/BeanContextContainerProxy.java \
 	java/beans/beancontext/BeanContextEvent.java \
-	java/beans/beancontext/BeanContext.java \
 	java/beans/beancontext/BeanContextMembershipEvent.java \
 	java/beans/beancontext/BeanContextMembershipListener.java \
 	java/beans/beancontext/BeanContextProxy.java \
 	java/beans/beancontext/BeanContextServiceAvailableEvent.java \
-	java/beans/beancontext/BeanContextServiceProviderBeanInfo.java \
 	java/beans/beancontext/BeanContextServiceProvider.java \
+	java/beans/beancontext/BeanContextServiceProviderBeanInfo.java \
 	java/beans/beancontext/BeanContextServiceRevokedEvent.java \
 	java/beans/beancontext/BeanContextServiceRevokedListener.java \
 	java/beans/beancontext/BeanContextServices.java \
@@ -961,26 +961,26 @@
 	java/io/DataOutputStream.java \
 	java/io/EOFException.java \
 	java/io/Externalizable.java \
+	java/io/File.java \
 	java/io/FileDescriptor.java \
 	java/io/FileFilter.java \
 	java/io/FileInputStream.java \
-	java/io/File.java \
-	java/io/FilenameFilter.java \
 	java/io/FileNotFoundException.java \
 	java/io/FileOutputStream.java \
 	java/io/FilePermission.java \
 	java/io/FileReader.java \
 	java/io/FileWriter.java \
+	java/io/FilenameFilter.java \
 	java/io/FilterInputStream.java \
 	java/io/FilterOutputStream.java \
 	java/io/FilterReader.java \
 	java/io/FilterWriter.java \
+	java/io/IOException.java \
 	java/io/InputStream.java \
 	java/io/InputStreamReader.java \
 	java/io/InterruptedIOException.java \
 	java/io/InvalidClassException.java \
 	java/io/InvalidObjectException.java \
-	java/io/IOException.java \
 	java/io/LineNumberInputStream.java \
 	java/io/LineNumberReader.java \
 	java/io/NotActiveException.java \
@@ -1016,8 +1016,8 @@
 	java/io/StringReader.java \
 	java/io/StringWriter.java \
 	java/io/SyncFailedException.java \
-	java/io/UnsupportedEncodingException.java \
 	java/io/UTFDataFormatException.java \
+	java/io/UnsupportedEncodingException.java \
 	java/io/VMObjectStreamClass.java \
 	java/io/WriteAbortedException.java \
 	java/io/Writer.java
@@ -1029,22 +1029,22 @@
 	java/lang/AssertionError.java \
 	java/lang/Boolean.java \
 	java/lang/Byte.java \
-	java/lang/Character.java \
 	java/lang/CharSequence.java \
+	java/lang/Character.java \
+	java/lang/Class.java \
 	java/lang/ClassCastException.java \
 	java/lang/ClassCircularityError.java \
 	java/lang/ClassFormatError.java \
-	java/lang/Class.java \
 	java/lang/ClassLoader.java \
 	java/lang/ClassNotFoundException.java \
-	java/lang/Cloneable.java \
 	java/lang/CloneNotSupportedException.java \
+	java/lang/Cloneable.java \
 	java/lang/Comparable.java \
 	java/lang/Compiler.java \
 	java/lang/Double.java \
 	java/lang/Error.java \
-	java/lang/ExceptionInInitializerError.java \
 	java/lang/Exception.java \
+	java/lang/ExceptionInInitializerError.java \
 	java/lang/Float.java \
 	java/lang/IllegalAccessError.java \
 	java/lang/IllegalAccessException.java \
@@ -1071,16 +1071,16 @@
 	java/lang/NoSuchMethodError.java \
 	java/lang/NoSuchMethodException.java \
 	java/lang/NullPointerException.java \
-	java/lang/NumberFormatException.java \
 	java/lang/Number.java \
+	java/lang/NumberFormatException.java \
 	java/lang/Object.java \
 	java/lang/OutOfMemoryError.java \
 	java/lang/Package.java \
-	java/lang/ProcessInputStream.java \
 	java/lang/Process.java \
+	java/lang/ProcessInputStream.java \
 	java/lang/Runnable.java \
-	java/lang/RuntimeException.java \
 	java/lang/Runtime.java \
+	java/lang/RuntimeException.java \
 	java/lang/RuntimePermission.java \
 	java/lang/SecurityException.java \
 	java/lang/SecurityManager.java \
@@ -1088,22 +1088,22 @@
 	java/lang/StackOverflowError.java \
 	java/lang/StackTraceElement.java \
 	java/lang/StrictMath.java \
+	java/lang/String.java \
 	java/lang/StringBuffer.java \
 	java/lang/StringIndexOutOfBoundsException.java \
-	java/lang/String.java \
 	java/lang/System.java \

*** Patch too long, truncated ***




More information about the kaffe mailing list