This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: FYI: Merge GC 6.3
- From: Richard Earnshaw <rearnsha at buzzard dot freeserve dot co dot uk>
- To: Bryce McKinlay <mckinlay at redhat dot com>
- Cc: java-patches at gcc dot gnu dot org, rearnsha at buzzard dot freeserve dot co dot uk, Hans Boehm <hans_boehm at hp dot com>
- Date: Mon, 16 Aug 2004 22:59:03 +0100
- Subject: Re: FYI: Merge GC 6.3
> Index: specific.c
> ===================================================================
> RCS file: /cvs/gcc/gcc/boehm-gc/specific.c,v
> retrieving revision 1.1.1.3
> diff -u -r1.1.1.3 specific.c
> --- specific.c 28 Jul 2003 03:46:09 -0000 1.1.1.3
> +++ specific.c 13 Aug 2004 22:50:12 -0000
> @@ -11,11 +11,11 @@
> * modified is included with the above copyright notice.
> */
>
> -#if defined(GC_LINUX_THREADS)
> -
> #include "private/gc_priv.h" /* For GC_compare_and_exchange, GC_memory_barrier */
> #include "private/specific.h"
>
> +#if defined(GC_LINUX_THREADS)
> +
> static tse invalid_tse = {INVALID_QTID, 0, 0, INVALID_THREADID};
> /* A thread-specific data entry which will never */
> /* appear valid to a reader. Used to fill in empty */
This bit breaks an arm-elf cross (in fact, anything with out pthreads I
suspect), since private/specific.h uses pthread_t unguarded.
I think it's safe to put the check *between* the two includes, since
specific.h doesn't include anything other than errno.h.
R.