From patchwork Sat Nov 19 22:33:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: update configury for FreeBSD 10 on gcc-4.6 branch From: Andreas Tobler X-Patchwork-Id: 126622 Message-Id: <4EC82EB0.9010404@fgznet.ch> To: Gerald Pfeifer Cc: gcc-patches@gcc.gnu.org, Loren James Rittle Date: Sat, 19 Nov 2011 23:33:20 +0100 On 19.11.11 23:15, Gerald Pfeifer wrote: > On Sat, 19 Nov 2011, Andreas Tobler wrote: >> the below patch updates the configury to be able to build gcc-4.6 on >> FreeBSD 10. I attach only the source files which have changed. > >> libjava/libltdl/acinclude.m4 > > I don't see this one in your ChangeLog? Sigh, too many things in parallel: > > Merging upstream changes from libtool that unbreak bootstrap on a > primary platform and are completely specific and isolated to that > platform should always be fine. > > You did not indicate how you tested it, but assuming a full bootstrap > and testsuite run (which platform exactly?) please go ahead. Well, here I'm a bit sloppy, I always test with a full bootstrap and submit the results. I did this for this patch a few weeks ago for trunk. I'll resubmit new results as soon as the tests completed. > > Thanks! > >> Index: libjava/configure.ac >> =================================================================== >> --- libjava/configure.ac (revision 181511) >> +++ libjava/configure.ac (working copy) >> @@ -1060,7 +1060,7 @@ >> *-*-cygwin*) >> # Don't set THREADLIBS here. Cygwin doesn't have -lpthread. >> ;; >> - *-*-freebsd[[1234]]*) >> + *-*-freebsd[[234]].*) >> # Before FreeBSD 5, it didn't have -lpthread (or any library which >> # merely adds pthread_* functions) but it does have a -pthread switch >> # which is required at link-time to select -lc_r *instead* of -lc. > > This is a separate change from the libtool import, right? Ever since > > 2011-02-02 Gerald Pfeifer > > * config.gcc (*-*-freebsd[12], *-*-freebsd[12].*, *-*-freebsd*aout*): > Move to the unsupported targets list. > > GCC per se does not support FreeBSD 2.x any more. On the libtool side, > we should stick with what we get from upstream. For other things, like > the above, I suggest to remove both 1 and 2. Yes, this is separate from the libtool import. I thought I could integrate this one too since I have to regen configure anyway. Will update. > Can you also make the libjava change on trunk, copying java-patches@ ? Yes. Thanks for the feedback. Andreas Index: libltdl/ChangeLog =================================================================== --- libltdl/ChangeLog (revision 181511) +++ libltdl/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2011-11-19 Andreas Tobler + + * acinclude.m4: Additional FreeBSD 10 fixes. + * configure: Regenerate. + > >> Is this ok for 4.6 branch?