15846N/A--- gc-7.1/Makefile.am.old 2009-02-16 10:58:23.780324000 +0800

15846N/A+++ gc-7.1/Makefile.am 2009-02-16 11:01:06.462471000 +0800

20837N/A@@ -55,8 +55,8 @@ pkgconfig_DATA = bdw-gc.pc

15846N/A # C Library

15846N/A # ---------

15846N/A

15846N/A-lib_LTLIBRARIES += libgc.la

15846N/A-libgc_la_SOURCES = \

15846N/A+lib_LTLIBRARIES += libbgc.la

15846N/A+libbgc_la_SOURCES = \

15846N/A allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \

15846N/A dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \

15846N/A malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \

20837N/A@@ -68,32 +68,32 @@ libgc_la_SOURCES = \

15846N/A # ---------------------------------

15846N/A

15846N/A if PTHREADS

20837N/A-libgc_la_SOURCES += pthread_start.c pthread_support.c pthread_stop_world.c

20837N/A+libbgc_la_SOURCES += pthread_start.c pthread_support.c pthread_stop_world.c

15846N/A endif

15846N/A

15846N/A if DARWIN_THREADS

15846N/A-libgc_la_SOURCES += darwin_stop_world.c

15846N/A+libbgc_la_SOURCES += darwin_stop_world.c

15846N/A endif

15846N/A

15846N/A if WIN32_THREADS

15846N/A-libgc_la_SOURCES += win32_threads.c

15846N/A+libbgc_la_SOURCES += win32_threads.c

15846N/A endif

15846N/A

20837N/A if USE_INTERNAL_LIBATOMIC_OPS

20837N/A-nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops.c

20837N/A+nodist_libbgc_la_SOURCES = libatomic_ops/src/atomic_ops.c

20837N/A endif

20837N/A

20837N/A if NEED_ATOMIC_OPS_ASM

20837N/A-nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S

20837N/A+nodist_libbgc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S

15846N/A endif

15846N/A

15846N/A # Include THREADDLLIBS here to ensure that the correct versions of

15846N/A # linuxthread semaphore functions get linked:

20837N/A-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)

15846N/A-libgc_la_DEPENDENCIES = @addobjs@

15846N/A-libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined

20837N/A+libbgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)

15846N/A+libbgc_la_DEPENDENCIES = @addobjs@

15846N/A+libbgc_la_LDFLAGS = $(extra_ldflags_libbgc) -version-info 1:3:0 -no-undefined

15846N/A

15846N/A-EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \

15846N/A+EXTRA_libbgc_la_SOURCES = alpha_mach_dep.S \

15846N/A mips_sgi_mach_dep.s mips_ultrix_mach_dep.s \

15846N/A rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \

15846N/A sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s

20837N/A@@ -103,11 +103,11 @@ EXTRA_libgc_la_SOURCES = alpha_mach_dep.

15846N/A # -------------

15846N/A

15846N/A if CPLUSPLUS

15846N/A-lib_LTLIBRARIES += libgccpp.la

15846N/A+lib_LTLIBRARIES += libbgccpp.la

15846N/A pkginclude_HEADERS += include/gc_cpp.h include/gc_allocator.h

15846N/A-libgccpp_la_SOURCES = gc_cpp.cc

15846N/A-libgccpp_la_LIBADD = ./libgc.la

15846N/A-libgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined

15846N/A+libbgccpp_la_SOURCES = gc_cpp.cc

15846N/A+libbgccpp_la_LIBADD = ./libbgc.la

15846N/A+libbgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined

15846N/A endif

15846N/A

15846N/A # FIXME: If Visual C++ users use Makefile.am, this should go into

20837N/A@@ -124,7 +124,7 @@ AM_CFLAGS = @GC_CFLAGS@

15846N/A

15846N/A ## FIXME: relies on internal code generated by automake.

20837N/A ## FIXME: ./configure --enable-dependency-tracking should be used

15846N/A-#all_objs = @addobjs@ $(libgc_la_OBJECTS)

15846N/A+#all_objs = @addobjs@ $(libbgc_la_OBJECTS)

15846N/A #$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \

15846N/A #include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \

15846N/A #include/gc_pthread_redirects.h include/gc_config_macros.h \

20837N/A@@ -204,5 +204,5 @@ include include/include.am

15846N/A include cord/cord.am

15846N/A include tests/tests.am

15846N/A include doc/doc.am

15846N/A-# Putting these at the top causes cord to be built first, and not find libgc.a

15846N/A+# Putting these at the top causes cord to be built first, and not find libbgc.a

15846N/A # on HP/UX. There may be a better fix.

15846N/A--- gc-7.1/configure.ac.old Mon Feb 16 11:03:39 2009

15846N/A+++ gc-7.1/configure.ac Mon Feb 16 11:16:34 2009

15846N/A@@ -312,14 +312,14 @@

15846N/A # extra LD Flags which are required for targets

15846N/A case "${host}" in

15846N/A *-*-darwin*)

15846N/A- extra_ldflags_libgc=-Wl,-single_module

15846N/A+ extra_ldflags_libbgc=-Wl,-single_module

15846N/A ;;

15846N/A esac

15846N/A-AC_SUBST(extra_ldflags_libgc)

15846N/A+AC_SUBST(extra_ldflags_libbgc)

15846N/A

15846N/A AC_SUBST(EXTRA_TEST_LIBS)

15846N/A

15846N/A-target_all=libgc.la

15846N/A+target_all=libbgc.la

15846N/A AC_SUBST(target_all)

15846N/A

15846N/A dnl If the target is an eCos system, use the appropriate eCos

15846N/A--- gc-7.1/cord/cord.am.old 2009-02-16 13:24:33.828848000 +0800

15846N/A+++ gc-7.1/cord/cord.am 2009-02-16 13:24:51.101815000 +0800

15846N/A@@ -1,7 +1,7 @@

15846N/A

15846N/A lib_LTLIBRARIES += libcord.la

15846N/A

15846N/A-libcord_la_LIBADD = $(top_builddir)/libgc.la

15846N/A+libcord_la_LIBADD = $(top_builddir)/libbgc.la

15846N/A libcord_la_LDFLAGS = -version-info 1:3:0 -no-undefined

15846N/A

15846N/A libcord_la_SOURCES = \

15846N/A--- gc-7.1/bdw-gc.pc.in.old Mon Feb 16 14:03:53 2009

15846N/A+++ gc-7.1/bdw-gc.pc.in Mon Feb 16 14:04:11 2009

15846N/A@@ -6,5 +6,5 @@

15846N/A Name: Boehm-Demers-Weiser Conservative Garbage Collector

15846N/A Description: A garbage collector for C and C++

15846N/A Version: @PACKAGE_VERSION@

15846N/A-Libs: -L${libdir} -lgc

15846N/A+Libs: -L${libdir} -lbgc

15846N/A Cflags: -I${includedir}