From 0476f09843348e065b11bac1265b723266b85fd5 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Sat, 30 Sep 2000 09:54:21 +0000 Subject: configure.in: Define GC_GCJ_SUPPORT. 2000-09-30 Bryce McKinlay * configure.in: Define GC_GCJ_SUPPORT. Define NO_DEBUGGING in cross-compile configuration only. * Makefile.am: Build gcj_mlc.c. * configure, Makefile.in: Rebuilt. From-SVN: r36678 --- boehm-gc/ChangeLog | 7 +++++++ boehm-gc/Makefile.am | 2 +- boehm-gc/Makefile.in | 39 ++++++++++++++++++++++++--------------- boehm-gc/configure | 8 ++++++-- boehm-gc/configure.in | 3 ++- 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 3d2b2e5..01d3926 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,10 @@ +2000-09-30 Bryce McKinlay + + * configure.in: Define GC_GCJ_SUPPORT. Define NO_DEBUGGING in + cross-compile configuration only. + * Makefile.am: Build gcj_mlc.c. + * configure, Makefile.in: Rebuilt. + 2000-09-10 Alexandre Oliva * acinclude.m4: Include libtool macros from the top level. diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am index f483981..263cdb6 100644 --- a/boehm-gc/Makefile.am +++ b/boehm-gc/Makefile.am @@ -27,7 +27,7 @@ toolexeclib_LTLIBRARIES = $(target_all) EXTRA_LTLIBRARIES = libgcjgc.la libgcjgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c \ 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 \ +gc_hdrs.h gc_mark.h gc_priv.h gc_private.h gc_typed.h gcj_mlc.c headers.c \ hpux_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 \ diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in index 9ea3aa4..c5f3093 100644 --- a/boehm-gc/Makefile.in +++ b/boehm-gc/Makefile.in @@ -73,6 +73,8 @@ CXXCPP = @CXXCPP@ CXXINCLUDES = @CXXINCLUDES@ DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ +GCJ = @GCJ@ +GCJFLAGS = @GCJFLAGS@ INCLUDES = @INCLUDES@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -80,8 +82,10 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MY_CFLAGS = @MY_CFLAGS@ OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ THREADLIB = @THREADLIB@ VERSION = @VERSION@ addobjs = @addobjs@ @@ -97,18 +101,15 @@ MULTIDIRS = MULTISUBDIR = MULTIDO = true MULTICLEAN = true -@USE_LIBDIR_TRUE@toolexeclibdir = \ -@USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) -@USE_LIBDIR_FALSE@toolexeclibdir = \ -@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) -@USE_LIBDIR_FALSE@toolexecdir = \ -@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) +@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) +@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) +@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) toolexeclib_LTLIBRARIES = $(target_all) EXTRA_LTLIBRARIES = libgcjgc.la libgcjgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c \ 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 \ +gc_hdrs.h gc_mark.h gc_priv.h gc_private.h gc_typed.h gcj_mlc.c headers.c \ hpux_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 \ @@ -197,13 +198,13 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libgcjgc_la_OBJECTS = allchblk.lo alloc.lo blacklst.lo checksums.lo \ -dbg_mlc.lo dyn_load.lo finalize.lo headers.lo hpux_irix_threads.lo \ -linux_threads.lo malloc.lo mallocx.lo mark.lo mark_rts.lo misc.lo \ -new_hblk.lo obj_map.lo os_dep.lo pcr_interface.lo ptr_chck.lo \ -real_malloc.lo reclaim.lo solaris_pthreads.lo solaris_threads.lo \ -stubborn.lo typd_mlc.lo +dbg_mlc.lo dyn_load.lo finalize.lo gcj_mlc.lo headers.lo \ +hpux_irix_threads.lo linux_threads.lo malloc.lo mallocx.lo mark.lo \ +mark_rts.lo misc.lo new_hblk.lo obj_map.lo os_dep.lo pcr_interface.lo \ +ptr_chck.lo real_malloc.lo reclaim.lo solaris_pthreads.lo \ +solaris_threads.lo stubborn.lo typd_mlc.lo check_PROGRAMS = gctest$(EXEEXT) -gctest_OBJECTS = test.o +gctest_OBJECTS = test.$(OBJEXT) gctest_DEPENDENCIES = ./libgcjgc.la gctest_LDFLAGS = CXXFLAGS = @CXXFLAGS@ @@ -227,7 +228,7 @@ OBJECTS = $(libgcjgc_la_OBJECTS) $(gctest_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .cc .lo .o .s +.SUFFIXES: .S .c .cc .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile @@ -271,6 +272,11 @@ uninstall-toolexeclibLTLIBRARIES: .c.o: $(COMPILE) -c $< +# FIXME: We should only use cygpath when building on Windows, +# and only if it is available. +.c.obj: + $(COMPILE) -c `cygpath -w $<` + .s.o: $(COMPILE) -c $< @@ -279,6 +285,7 @@ uninstall-toolexeclibLTLIBRARIES: mostlyclean-compile: -rm -f *.o core *.core + -rm -f *.$(OBJEXT) clean-compile: @@ -320,6 +327,8 @@ gctest$(EXEEXT): $(gctest_OBJECTS) $(gctest_DEPENDENCIES) $(LINK) $(gctest_LDFLAGS) $(gctest_OBJECTS) $(gctest_LDADD) $(LIBS) .cc.o: $(CXXCOMPILE) -c $< +.cc.obj: + $(CXXCOMPILE) -c `cygpath -w $<` .cc.lo: $(LTCXXCOMPILE) -c $< @@ -393,7 +402,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/boehm-gc/configure b/boehm-gc/configure index 841bd06..edf9a4b 100755 --- a/boehm-gc/configure +++ b/boehm-gc/configure @@ -2770,11 +2770,11 @@ cat >> confdefs.h <<\EOF EOF cat >> confdefs.h <<\EOF -#define NO_DEBUGGING 1 +#define JAVA_FINALIZATION 1 EOF cat >> confdefs.h <<\EOF -#define JAVA_FINALIZATION 1 +#define GC_GCJ_SUPPORT 1 EOF @@ -2791,6 +2791,10 @@ EOF #define SMALL_CONFIG 1 EOF + cat >> confdefs.h <<\EOF +#define NO_DEBUGGING 1 +EOF + fi diff --git a/boehm-gc/configure.in b/boehm-gc/configure.in index f11cec8..70764c4 100644 --- a/boehm-gc/configure.in +++ b/boehm-gc/configure.in @@ -193,8 +193,8 @@ dnl Define a few things to retarget the library towards dnl embedded Java. AC_DEFINE(SILENT) AC_DEFINE(NO_SIGNALS) -AC_DEFINE(NO_DEBUGGING) AC_DEFINE(JAVA_FINALIZATION) +AC_DEFINE(GC_GCJ_SUPPORT) dnl This is something of a hack. When cross-compiling we turn off dnl some functionality. We also enable the "small" configuration. @@ -203,6 +203,7 @@ if test -n "${with_cross_host}"; then AC_DEFINE(NO_SIGSET) AC_DEFINE(NO_CLOCK) AC_DEFINE(SMALL_CONFIG) + AC_DEFINE(NO_DEBUGGING) fi AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") -- cgit v1.1