Re: GC 6.0alpha7 local changes

[Bryce McKinlay <bryce at waitaki dot otago dot ac dot nz>]

Loren James Rittle wrote:

> But it appears that a simple `make check' in boehm-gc broke:
>
> gmake: *** No rule to make target `test.c', needed by `test.o'.  Stop.
>
> Thus, when you say that you saw no testsuite regressions, shall I
> assume no regressions in libjava?

Right - I didn't try a "make check" in boehm-gc. Here's a patch to fix
that, which I'm checking in.

regards

  [ bryce ]


2001-05-24  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>

	* Makefile.am: Override gctest_OBJECTS so tests/test.c can be built.
	(libgcjgc_la_SOURCES): Remove typo.
	* tests/test.c: Fix struct names and includes for GC_GCJ_SUPPORT case.

Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/Makefile.am,v
retrieving revision 1.22
diff -u -r1.22 Makefile.am
--- Makefile.am	2001/05/21 08:35:12	1.22
+++ Makefile.am	2001/05/24 07:25:43
@@ -29,7 +29,7 @@
 dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c irix_threads.c \
 linux_threads.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
 obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \
-solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c`
+solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c
 
 # Include THREADLIBS here to ensure that the correct versions of
 # linuxthread semaphore functions get linked:
@@ -46,7 +46,11 @@
 AM_CFLAGS = @BOEHM_GC_CFLAGS@
 
 check_PROGRAMS = gctest
-gctest_SOURCES = test.c
+# The following hack produces a warning from automake, but we need it in order 
+# to build a file from a subdirectory. FIXME.
+test.o:	tests/test.c
+	$(COMPILE) -c $<
+gctest_OBJECTS = test.o
 gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
 gctest_LDFLAGS = -shared-libgcc
 TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
Index: tests/test.c
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/tests/test.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 test.c
--- test.c	2001/05/21 06:39:25	1.1.1.1
+++ test.c	2001/05/24 07:25:43
@@ -238,9 +238,9 @@
 
 #ifdef GC_GCJ_SUPPORT
 
-#include "gc_mark.h"
-#include "dbg_mlc.h"
-#include "include/gc_gcj.h"
+#include "private/dbg_mlc.h"
+#include "private/gc_pmark.h"
+#include "gc_gcj.h"
 
 /* The following struct emulates the vtable in gcj.	*/
 /* This assumes the default value of MARK_DESCR_OFFSET. */
@@ -253,12 +253,12 @@
 					    + sizeof(struct fake_vtable *) };
 			/* length based descriptor.	*/
 struct fake_vtable gcj_class_struct2 =
-				{ 0, (3l << (CPP_WORDSZ - 3)) | DS_BITMAP};
+				{ 0, (3l << (CPP_WORDSZ - 3)) | GC_DS_BITMAP};
 			/* Bitmap based descriptor.	*/
 
 struct GC_ms_entry * fake_gcj_mark_proc(word * addr,
-				        struct ms_entry *mark_stack_ptr,
-				        struct ms_entry *mark_stack_limit,
+				        struct GC_ms_entry *mark_stack_ptr,
+				        struct GC_ms_entry *mark_stack_limit,
 				        word env   )
 {
     sexpr x;
@@ -273,7 +273,7 @@
 	PUSH_CONTENTS((ptr_t)(x -> sexpr_cdr), mark_stack_ptr,
 			      mark_stack_limit, &(x -> sexpr_cdr), exit1);
     }
-    if ((ptr_t)(x -> sexpr_car) > GC_least_plausible_heap_addr) {
+    if ((ptr_t)(x -> sexpr_car) > (ptr_t) GC_least_plausible_heap_addr) {
 	PUSH_CONTENTS((ptr_t)(x -> sexpr_car), mark_stack_ptr,
 			      mark_stack_limit, &(x -> sexpr_car), exit2);
     }