From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <java-patches-return-20600-listarch-java-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 28522 invoked by alias); 2 Dec 2012 01:03:15 -0000
Received: (qmail 28474 invoked by uid 22791); 2 Dec 2012 01:03:14 -0000
X-SWARE-Spam-Status: No, hits=-2.0 required=5.0	tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_SPAMHAUS_DROP,RCVD_IN_DNSWL_LOW,TW_BJ,TW_IB
X-Spam-Check-By: sourceware.org
Received: from youngberry.canonical.com (HELO youngberry.canonical.com) (91.189.89.112)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 02 Dec 2012 01:03:07 +0000
Received: from dslb-088-073-096-115.pools.arcor-ip.net ([88.73.96.115] helo=[192.168.42.216])	by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)	(Exim 4.71)	(envelope-from <doko@ubuntu.com>)	id 1TexxZ-0000rT-Lx; Sun, 02 Dec 2012 01:03:05 +0000
Message-ID: <50BAA8C1.5090900@ubuntu.com>
Date: Sun, 02 Dec 2012 01:03:00 -0000
From: Matthias Klose <doko@ubuntu.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0
MIME-Version: 1.0
To: GCJ-patches <java-patches@gcc.gnu.org>,  Nicola Pero <nicola.pero@meta-innovation.com>
Subject: [patch][boehm-gc update] Don't use the renamed libgc library
Content-Type: multipart/mixed; boundary="------------060403070805040305030504"
X-IsSubscribed: yes
Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <java-patches.gcc.gnu.org>
List-Subscribe: <mailto:java-patches-subscribe@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/java-patches/>
List-Post: <mailto:java-patches@gcc.gnu.org>
List-Help: <mailto:java-patches-help@gcc.gnu.org>, <http://gcc.gnu.org/ml/#faqs>
Sender: java-patches-owner@gcc.gnu.org
X-SW-Source: 2012-q4/txt/msg00042.txt.bz2

This is a multi-part message in MIME format.
--------------060403070805040305030504
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Content-length: 331

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


--------------060403070805040305030504
Content-Type: text/x-diff;
 name="libgc-rename.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="libgc-rename.diff"
Content-length: 1394

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 \

--------------060403070805040305030504--