[kaffe] CVS kaffe (dalibor): Converted arm-riscos sysdepCallMethod macro to inline function

Kaffe CVS cvs-commits at kaffe.org
Thu Dec 11 08:55:03 PST 2003


PatchSet 4213 
Date: 2003/12/11 16:43:29
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Converted arm-riscos sysdepCallMethod macro to inline function

2003-12-11  Dalibor Topic <robilad at kaffe.org>

        * config/arm/sysdepCallMethod.h: New file.

        * config/Makefile.am
        (EXTRA_DIST) Added config/arm/sysdepCallMethod.h.

        * aclocal.m4,
        config/Makefile.in,
        kaffe/Makefile.in,
        kaffe/kaffe/Makefile.in,
        kaffe/scripts/Makefile.in,
        kaffe/scripts/compat/Makefile.in,
        test/internal/Makefile.in,
        test/regression/Makefile.in:
        Regenerated.

        * config/arm/common.h
        (sysdepCallMethod) Moved into its own file,
        config/arm/sysdepCallMethod.h.

        * config/arm/linux/md.h,
        config/arm/netbsd1/md.h:
        Include config/arm/sysdepCallMethod.h.

        * config/arm/riscos/md.h:
        (sysdepCallMethod) Converted macro to inline function.

Members: 
	ChangeLog:1.1803->1.1804 
	aclocal.m4:1.77->1.78 
	config/Makefile.am:1.28->1.29 
	config/Makefile.in:1.95->1.96 
	config/arm/common.h:1.8->1.9 
	config/arm/sysdepCallMethod.h:INITIAL->1.1 
	config/arm/linux/md.h:1.6->1.7 
	config/arm/netbsd1/md.h:1.4->1.5 
	config/arm/riscos/md.h:1.2->1.3 
	kaffe/Makefile.in:1.87->1.88 
	kaffe/kaffe/Makefile.in:1.101->1.102 
	kaffe/scripts/Makefile.in:1.110->1.111 
	kaffe/scripts/compat/Makefile.in:1.91->1.92 
	test/internal/Makefile.in:1.34->1.35 
	test/regression/Makefile.in:1.143->1.144 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1803 kaffe/ChangeLog:1.1804
--- kaffe/ChangeLog:1.1803	Thu Dec 11 12:14:43 2003
+++ kaffe/ChangeLog	Thu Dec 11 16:43:29 2003
@@ -1,5 +1,33 @@
 2003-12-11  Dalibor Topic <robilad at kaffe.org>
 
+	* config/arm/sysdepCallMethod.h: New file.
+
+	* config/Makefile.am
+	(EXTRA_DIST) Added config/arm/sysdepCallMethod.h.
+
+	* aclocal.m4,
+	config/Makefile.in,
+	kaffe/Makefile.in,
+	kaffe/kaffe/Makefile.in,
+	kaffe/scripts/Makefile.in,
+	kaffe/scripts/compat/Makefile.in,
+	test/internal/Makefile.in,
+	test/regression/Makefile.in:
+	Regenerated.
+
+	* config/arm/common.h
+	(sysdepCallMethod) Moved into its own file,
+	config/arm/sysdepCallMethod.h.
+
+	* config/arm/linux/md.h,
+	config/arm/netbsd1/md.h:
+	Include config/arm/sysdepCallMethod.h.
+
+	* config/arm/riscos/md.h:
+	(sysdepCallMethod) Converted macro to inline function.
+
+2003-12-11  Dalibor Topic <robilad at kaffe.org>
+
 	* config/m68k/common.h
 	(sysdemCallMethod)[!__linux__]: Removed unused 
 	variables.
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.77 kaffe/aclocal.m4:1.78
--- kaffe/aclocal.m4:1.77	Wed Dec 10 23:11:46 2003
+++ kaffe/aclocal.m4	Thu Dec 11 16:43:30 2003
@@ -8723,7 +8723,7 @@
 AU_DEFUN([fp_WITH_DMALLOC], [AM_WITH_DMALLOC])
 
 # ----------------------------------------------------------------------------
-# $Id: aclocal.m4,v 1.77 2003/12/10 23:11:46 jim Exp $
+# $Id: aclocal.m4,v 1.78 2003/12/11 16:43:30 dalibor Exp $
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 #
@@ -8767,7 +8767,7 @@
 #
 # GNU Crypto m4 macro for use by VM Providers
 #
-# $Revision: 1.77 $
+# $Revision: 1.78 $
 #
 
 # process --with-gnu-crypto configure option.
Index: kaffe/config/Makefile.am
diff -u kaffe/config/Makefile.am:1.28 kaffe/config/Makefile.am:1.29
--- kaffe/config/Makefile.am:1.28	Tue Dec  9 12:37:27 2003
+++ kaffe/config/Makefile.am	Thu Dec 11 16:43:31 2003
@@ -3,6 +3,9 @@
 # Copyright (c) 1996, 1997, 1998, 1999
 #	Transvirtual Technologies, Inc.  All rights reserved.
 #
+# Copyright (c) 2003
+#       Kaffe.org contributors. See ChangeLog for details.
+#
 # See the file "license.terms" for information on usage and redistribution 
 # of this file. 
 
@@ -70,6 +73,7 @@
         arm/riscos/md.c \
         arm/riscos/md.h \
 	arm/threads.h \
+	arm/sysdepCallMethod.h \
 	arm/trampolines.c \
 	ia64/common.h \
 	ia64/linux/config.frag \
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.95 kaffe/config/Makefile.in:1.96
--- kaffe/config/Makefile.in:1.95	Tue Dec  9 12:37:27 2003
+++ kaffe/config/Makefile.in	Thu Dec 11 16:43:31 2003
@@ -19,6 +19,9 @@
 # Copyright (c) 1996, 1997, 1998, 1999
 #	Transvirtual Technologies, Inc.  All rights reserved.
 #
+# Copyright (c) 2003
+#       Kaffe.org contributors. See ChangeLog for details.
+#
 # See the file "license.terms" for information on usage and redistribution 
 # of this file. 
 
@@ -312,6 +315,7 @@
         arm/riscos/md.c \
         arm/riscos/md.h \
 	arm/threads.h \
+	arm/sysdepCallMethod.h \
 	arm/trampolines.c \
 	ia64/common.h \
 	ia64/linux/config.frag \
Index: kaffe/config/arm/common.h
diff -u kaffe/config/arm/common.h:1.8 kaffe/config/arm/common.h:1.9
--- kaffe/config/arm/common.h:1.8	Sat Oct 25 12:52:42 2003
+++ kaffe/config/arm/common.h	Thu Dec 11 16:43:33 2003
@@ -5,6 +5,9 @@
  * Copyright (c) 1996, 1997
  *	Transvirtual Technologies, Inc.  All rights reserved.
  *
+ * Copyright (c) 2003
+ *      Kaffe.org contributors. See ChangeLog for details.
+ *
  * See the file "license.terms" for information on usage and redistribution 
  * of this file. 
  *
@@ -16,75 +19,6 @@
 
 /* The arm never aligns to more than a 4 byte boundary. */
 #define	ALIGNMENT_OF_SIZE(S)	((S) < 4 ? (S) : 4)
-
-/*
- * The calling convention is such that the first four 32bit values are
- * passed in r0-r3, and the remainder goes on the stack.
- * Floating point values are passed in integer registers.
- *
- * This machine is a little endian machine, but double floating point 
- * values are stored in big endian *word* order.  Note that we do not
- * have to take this into account here.  It is a convention of the
- * software floating point libraries and the build tools.
- */
-#if NEED_sysdepCallMethod
-static inline void sysdepCallMethod(callMethodInfo *call) {
-  int extraargs[(call->nrargs>4)?(call->nrargs-4):0];
-  switch(call->nrargs) {
-    register int r0 asm("r0");
-    register int r1 asm("r1");
-    register int r2 asm("r2");
-    register int r3 asm("r3");
-    register double f0 asm("f0");
-
-  default:
-    {
-      int *args = extraargs;
-      int argidx = 4;
-      for(; argidx < call->nrargs; ++argidx) {
-        *args++ = call->args[argidx].i;
-      }
-    }
-  case 4:
-    r3 = call->args[3].i;
-  case 3:
-    r2 = call->args[2].i;
-  case 2:
-    r1 = call->args[1].i;
-  case 1:
-    r0 = call->args[0].i;
-  case 0:
-    asm volatile ("mov lr, pc\n"
-"                    mov pc, %3\n"
-                  : "=r" (r0), "=r" (r1), "=f" (f0)
-                  : "r" (call->function),
-                    "0" (r0), "1" (r1), "r" (r2), "r" (r3)
-                  : "ip", "rfp", "sl", "fp", "lr");
-    switch (call->rettype)
-    {
-    case 'V':
-      break;
-
-    case 'D':
-      asm volatile ("stfd %1,%0" : "=m" (call->ret->d) : "f" (f0));
-      break;
-
-    case 'F':
-      asm volatile ("stfs %1,%0" : "=m" (call->ret->f) : "f" (f0));
-      break;
- 
-    case 'J':
-      (&call->ret->i)[1] = r1;
-      (&call->ret->i)[0] = r0;
-      break;
-
-    default:
-      call->ret->i = r0;
-      break;
-    }
-  }
-}
-#endif
 
 /*
  * Do an atomic exchange.  The contents of address 'A' is exchanged
===================================================================
Checking out kaffe/config/arm/sysdepCallMethod.h
RCS:  /home/cvs/kaffe/kaffe/config/arm/sysdepCallMethod.h,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/config/arm/sysdepCallMethod.h	Thu Dec 11 16:46:31 2003
@@ -0,0 +1,91 @@
+/*
+ * arm/sysdepCallMethod.h
+ * Common arm sysdepCallNethod.
+ *
+ * Copyright (c) 1996, 1997
+ *	Transvirtual Technologies, Inc.  All rights reserved.
+ *
+ * Copyright (c) 2003
+ *      Kaffe.org contributors. See ChangeLog for details.
+ *
+ * See the file "license.terms" for information on usage and redistribution 
+ * of this file. 
+ *
+ * Written by Godmar Back <gback at cs.utah.edu>
+ */
+
+#ifndef __arm_sysdepCallMethod_h
+#define __arm_sysdepCallMethod_h
+
+#include "support.h"
+
+/*
+ * The calling convention is such that the first four 32bit values are
+ * passed in r0-r3, and the remainder goes on the stack.
+ * Floating point values are passed in integer registers.
+ *
+ * This machine is a little endian machine, but double floating point 
+ * values are stored in big endian *word* order.  Note that we do not
+ * have to take this into account here.  It is a convention of the
+ * software floating point libraries and the build tools.
+ */
+#if NEED_sysdepCallMethod
+static inline void sysdepCallMethod(callMethodInfo *call) {
+  int extraargs[(call->nrargs>4)?(call->nrargs-4):0];
+  switch(call->nrargs) {
+    register int r0 asm("r0");
+    register int r1 asm("r1");
+    register int r2 asm("r2");
+    register int r3 asm("r3");
+    register double f0 asm("f0");
+
+  default:
+    {
+      int *args = extraargs;
+      int argidx = 4;
+      for(; argidx < call->nrargs; ++argidx) {
+        *args++ = call->args[argidx].i;
+      }
+    }
+  case 4:
+    r3 = call->args[3].i;
+  case 3:
+    r2 = call->args[2].i;
+  case 2:
+    r1 = call->args[1].i;
+  case 1:
+    r0 = call->args[0].i;
+  case 0:
+    asm volatile ("mov lr, pc\n"
+"                    mov pc, %3\n"
+                  : "=r" (r0), "=r" (r1), "=f" (f0)
+                  : "r" (call->function),
+                    "0" (r0), "1" (r1), "r" (r2), "r" (r3)
+                  : "ip", "rfp", "sl", "fp", "lr");
+    switch (call->rettype)
+    {
+    case 'V':
+      break;
+
+    case 'D':
+      asm volatile ("stfd %1,%0" : "=m" (call->ret->d) : "f" (f0));
+      break;
+
+    case 'F':
+      asm volatile ("stfs %1,%0" : "=m" (call->ret->f) : "f" (f0));
+      break;
+ 
+    case 'J':
+      (&call->ret->i)[1] = r1;
+      (&call->ret->i)[0] = r0;
+      break;
+
+    default:
+      call->ret->i = r0;
+      break;
+    }
+  }
+}
+#endif /* NEED_sysdepCallMethod */
+
+#endif /* __arm_sysdepCallMethod_h */
Index: kaffe/config/arm/linux/md.h
diff -u kaffe/config/arm/linux/md.h:1.6 kaffe/config/arm/linux/md.h:1.7
--- kaffe/config/arm/linux/md.h:1.6	Sat Oct 25 12:52:42 2003
+++ kaffe/config/arm/linux/md.h	Thu Dec 11 16:43:33 2003
@@ -13,6 +13,7 @@
 #define __arm_linux_md_h
  
 #include "arm/common.h"
+#include "arm/sysdepCallMethod.h"
 #include "arm/threads.h"
 
 #ifdef HAVE_SIGNAL_H
Index: kaffe/config/arm/netbsd1/md.h
diff -u kaffe/config/arm/netbsd1/md.h:1.4 kaffe/config/arm/netbsd1/md.h:1.5
--- kaffe/config/arm/netbsd1/md.h:1.4	Sat Oct 16 20:52:40 1999
+++ kaffe/config/arm/netbsd1/md.h	Thu Dec 11 16:43:33 2003
@@ -13,6 +13,7 @@
 #define __arm_netbsd1_md_h
 
 #include "arm/common.h"
+#include "arm/sysdepCallMethod.h"
 #include "arm/threads.h"
 
 #if defined(TRANSLATOR)
Index: kaffe/config/arm/riscos/md.h
diff -u kaffe/config/arm/riscos/md.h:1.2 kaffe/config/arm/riscos/md.h:1.3
--- kaffe/config/arm/riscos/md.h:1.2	Thu Oct  2 20:12:18 2003
+++ kaffe/config/arm/riscos/md.h	Thu Dec 11 16:43:34 2003
@@ -1,6 +1,12 @@
 /*    
  * arm/riscos/md.h
  * RISC OS arm configuration information.
+ *
+ * Copyright (c) 2003
+ *   Kaffe.org contributors. See ChangeLog for details.
+ *
+ * See the file "license.terms" for information on usage and redistribution 
+ * of this file.
  */
  
 #ifndef __arm_riscos_md_h
@@ -13,6 +19,8 @@
 #include "jit-md.h"
 #endif
 
+#include "support.h"
+
 /* RISC OS requires a little initialisation */
 extern void init_md(void);
 #define INIT_MD()       init_md()
@@ -32,91 +40,89 @@
 #define SP_OFFSET               22
 #define FP_OFFSET               21
 
-/* Override the general ARM sysdepCallMethod */
-#undef sysdepCallMethod
-
-#define	sysdepCallMethod(CALL) do {					\
-  int i=(CALL)->nrargs-1;						\
-  int extraargs[((CALL)->nrargs>4)?((CALL)->nrargs-4):0];		\
-  switch((CALL)->nrargs) {						\
-    register int r0 asm("r0");						\
-    register int r1 asm("r1");						\
-    register int r2 asm("r2");						\
-    register int r3 asm("r3");						\
-    register double f0 asm("f0");                                       \
-  default:								\
-    {									\
-      int *args = extraargs;						\
-      int argidx = 4; 							\
-      for(; argidx < (CALL)->nrargs; ++argidx) {			\
-	if ((CALL)->callsize[argidx]) { 				\
-	  *args++ = (CALL)->args[argidx].i;				\
-	  if ((CALL)->callsize[argidx] == 2) 				\
-	    *args++ = ((CALL)->args[argidx].j) >> 32;			\
-	} 								\
-      }									\
-    }									\
-  case 4:								\
-    if ((CALL)->callsize[3]) {						\
-      r3 = (CALL)->args[3].i;						\
-      if ((CALL)->callsize[3] == 2)					\
-        *extraargs = ((CALL)->args[3].j) >> 32; 			\
-    }									\
-  case 3:								\
-    if ((CALL)->callsize[2]) {						\
-      r2 = (CALL)->args[2].i;						\
-      if ((CALL)->callsize[2] == 2)					\
-        r3 = ((CALL)->args[2].j) >> 32; 				\
-    }									\
-  case 2:								\
-    if ((CALL)->callsize[1]) {						\
-      r1 = (CALL)->args[1].i;						\
-      if ((CALL)->callsize[1] == 2)					\
-        r2 = ((CALL)->args[1].j) >> 32; 				\
-    }									\
-  case 1:								\
-    if ((CALL)->callsize[0]) {						\
-      r0 = (CALL)->args[0].i;						\
-      if ((CALL)->callsize[0] == 2)					\
-        r1 = ((CALL)->args[0].j) >> 32; 				\
-    }									\
-  case 0:								\
-    for (i=(CALL)->nrargs-1; i>3; i--) {				\
-      asm volatile("stmdb __sp!, {%0}\n"				\
-	: 								\
-	: "r" ((CALL)->args[i].i)					\
-	: "sp");							\
-    }									\
-    asm ("mov __lr, __pc\n"						\
-	 "mov __pc, %3\n"						\
-        : "=r" (r0), "=r" (r1), "=f" (f0)				\
-	: "r" ((CALL)->function),					\
-	  "0" (r0), "1" (r1), "r" (r2), "r" (r3)			\
-	: "sp", "sl", "lr", "cc"					\
-	);								\
-    for (i=(CALL)->nrargs-1; i>3; i--) {				\
-      asm volatile("add __sp, __sp, #4\n"				\
-	: : : "sp" );							\
-    }									\
-    switch((CALL)->rettype)    						\
-    {									\
-    case 'D':								\
-        asm("stfd %1,%0" : "=m" ((CALL)->ret->d) : "f" (f0));		\
-	break;								\
-    case 'F':								\
-	asm("stfs %1,%0" : "=m" ((CALL)->ret->f) : "f" (f0));		\
-	break;								\
-    case 'L':								\
-	(CALL)->ret->l = r0;						\
-	break;								\
-    case 'J':								\
-	(&(CALL)->ret->i)[1] = r1;					\
-	/* follow through */						\
-    default:								\
-	(CALL)->ret->i = r0;						\
-    }									\
-    break;								\
-  }									\
-} while (0)
+static inline void sysdepCallMethod(callMethodInfo *call) 
+{
+  int i=(call)->nrargs-1;
+  int extraargs[((call)->nrargs>4)?((call)->nrargs-4):0];
+  switch((call)->nrargs) {
+    register int r0 asm("r0");
+    register int r1 asm("r1");
+    register int r2 asm("r2");
+    register int r3 asm("r3");
+    register double f0 asm("f0");
+  default:
+    {
+      int *args = extraargs;
+      int argidx = 4;
+      for(; argidx < (call)->nrargs; ++argidx) {
+	if ((call)->callsize[argidx]) {
+	  *args++ = (call)->args[argidx].i;
+	  if ((call)->callsize[argidx] == 2)
+	    *args++ = ((call)->args[argidx].j) >> 32;
+	}
+      }
+    }
+  case 4:
+    if ((call)->callsize[3]) {
+      r3 = (call)->args[3].i;
+      if ((call)->callsize[3] == 2)
+        *extraargs = ((call)->args[3].j) >> 32;
+    }
+  case 3:
+    if ((call)->callsize[2]) {
+      r2 = (call)->args[2].i;
+      if ((call)->callsize[2] == 2)
+        r3 = ((call)->args[2].j) >> 32;
+    }
+  case 2:
+    if ((call)->callsize[1]) {
+      r1 = (call)->args[1].i;
+      if ((call)->callsize[1] == 2)
+        r2 = ((call)->args[1].j) >> 32;
+    }
+  case 1:
+    if ((call)->callsize[0]) {
+      r0 = (call)->args[0].i;
+      if ((call)->callsize[0] == 2)
+        r1 = ((call)->args[0].j) >> 32;
+    }
+  case 0:
+    for (i=(call)->nrargs-1; i>3; i--) {
+      asm volatile("stmdb __sp!, {%0}\n"
+	:
+	: "r" ((call)->args[i].i)
+	: "sp");
+    }
+    asm ("mov __lr, __pc\n"
+	 "mov __pc, %3\n"
+        : "=r" (r0), "=r" (r1), "=f" (f0)
+	: "r" ((call)->function),
+	  "0" (r0), "1" (r1), "r" (r2), "r" (r3)
+	: "sp", "sl", "lr", "cc"
+	);
+    for (i=(call)->nrargs-1; i>3; i--) {
+      asm volatile("add __sp, __sp, #4\n"
+	: : : "sp" );
+    }
+    switch((call)->rettype)
+    {
+    case 'D':
+        asm("stfd %1,%0" : "=m" ((call)->ret->d) : "f" (f0));
+	break;
+    case 'F':
+	asm("stfs %1,%0" : "=m" ((call)->ret->f) : "f" (f0));
+	break;
+    case 'L':
+	(call)->ret->l = r0;
+	break;
+    case 'J':
+	(&(call)->ret->i)[1] = r1;
+	/* follow through */
+    default:
+	(call)->ret->i = r0;
+    }
+    break;
+  }
+}
 
 #endif
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.87 kaffe/kaffe/Makefile.in:1.88
--- kaffe/kaffe/Makefile.in:1.87	Wed Dec 10 23:11:52 2003
+++ kaffe/kaffe/Makefile.in	Thu Dec 11 16:43:34 2003
@@ -255,9 +255,9 @@
 @NEED_LIBXPROF_FALSE at XPROF_SUBDIRS = #
 
 @NEED_LIBXPROF_TRUE at XPROF_SUBDIRS = xprof
+ at ENABLE_JVMPI_FALSE@JVMPI_SUBDIRS = #
 
 @ENABLE_JVMPI_TRUE at JVMPI_SUBDIRS = jvmpi
- at ENABLE_JVMPI_FALSE@JVMPI_SUBDIRS = #
 
 SUBDIRS = kaffeh kaffevm $(XPROF_SUBDIRS) $(JVMPI_SUBDIRS) kaffe scripts man
 subdir = kaffe
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.101 kaffe/kaffe/kaffe/Makefile.in:1.102
--- kaffe/kaffe/kaffe/Makefile.in:1.101	Wed Dec 10 23:11:52 2003
+++ kaffe/kaffe/kaffe/Makefile.in	Thu Dec 11 16:43:35 2003
@@ -257,9 +257,9 @@
 @NEED_LIBXPROF_FALSE at libxprof = #
 
 @NEED_LIBXPROF_TRUE at libxprof = ../xprof/libkaffexprof.la
+ at ENABLE_JVMPI_FALSE@libjvmpi = #
 
 @ENABLE_JVMPI_TRUE at libjvmpi = ../jvmpi/libkaffejvmpi.la
- at ENABLE_JVMPI_FALSE@libjvmpi = #
 
 AM_CPPFLAGS = \
 	-I../kaffevm \
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.110 kaffe/kaffe/scripts/Makefile.in:1.111
--- kaffe/kaffe/scripts/Makefile.in:1.110	Wed Dec 10 23:11:52 2003
+++ kaffe/kaffe/scripts/Makefile.in	Thu Dec 11 16:43:35 2003
@@ -267,8 +267,8 @@
 
 
 @SUN_COMPAT_TRUE at SUBDIRS = compat
- at SUN_COMPAT_TRUE@SCRIPTFILES_COMPAT = 
 @SUN_COMPAT_FALSE at SCRIPTFILES_COMPAT = appletviewer javac javadoc
+ at SUN_COMPAT_TRUE@SCRIPTFILES_COMPAT = 
 
 @ENABLE_XPROF_TRUE at SCRIPTFILES_XPROF = kaffexprof nm2as.awk
 @ENABLE_XPROF_FALSE at SCRIPTFILES_XPROF = 
Index: kaffe/kaffe/scripts/compat/Makefile.in
diff -u kaffe/kaffe/scripts/compat/Makefile.in:1.91 kaffe/kaffe/scripts/compat/Makefile.in:1.92
--- kaffe/kaffe/scripts/compat/Makefile.in:1.91	Wed Dec 10 23:11:53 2003
+++ kaffe/kaffe/scripts/compat/Makefile.in	Thu Dec 11 16:43:35 2003
@@ -252,11 +252,11 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
+ at SUN_COMPAT_FALSE@jrebin_SCRIPTS = 
 
 @SUN_COMPAT_TRUE at jrebin_SCRIPTS = java
- at SUN_COMPAT_FALSE@jrebin_SCRIPTS = 
- at SUN_COMPAT_TRUE@bin_SCRIPTS = appletviewer javac javadoc
 @SUN_COMPAT_FALSE at bin_SCRIPTS = 
+ at SUN_COMPAT_TRUE@bin_SCRIPTS = appletviewer javac javadoc
 subdir = kaffe/scripts/compat
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Index: kaffe/test/internal/Makefile.in
diff -u kaffe/test/internal/Makefile.in:1.34 kaffe/test/internal/Makefile.in:1.35
--- kaffe/test/internal/Makefile.in:1.34	Wed Dec 10 23:11:53 2003
+++ kaffe/test/internal/Makefile.in	Thu Dec 11 16:43:36 2003
@@ -259,9 +259,9 @@
 @NEED_LIBXPROF_FALSE at libxprof = #
 
 @NEED_LIBXPROF_TRUE at libxprof = ../../kaffe/xprof/libkaffexprof.la
+ at ENABLE_JVMPI_FALSE@libjvmpi = #
 
 @ENABLE_JVMPI_TRUE at libjvmpi = ../../kaffe/jvmpi/libkaffejvmpi.la
- at ENABLE_JVMPI_FALSE@libjvmpi = #
 
 check_PROGRAMS = jitBasic
 
Index: kaffe/test/regression/Makefile.in
diff -u kaffe/test/regression/Makefile.in:1.143 kaffe/test/regression/Makefile.in:1.144
--- kaffe/test/regression/Makefile.in:1.143	Wed Dec 10 23:11:54 2003
+++ kaffe/test/regression/Makefile.in	Thu Dec 11 16:43:36 2003
@@ -511,8 +511,8 @@
 	BadClassFileCode.java \
 	BadClassFileConstants.java
 
- at HAVE_BCEL_FALSE@BCEL_TESTS = 
 @HAVE_BCEL_TRUE at BCEL_TESTS = BCEL_TESTS_DIST
+ at HAVE_BCEL_FALSE@BCEL_TESTS = 
 @USER_WANT_GNU_CRYPTO_FALSE at TEST_GNU_CRYPTO = 
 
 @USER_WANT_GNU_CRYPTO_TRUE at TEST_GNU_CRYPTO = \




More information about the kaffe mailing list