This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[patch][boehm-gc update] Don't use the renamed libgc library
- From: Matthias Klose <doko at ubuntu dot com>
- To: GCJ-patches <java-patches at gcc dot gnu dot org>, Nicola Pero <nicola dot pero at meta-innovation dot com>
- Date: Sun, 02 Dec 2012 02:02:57 +0100
- Subject: [patch][boehm-gc update] Don't use the renamed libgc library
libobjc and libjava don't use the renamed libgc library anymore. It's better to
have this change in libobjc/libjava than tracking the diffs in boehm-gc.
a multilib build configured with --enable-objc-gc works and doesn't show
regressions in the objc tests.
Committed to the branches/gcj/bdwgc-20121125-merge branch.
Matthias
libjava/ChangeLog.merge
2012-12-01 Matthias Klose <doko@ubuntu.com>
* configure.ac: Link with libgc_convenience.la.
* configure: Regenerate.
libobjc/ChangeLog.merge
2012-12-01 Matthias Klose <doko@ubuntu.com>
* Makefile.in (OBJC_BOEHM_GC_LIBS): Link with libgc_convenience.la.
Index: libjava/configure.ac
===================================================================
--- libjava/configure.ac (Revision 194034)
+++ libjava/configure.ac (Revision 194037)
@@ -994,7 +994,7 @@
case "$GC" in
boehm)
AC_MSG_RESULT(boehm)
- GCLIBS=../boehm-gc/libgcjgc_convenience.la
+ GCLIBS=../boehm-gc/libgc_convenience.la
JC1GCSPEC='-fuse-boehm-gc'
GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs"
GCINCS='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include'
Index: libobjc/Makefile.in
===================================================================
--- libobjc/Makefile.in (Revision 194034)
+++ libobjc/Makefile.in (Revision 194037)
@@ -96,7 +96,7 @@
OBJC_GCFLAGS=@OBJC_GCFLAGS@
OBJC_BOEHM_GC=@OBJC_BOEHM_GC@
OBJC_BOEHM_GC_INCLUDES=@OBJC_BOEHM_GC_INCLUDES@
-OBJC_BOEHM_GC_LIBS=../boehm-gc/libgcjgc_convenience.la $(thread_libs_and_flags)
+OBJC_BOEHM_GC_LIBS=../boehm-gc/libgc_convenience.la $(thread_libs_and_flags)
INCLUDES = -I$(srcdir)/$(MULTISRCTOP)../gcc \
-I$(srcdir)/$(MULTISRCTOP)../gcc/config \