Import Boehm GC version 6.6.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110204 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 28 insertions, 32 deletions

diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in
index 6f842205efe..9580d7637fd 100644
--- a/boehm-gc/Makefile.in
+++ b/boehm-gc/Makefile.in
@@ -65,12 +65,13 @@ DIST_COMMON = $(srcdir)/../config.guess $(srcdir)/../config.sub \
 	$(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../compile \
 	$(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../compile \
 	$(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../compile \
-	$(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../compile \
-	$(srcdir)/../ltmain.sh $(srcdir)/../config.guess \
-	$(srcdir)/../config.sub
+	$(srcdir)/../compile $(srcdir)/../ltmain.sh \
+	$(srcdir)/../config.guess $(srcdir)/../config.sub
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
+	$(top_srcdir)/../config/depstand.m4 \
+	$(top_srcdir)/../config/lead-dot.m4 \
 	$(top_srcdir)/../config/no-executables.m4 \
 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -82,34 +83,36 @@ CONFIG_HEADER = $(top_builddir)/include/gc_config.h \
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-@POWERPC_DARWIN_TRUE@am__objects_1 = powerpc_darwin_mach_dep.lo
-am__objects_2 = allchblk.lo alloc.lo blacklst.lo checksums.lo \
+am_libgcjgc_la_OBJECTS = allchblk.lo alloc.lo blacklst.lo checksums.lo \
 	dbg_mlc.lo dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \
-	headers.lo aix_irix_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 specific.lo stubborn.lo \
-	typd_mlc.lo backgraph.lo win32_threads.lo pthread_support.lo \
-	pthread_stop_world.lo darwin_stop_world.lo $(am__objects_1)
-am_libgcjgc_la_OBJECTS = $(am__objects_2)
+	headers.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 specific.lo stubborn.lo typd_mlc.lo \
+	backgraph.lo win32_threads.lo pthread_support.lo \
+	pthread_stop_world.lo darwin_stop_world.lo
 libgcjgc_la_OBJECTS = $(am_libgcjgc_la_OBJECTS)
-am_libgcjgc_convenience_la_OBJECTS = $(am__objects_2)
+am__objects_1 = allchblk.lo alloc.lo blacklst.lo checksums.lo \
+	dbg_mlc.lo dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \
+	headers.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 specific.lo stubborn.lo typd_mlc.lo \
+	backgraph.lo win32_threads.lo pthread_support.lo \
+	pthread_stop_world.lo darwin_stop_world.lo
+am_libgcjgc_convenience_la_OBJECTS = $(am__objects_1)
 libgcjgc_convenience_la_OBJECTS =  \
 	$(am_libgcjgc_convenience_la_OBJECTS)
 am__dirstamp = $(am__leading_dot)dirstamp
 am_gctest_OBJECTS = tests/test.$(OBJEXT)
 gctest_OBJECTS = $(am_gctest_OBJECTS)
-gctest_DEPENDENCIES = ./libgcjgc.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+gctest_DEPENDENCIES = ./libgcjgc.la $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
 depcomp =
 am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
-	$(CCASFLAGS)
 SOURCES = $(libgcjgc_la_SOURCES) $(libgcjgc_convenience_la_SOURCES) \
 	$(gctest_SOURCES)
 MULTISRCTOP = 
@@ -254,34 +257,33 @@ SUBDIRS = include
 noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la
 @POWERPC_DARWIN_FALSE@asm_libgc_sources = 
 @POWERPC_DARWIN_TRUE@asm_libgc_sources = powerpc_darwin_mach_dep.s
-GC_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
-dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c aix_irix_threads.c \
+libgcjgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
+dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.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 \
 backgraph.c win32_threads.c \
 pthread_support.c pthread_stop_world.c darwin_stop_world.c \
-$(asm_libgc_sources)
+$(asm_libgcjgc_sources)
 
+libgcjgc_convenience_la_SOURCES = $(libgcjgc_la_SOURCES)
 EXTRA_DIST = alpha_mach_dep.S \
 mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
 rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
 sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
-libgcjgc_la_SOURCES = $(GC_SOURCES)
-libgcjgc_convenience_la_SOURCES = $(GC_SOURCES)
 
 # Include THREADLIBS here to ensure that the correct versions of
 # linuxthread semaphore functions get linked:
-libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS)
+libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS)
 libgcjgc_la_DEPENDENCIES = @addobjs@
-libgcjgc_la_LDFLAGS = -version-info 1:1:0 -rpath $(toolexeclibdir)
+libgcjgc_la_LDFLAGS = -version-info 1:2:0 -rpath $(toolexeclibdir)
 libgcjgc_convenience_la_LIBADD = @addobjs@
 libgcjgc_convenience_la_DEPENDENCIES = @addobjs@
 AM_CXXFLAGS = @GC_CFLAGS@
 AM_CFLAGS = @GC_CFLAGS@
 gctest_SOURCES = tests/test.c
-gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
+gctest_LDADD = ./libgcjgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
 gctest_LDFLAGS = -shared-libgcc
 TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
 TESTS = gctest
@@ -414,12 +416,6 @@ distclean-compile:
 .c.lo:
 	$(LTCOMPILE) -c -o $@ $<
 
-.s.o:
-	$(CCASCOMPILE) -c $<
-
-.s.obj:
-	$(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
-
 mostlyclean-libtool:
 	-rm -f *.lo