Patch: boehm-gc cleanups
Tom Tromey
tromey@cygnus.com
Tue Nov 2 17:09:00 GMT 1999
I'm committing the appended patch. It removes config.h (which was
renamed to gcconfig.h in the latest GC) and cleans up other things
related to that.
A patch to fix libjava will follow.
1999-11-02 Tom Tromey <tromey@cygnus.com>
* configure: Rebuilt.
* configure.in: Don't create boehm-config.h.
* Makefile.in: Rebuilt.
* Makefile.am (libgcjgc_la_SOURCES): Reference gcconfig.h, not
config.h.
* gc_priv.h: Reference GCCONFIG_H, not CONFIG_H.
* gcconfig.h: Define GCCONFIG_H, not CONFIG_H.
* config.h: Removed.
Tom
Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- Makefile.am 1999/11/01 23:15:51 1.11
+++ Makefile.am 1999/11/03 01:08:32
@@ -26,7 +26,7 @@
toolexeclib_LTLIBRARIES = $(target_all)
EXTRA_LTLIBRARIES = libgcjgc.la
libgcjgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c \
-config.h dbg_mlc.c dyn_load.c finalize.c gc.h gc_alloc.h gc_cpp.h \
+gcconfig.h dbg_mlc.c dyn_load.c finalize.c gc.h gc_alloc.h gc_cpp.h \
gc_hdrs.h gc_mark.h gc_priv.h gc_private.h gc_typed.h 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 \
@@ -52,7 +52,7 @@
## FIXME: relies on internal code generated by automake.
all_objs = @addobjs@ $(libgcjgc_la_OBJECTS)
-$(all_objs) : config.h gc_priv.h gc_hdrs.h gc.h gc_mark.h
+$(all_objs) : gcconfig.h gc_priv.h gc_hdrs.h gc.h gc_mark.h
## FIXME: we shouldn't have to do this, but automake forces us to.
.s.lo:
Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/configure.in,v
retrieving revision 1.14
diff -u -r1.14 configure.in
--- configure.in 1999/11/01 23:15:51 1.14
+++ configure.in 1999/11/03 01:08:32
@@ -195,12 +195,6 @@
AC_DEFINE(NO_DEBUGGING)
AC_DEFINE(JAVA_FINALIZATION)
-dnl Create boehm-config.h so that libjava can find it.
-dnl It is required to use gc_priv.h, which is required to write
-dnl a new marking function. So config.h in this package is
-dnl poorly named.
-AC_LINK_FILES(config.h, boehm-config.h)
-
dnl This is something of a hack. When cross-compiling we turn off
dnl some functionality. We also enable the "small" configuration.
dnl These is only correct when targetting an embedded system. FIXME.
Index: gc_priv.h
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/gc_priv.h,v
retrieving revision 1.7
diff -u -r1.7 gc_priv.h
--- gc_priv.h 1999/11/01 23:15:51 1.7
+++ gc_priv.h 1999/11/03 01:08:58
@@ -44,7 +44,7 @@
typedef GC_word word;
typedef GC_signed_word signed_word;
-# ifndef CONFIG_H
+# ifndef GCCONFIG_H
# include "gcconfig.h"
# endif
Index: gcconfig.h
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/gcconfig.h,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 gcconfig.h
--- gcconfig.h 1999/11/01 20:48:52 1.1.1.2
+++ gcconfig.h 1999/11/03 01:09:04
@@ -13,9 +13,9 @@
* modified is included with the above copyright notice.
*/
-#ifndef CONFIG_H
+#ifndef GCCONFIG_H
-# define CONFIG_H
+# define GCCONFIG_H
/* Machine dependent parameters. Some tuning parameters can be found */
/* near the top of gc_private.h. */
More information about the Java-patches
mailing list