From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24540 invoked by alias); 2 Dec 2012 02:10:39 -0000 Received: (qmail 24422 invoked by uid 22791); 2 Dec 2012 02:10:38 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_SPAMHAUS_DROP,RCVD_IN_DNSWL_LOW 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 02:10:27 +0000 Received: from dslb-088-073-127-088.pools.arcor-ip.net ([88.73.127.88] 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 ) id 1Tez0k-0002jd-A7 for java-patches@gcc.gnu.org; Sun, 02 Dec 2012 02:10:26 +0000 Message-ID: <50BAB88A.9080808@ubuntu.com> Date: Sun, 02 Dec 2012 02:10:00 -0000 From: Matthias Klose 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 Subject: [patch][boehm-gc update] Define GC_GCJ_SUPPORT when boehm-gc is used Content-Type: multipart/mixed; boundary="------------050008050208020408040509" X-IsSubscribed: yes Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org X-SW-Source: 2012-q4/txt/msg00045.txt.bz2 This is a multi-part message in MIME format. --------------050008050208020408040509 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Content-length: 199 seen that GC_hblkfreelist is not declared by default. It is guarded by a GC_GCJ_SUPPORT define. Just add this define, when built using boehm-gc. Committed to the boehm-gc merge branch, Matthias --------------050008050208020408040509 Content-Type: text/x-diff; name="gc-gcj-support.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="gc-gcj-support.diff" Content-length: 1268 libjava/ChangeLog.merge 2012-12-01 Matthias Klose * configure.ac: Define and substitute GCDEFS. Add -DGC_GCJ_SUPPORT when built for boehm-gc. * Makefile.am (AM_CXXFLAGS): Add @GCDEFS@. * configure, Makefile.in: Regenerate. Index: configure.ac =================================================================== --- configure.ac (Revision 194043) +++ configure.ac (Arbeitskopie) @@ -987,6 +987,7 @@ [GC=boehm]) GCLIBS= GCINCS= +GCDEFS= GCDEPS= GCSPEC= JC1GCSPEC= @@ -994,6 +995,7 @@ case "$GC" in boehm) AC_MSG_RESULT(boehm) + GCDEFS=-DGC_GCJ_SUPPORT GCLIBS=../boehm-gc/libgc_convenience.la JC1GCSPEC='-fuse-boehm-gc' GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" @@ -1013,6 +1015,7 @@ esac AC_SUBST(GCLIBS) AC_SUBST(GCINCS) +AC_SUBST(GCDEFS) AC_SUBST(GCDEPS) AC_SUBST(GCSPEC) AC_SUBST(JC1GCSPEC) Index: Makefile.am =================================================================== --- Makefile.am (Revision 194043) +++ Makefile.am (Arbeitskopie) @@ -361,6 +361,7 @@ @LIBGCJ_CXXFLAGS@ \ $(WARNINGS) \ -D_GNU_SOURCE \ + @GCDEFS@ \ -DPREFIX="\"$(prefix)\"" \ -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\"" \ -DJAVA_HOME="\"$(JAVA_HOME_DIR)\"" \ --------------050008050208020408040509--