Skip to content
Snippets Groups Projects
Commit 1a5c0c2c authored by bryce's avatar bryce
Browse files

2000-09-30 Bryce McKinlay <bryce@albatross.co.nz> 

	* configure.in: Define GC_GCJ_SUPPORT. Define NO_DEBUGGING in
	cross-compile configuration only.
	* Makefile.am: Build gcj_mlc.c.
	* configure, Makefile.in: Rebuilt.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36678 138bc75d-0d04-0410-961f-82ee72b054a4
parent fe8a8fe7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
boehm-gc/ChangeLog
+ 7
− 0
View file @ 1a5c0c2c
2000-09-30 Bryce McKinlay <bryce@albatross.co.nz>
* 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 <aoliva@redhat.com> 2000-09-10 Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool macros from the top level. * acinclude.m4: Include libtool macros from the top level.
......
boehm-gc/Makefile.am
+ 1
− 1
View file @ 1a5c0c2c
...@@ -27,7 +27,7 @@ toolexeclib_LTLIBRARIES = $(target_all) ...@@ -27,7 +27,7 @@ toolexeclib_LTLIBRARIES = $(target_all)
EXTRA_LTLIBRARIES = libgcjgc.la EXTRA_LTLIBRARIES = libgcjgc.la
libgcjgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c \ 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 \ 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 \ 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 \ 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 \ real_malloc.c reclaim.c solaris_pthreads.c solaris_threads.c \
......
boehm-gc/Makefile.in
+ 24
− 15
View file @ 1a5c0c2c
...@@ -73,6 +73,8 @@ CXXCPP = @CXXCPP@ ...@@ -73,6 +73,8 @@ CXXCPP = @CXXCPP@
CXXINCLUDES = @CXXINCLUDES@ CXXINCLUDES = @CXXINCLUDES@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
INCLUDES = @INCLUDES@ INCLUDES = @INCLUDES@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@ LN_S = @LN_S@
...@@ -80,8 +82,10 @@ MAINT = @MAINT@ ...@@ -80,8 +82,10 @@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MY_CFLAGS = @MY_CFLAGS@ MY_CFLAGS = @MY_CFLAGS@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
STRIP = @STRIP@
THREADLIB = @THREADLIB@ THREADLIB = @THREADLIB@
VERSION = @VERSION@ VERSION = @VERSION@
addobjs = @addobjs@ addobjs = @addobjs@
...@@ -97,18 +101,15 @@ MULTIDIRS = ...@@ -97,18 +101,15 @@ MULTIDIRS =
MULTISUBDIR = MULTISUBDIR =
MULTIDO = true MULTIDO = true
MULTICLEAN = true MULTICLEAN = true
@USE_LIBDIR_TRUE@toolexeclibdir = \ @USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
@USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) @USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
@USE_LIBDIR_FALSE@toolexeclibdir = \ @USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
@USE_LIBDIR_FALSE@toolexecdir = \
@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
toolexeclib_LTLIBRARIES = $(target_all) toolexeclib_LTLIBRARIES = $(target_all)
EXTRA_LTLIBRARIES = libgcjgc.la EXTRA_LTLIBRARIES = libgcjgc.la
libgcjgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c \ 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 \ 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 \ 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 \ 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 \ real_malloc.c reclaim.c solaris_pthreads.c solaris_threads.c \
...@@ -197,13 +198,13 @@ CPPFLAGS = @CPPFLAGS@ ...@@ -197,13 +198,13 @@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
libgcjgc_la_OBJECTS = allchblk.lo alloc.lo blacklst.lo checksums.lo \ 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 \ dbg_mlc.lo dyn_load.lo finalize.lo gcj_mlc.lo headers.lo \
linux_threads.lo malloc.lo mallocx.lo mark.lo mark_rts.lo misc.lo \ hpux_irix_threads.lo linux_threads.lo malloc.lo mallocx.lo mark.lo \
new_hblk.lo obj_map.lo os_dep.lo pcr_interface.lo ptr_chck.lo \ mark_rts.lo misc.lo new_hblk.lo obj_map.lo os_dep.lo pcr_interface.lo \
real_malloc.lo reclaim.lo solaris_pthreads.lo solaris_threads.lo \ ptr_chck.lo real_malloc.lo reclaim.lo solaris_pthreads.lo \
stubborn.lo typd_mlc.lo solaris_threads.lo stubborn.lo typd_mlc.lo
check_PROGRAMS = gctest$(EXEEXT) check_PROGRAMS = gctest$(EXEEXT)
gctest_OBJECTS = test.o gctest_OBJECTS = test.$(OBJEXT)
gctest_DEPENDENCIES = ./libgcjgc.la gctest_DEPENDENCIES = ./libgcjgc.la
gctest_LDFLAGS = gctest_LDFLAGS =
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
...@@ -227,7 +228,7 @@ OBJECTS = $(libgcjgc_la_OBJECTS) $(gctest_OBJECTS) ...@@ -227,7 +228,7 @@ OBJECTS = $(libgcjgc_la_OBJECTS) $(gctest_OBJECTS)
all: all-redirect all: all-redirect
.SUFFIXES: .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) $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
...@@ -271,6 +272,11 @@ uninstall-toolexeclibLTLIBRARIES: ...@@ -271,6 +272,11 @@ uninstall-toolexeclibLTLIBRARIES:
.c.o: .c.o:
$(COMPILE) -c $< $(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: .s.o:
$(COMPILE) -c $< $(COMPILE) -c $<
...@@ -279,6 +285,7 @@ uninstall-toolexeclibLTLIBRARIES: ...@@ -279,6 +285,7 @@ uninstall-toolexeclibLTLIBRARIES:
mostlyclean-compile: mostlyclean-compile:
-rm -f *.o core *.core -rm -f *.o core *.core
-rm -f *.$(OBJEXT)
clean-compile: clean-compile:
...@@ -320,6 +327,8 @@ gctest$(EXEEXT): $(gctest_OBJECTS) $(gctest_DEPENDENCIES) ...@@ -320,6 +327,8 @@ gctest$(EXEEXT): $(gctest_OBJECTS) $(gctest_DEPENDENCIES)
$(LINK) $(gctest_LDFLAGS) $(gctest_OBJECTS) $(gctest_LDADD) $(LIBS) $(LINK) $(gctest_LDFLAGS) $(gctest_OBJECTS) $(gctest_LDADD) $(LIBS)
.cc.o: .cc.o:
$(CXXCOMPILE) -c $< $(CXXCOMPILE) -c $<
.cc.obj:
$(CXXCOMPILE) -c `cygpath -w $<`
.cc.lo: .cc.lo:
$(LTCXXCOMPILE) -c $< $(LTCXXCOMPILE) -c $<
...@@ -393,7 +402,7 @@ distdir: $(DISTFILES) ...@@ -393,7 +402,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
if test -f $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
cp -pr $$/$$file $(distdir)/$$file; \ cp -pr $$d/$$file $(distdir)/$$file; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
......
boehm-gc/configure
+ 6
− 2
View file @ 1a5c0c2c
...@@ -2770,11 +2770,11 @@ cat >> confdefs.h <<\EOF ...@@ -2770,11 +2770,11 @@ cat >> confdefs.h <<\EOF
EOF EOF
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define NO_DEBUGGING 1 #define JAVA_FINALIZATION 1
EOF EOF
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define JAVA_FINALIZATION 1 #define GC_GCJ_SUPPORT 1
EOF EOF
...@@ -2789,6 +2789,10 @@ EOF ...@@ -2789,6 +2789,10 @@ EOF
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define SMALL_CONFIG 1 #define SMALL_CONFIG 1
EOF
cat >> confdefs.h <<\EOF
#define NO_DEBUGGING 1
EOF EOF
fi fi
......
boehm-gc/configure.in
+ 2
− 1
View file @ 1a5c0c2c
...@@ -193,8 +193,8 @@ dnl Define a few things to retarget the library towards ...@@ -193,8 +193,8 @@ dnl Define a few things to retarget the library towards
dnl embedded Java. dnl embedded Java.
AC_DEFINE(SILENT) AC_DEFINE(SILENT)
AC_DEFINE(NO_SIGNALS) AC_DEFINE(NO_SIGNALS)
AC_DEFINE(NO_DEBUGGING)
AC_DEFINE(JAVA_FINALIZATION) AC_DEFINE(JAVA_FINALIZATION)
AC_DEFINE(GC_GCJ_SUPPORT)
dnl This is something of a hack. When cross-compiling we turn off dnl This is something of a hack. When cross-compiling we turn off
dnl some functionality. We also enable the "small" configuration. dnl some functionality. We also enable the "small" configuration.
...@@ -203,6 +203,7 @@ if test -n "${with_cross_host}"; then ...@@ -203,6 +203,7 @@ if test -n "${with_cross_host}"; then
AC_DEFINE(NO_SIGSET) AC_DEFINE(NO_SIGSET)
AC_DEFINE(NO_CLOCK) AC_DEFINE(NO_CLOCK)
AC_DEFINE(SMALL_CONFIG) AC_DEFINE(SMALL_CONFIG)
AC_DEFINE(NO_DEBUGGING)
fi fi
AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment