[boehm-gc] Import 6.3 alpha 1

Loren James Rittle rittle@latour.rsch.comm.mot.com
Tue Jul 29 02:42:00 GMT 2003


Jeff Sturm <jsturm@one-point.com> wrote:

> I've merged the current boehm-gc release into the GCC tree. [...]

Cool.  FreeBSD/i386 seems operational as built from FSF tree after
your update.

> I've noted the significant remaining divergences in gcc/boehm-gc below,
> along with any relevant ChangeLog entries I could find.  Most of these are
> likely bogus, though one is recent. [...]
>        * os_dep.c: Do not include <machine/trap.h> unless available.

Thanks for the "heads up".  Agreed, we indeed rolled that patch into
Boehm's copy from our tree.  It now appears about 10 lines above with
a (hopefully, gratuitous) setting for NEED_FIND_LIMIT (I shant touch
it since I don't know why it was added but it seems mostly harmless).

Now `ccvs diff -rGC_6_3_ALPHA_1 -w os_dep.c' reports no difference.
Committed as obvious (after rebuild and test in already built tree).

	* os_dep.c: Remove redundancy introduced in last merge.

Index: os_dep.c
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/os_dep.c,v
retrieving revision 1.26
diff -c -r1.26 os_dep.c
*** os_dep.c	28 Jul 2003 04:18:20 -0000	1.26
--- os_dep.c	29 Jul 2003 02:09:58 -0000
***************
*** 91,100 ****
  #   include <setjmp.h>
  #endif
  
- #if defined(FREEBSD) && defined(I386)
- #  include <machine/trap.h>
- #endif
- 
  #ifdef AMIGA
  # define GC_AMIGA_DEF
  # include "AmigaOS.c"
--- 91,96 ----



More information about the Gcc-patches mailing list